git.iko.soy/unity8
on xenial help sign in
Merge lp:~saviq/unity8/preview-customizations
2f2b341Michał Sawicz
cmake/modules/QmlTest.cmake+2−2
compare with xenial
unifiedsplit
@@ -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 )
data/unity8.conf+1−1
@@ -3,7 +3,7 @@ author "Ricardo Mendoza <ricmm@ubuntu.com>"
3
3
4emits indicator-services-start
4emits indicator-services-start
5
5
6−start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=ubuntu-touch-surfaceflinger)) and started dbus
6+start on ((xsession SESSION=ubuntu-touch) or (xsession SESSION=unity8-mir)) and started dbus
7stop on desktop-end
7stop on desktop-end
8
8
9kill timeout 120
9kill timeout 120
debian/changelog+84
@@ -1,3 +1,87 @@
1+unity8 (8.00+14.10.20140814.1-0ubuntu1) utopic; urgency=low
2+
3+ [ Michael Terry ]
4+ * Add --lightdm= argument to ./run.sh that lets developers choose
5+ which lightdm backend to use. Stop letting a user that is
6+ immediately denied via PAM into the shell by fixing some assumptions
7+ that a user which was not prompted was successfully authenticated.
8+ This is not a common situation, you'd have to manually change your
9+ PAM config. Fix a small console warning .
10+ * Make wrong-password handling much nicer by showing a pretty spinner
11+ while we wait for PAM, by improving the prompt text to match
12+ designs, by forcing the user to wait five seconds after every five
13+ failed attemps, and by supporting (but not yet enabling) an opt-in
14+ "factory-reset your phone after X failed attemps" feature.
15+
16+ [ Michael Zanetti ]
17+ * bring back network caching in dash (LP: #1355729)
18+
19+ [ Michał Sawicz ]
20+ * Add --lightdm= argument to ./run.sh that lets developers choose
21+ which lightdm backend to use. Stop letting a user that is
22+ immediately denied via PAM into the shell by fixing some assumptions
23+ that a user which was not prompted was successfully authenticated.
24+ This is not a common situation, you'd have to manually change your
25+ PAM config. Fix a small console warning .
26+ * Fix anchor in PreviewListView.qml.
27+ * Make wrong-password handling much nicer by showing a pretty spinner
28+ while we wait for PAM, by improving the prompt text to match
29+ designs, by forcing the user to wait five seconds after every five
30+ failed attemps, and by supporting (but not yet enabling) an opt-in
31+ "factory-reset your phone after X failed attemps" feature.
32+ * Add new horizontal list category layout. (LP: #1352226)
33+ * Fix qml tests - loader around PageHeader, more retries for selecting
34+ a scope and undefined attributes in mock overview scope.
35+
36+ [ Leo Arias ]
37+ * Added autopilot helpers and tests for the launcher and dash icon.
38+ * Added an autopilot helper to click a scope item.
39+ * Added an autopilot test for focusing an app clicking the icon on the
40+ launcher.
41+
42+ [ Mirco Müller ]
43+ * Allow ENTER/RETURN in a TextField to accept a snap-decision
44+ notification. (LP: #1305885)
45+
46+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 14 Aug 2014 01:29:55 +0000
47+
48+unity8 (8.00+14.10.20140811-0ubuntu1) utopic; urgency=low
49+
50+ [ Andrea Cimitan ]
51+ * Add emblem support in dash cards.
52+
53+ [ Michael Terry ]
54+ * Fix a variety of design nits with the current lockscreen: * disable
55+ indicators and launcher when locked * when reversing the direction
56+ of a greeter flick, treat it as a cancel * don't animate dots when
57+ changing the infographic data source * make cancelling a login
58+ nicer: * reduce the delay before greeter starts animating * show the
59+ greeter from the same side of the screen that it hid to * don't re-
60+ animate the infographic (LP: #1351027)
61+
62+ [ Stephen M. Webb ]
63+ * enables the unity8 upstart job for desktop sessions (LP: #1353041)
64+
65+ [ Albert Astals ]
66+ * Dash Overview (LP: #1317683)
67+ * GenericScopeView: On click only activate scope:// uris and
68+ clickscope items The rest of clicks result in a preview, also
69+ scope:// uris don't get a preview
70+ * Pass the scope search hint up to the search line
71+
72+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 11 Aug 2014 19:03:41 +0000
73+
74+unity8 (8.00+14.10.20140808-0ubuntu1) utopic; urgency=low
75+
76+ [ CI bot ]
77+ * Resync trunk
78+
79+ [ Nick Dedekind ]
80+ * Added application prompt surfaces to allow prompting application
81+ which have not yet created a surface.
82+
83+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 08 Aug 2014 12:15:05 +0000
84+
1unity8 (8.00+14.10.20140806.1-0ubuntu1) utopic; urgency=low
85unity8 (8.00+14.10.20140806.1-0ubuntu1) utopic; urgency=low
2
86
3 [ Michal Hruby ]
87 [ Michal Hruby ]
debian/control+3−2
@@ -83,7 +83,7 @@ Depends: gsettings-desktop-schemas,
83 qmenumodel-qml (>= 0.2.8),
83 qmenumodel-qml (>= 0.2.8),
84 qml-module-qtquick-xmllistmodel,
84 qml-module-qtquick-xmllistmodel,
85 qtdeclarative5-gsettings1.0,
85 qtdeclarative5-gsettings1.0,
86− qtdeclarative5-qtmir-plugin (>= 0.4),
86+ qtdeclarative5-qtmir-plugin (>= 0.4.1),
87 qtdeclarative5-ubuntu-settings-components (>= 0.3),
87 qtdeclarative5-ubuntu-settings-components (>= 0.3),
88 qtdeclarative5-ubuntu-telephony0.1,
88 qtdeclarative5-ubuntu-telephony0.1,
89 unity-launcher-impl-3,
89 unity-launcher-impl-3,
@@ -165,7 +165,8 @@ Package: unity8-private
165Architecture: any
165Architecture: any
166Multi-Arch: same
166Multi-Arch: same
167Pre-Depends: ${misc:Pre-Depends},
167Pre-Depends: ${misc:Pre-Depends},
168+Depends: accountsservice-ubuntu-schemas,
168−Depends: gsettings-ubuntu-schemas,
169+ gsettings-ubuntu-schemas,
169 libhardware2,
170 libhardware2,
170 libunity-core-6.0-9,
171 libunity-core-6.0-9,
171 pay-service,
172 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/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/CardAttributes.qml+1
@@ -47,6 +47,7 @@ GridLayout {
47 height: units.gu(2)
47 height: units.gu(2)
48 sets: ["actions", "status", "apps"]
48 sets: ["actions", "status", "apps"]
49 source: "icon" in modelData ? modelData["icon"] : ""
49 source: "icon" in modelData ? modelData["icon"] : ""
50+ color: grid.color
50 }
51 }
51 Label {
52 Label {
52 id: label
53 id: label
plugins/Dash/CardCreator.js+191−150
@@ -29,7 +29,7 @@ var kBackgroundLoaderCode = 'Loader {\n\
29 gradientColor: getColor(1) || color; \n\
29 gradientColor: getColor(1) || color; \n\
30 anchors.fill: parent; \n\
30 anchors.fill: parent; \n\
31 image: backgroundImage.source ? backgroundImage : null; \n\
31 image: backgroundImage.source ? backgroundImage : null; \n\
32− property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b; \n\
32+ property real luminance: Style.luminance(color); \n\
33 property Image backgroundImage: Image { \n\
33 property Image backgroundImage: Image { \n\
34 objectName: "backgroundImage"; \n\
34 objectName: "backgroundImage"; \n\
35 source: { \n\
35 source: { \n\
@@ -108,7 +108,7 @@ var kOverlayLoaderCode = 'Loader { \n\
108 sourceComponent: ShaderEffect { \n\
108 sourceComponent: ShaderEffect { \n\
109 id: overlay; \n\
109 id: overlay; \n\
110 height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
110 height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2); \n\
111− property real luminance: 0.2126 * overlayColor.r + 0.7152 * overlayColor.g + 0.0722 * overlayColor.b; \n\
111+ property real luminance: Style.luminance(overlayColor); \n\
112 property color overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
112 property color overlayColor: cardData && cardData["overlayColor"] || "#99000000"; \n\
113 property var source: ShaderEffectSource { \n\
113 property var source: ShaderEffectSource { \n\
114 id: shaderSource; \n\
114 id: shaderSource; \n\
@@ -138,10 +138,9 @@ var kOverlayLoaderCode = 'Loader { \n\
138 } \n\
138 } \n\
139 }\n';
139 }\n';
140
140
141−// %1 is used as anchors of row
141+// multiple row version of HeaderRowCode
142−// %2 is used as first child of the row
142+function kHeaderRowCodeGenerator() {
143−// %3 is used as second child of the row
143+var kHeaderRowCodeTemplate = 'Row { \n\
144−var kHeaderRow2Code = 'Row { \n\
145 id: row; \n\
144 id: row; \n\
146 objectName: "outerRow"; \n\
145 objectName: "outerRow"; \n\
147 property real margins: units.gu(1); \n\
146 property real margins: units.gu(1); \n\
@@ -149,58 +148,30 @@ var kHeaderRow2Code = 'Row { \n\
149 height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\
148 height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\
150 anchors { %1 } \n\
149 anchors { %1 } \n\
151 anchors.right: parent.right; \n\
150 anchors.right: parent.right; \n\
152− anchors.margins: margins;\n\
151+ anchors.margins: margins; \n\
152+ anchors.rightMargin: 0; \n\
153− data: [ %2\n\
153+ data: [ \n\
154− ,\n\
155− %3 \n\
154+ %2 \n\
156 ] \n\
155 ] \n\
157 }\n';
156 }\n';
157+ var args = Array.prototype.slice.call(arguments);
158+ var code = kHeaderRowCodeTemplate.arg(args.shift()).arg(args.join(',\n'));
159+ return code;
160+}
158
161
159−// %1 is used as anchors of row
162+// multiple item version of kHeaderContainerCode
160−// %2 is used as first child of the row
163+function kHeaderContainerCodeGenerator() {
161−// %3 is used as second child of the row
164+ var headerContainerCodeTemplate = 'Item { \n\
162−// %4 is used as third child of the row
165+ id: headerTitleContainer; \n\
163−var kHeaderRow3Code = 'Row { \n\
166+ anchors { %1 } \n\
164− id: row; \n\
167+ width: parent.width - x; \n\
165− objectName: "outerRow"; \n\
168+ implicitHeight: %2; \n\
166− property real margins: units.gu(1); \n\
167− spacing: margins; \n\
168− height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; \n\
169− anchors { %1 } \n\
170− anchors.right: parent.right; \n\
171− anchors.margins: margins;\n\
172− data: [ %2\n\
169+ data: [ \n\
173− ,\n\
174 %3 \n\
170 %3 \n\
175− ,\n\
176− %4 \n\
177− ] \n\
178− }\n';
179−
180−// %1 is used as first child of the column
181−// %2 is used as second child of the column
182−var kHeaderColumnCode = 'Column { \n\
183− anchors.verticalCenter: parent.verticalCenter; \n\
184− spacing: units.dp(2); \n\
185− width: parent.width - x;\n\
186− data: [ %1\n\
187− ,\n\
188− %2 \n\
189− ] \n\
171+ ]\n\
190 }\n';
172 }\n';
191−
192−// multiple column version of kHeaderColumnCode.
193−function kHeaderColumnCodeGenerator() {
194− var headerColumnCodeTemplate = 'Column { \n\
195− anchors.verticalCenter: parent.verticalCenter; \n\
196− spacing: units.dp(2); \n\
197− width: parent.width - x;\n\
198− data: [ \n\
199− %1 \n\
200− ]\n\
201− }\n';
202 var args = Array.prototype.slice.call(arguments);
173 var args = Array.prototype.slice.call(arguments);
203− var code = headerColumnCodeTemplate.arg(args.join(',\n'));
174+ var code = headerContainerCodeTemplate.arg(args.shift()).arg(args.shift()).arg(args.join(',\n'));
204 return code;
175 return code;
205}
176}
206
177
@@ -224,7 +195,7 @@ var kMascotImageCode = 'Image { \n\
224 objectName: "mascotImage"; \n\
195 objectName: "mascotImage"; \n\
225 anchors { %1 } \n\
196 anchors { %1 } \n\
226 readonly property int maxSize: Math.max(width, height) * 4; \n\
197 readonly property int maxSize: Math.max(width, height) * 4; \n\
227− source: cardData && cardData["mascot"]; \n\
198+ source: cardData && cardData["mascot"] || ""; \n\
228 width: units.gu(6); \n\
199 width: units.gu(6); \n\
229 height: units.gu(5.625); \n\
200 height: units.gu(5.625); \n\
230 sourceSize { width: maxSize; height: maxSize } \n\
201 sourceSize { width: maxSize; height: maxSize } \n\
@@ -253,6 +224,22 @@ var kTitleLabelCode = 'Label { \n\
253 horizontalAlignment: root.headerAlignment; \n\
224 horizontalAlignment: root.headerAlignment; \n\
254 }\n';
225 }\n';
255
226
227+// %1 is used as extra anchors of emblemIcon
228+// %2 is used as color of emblemIcon
229+var kEmblemIconCode = 'Icon { \n\
230+ id: emblemIcon; \n\
231+ objectName: "emblemIcon"; \n\
232+ anchors { \n\
233+ bottom: titleLabel.baseline; \n\
234+ right: parent.right; \n\
235+ %1
236+ } \n\
237+ source: cardData && cardData["emblem"] || ""; \n\
238+ color: %2; \n\
239+ width: height; \n\
240+ height: source != "" ? titleLabel.font.pixelSize : 0; \n\
241+ }\n';
242+
256// %1 is used as anchors of touchdown effect
243// %1 is used as anchors of touchdown effect
257var kTouchdownCode = 'UbuntuShape { \n\
244var kTouchdownCode = 'UbuntuShape { \n\
258 id: touchdown; \n\
245 id: touchdown; \n\
@@ -269,6 +256,7 @@ var kSubtitleLabelCode = 'Label { \n\
269 id: subtitleLabel; \n\
256 id: subtitleLabel; \n\
270 objectName: "subtitleLabel"; \n\
257 objectName: "subtitleLabel"; \n\
271 anchors { %1 } \n\
258 anchors { %1 } \n\
259+ anchors.topMargin: units.dp(2); \n\
272 elide: Text.ElideRight; \n\
260 elide: Text.ElideRight; \n\
273 fontSize: "small"; \n\
261 fontSize: "small"; \n\
274 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
262 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); \n\
@@ -280,12 +268,13 @@ var kSubtitleLabelCode = 'Label { \n\
280 }\n';
268 }\n';
281
269
282// %1 is used as anchors of attributesRow
270// %1 is used as anchors of attributesRow
271+// %2 is used as color of attributesRow
283var kAttributesRowCode = 'CardAttributes { \n\
272var kAttributesRowCode = 'CardAttributes { \n\
284 id: attributesRow; \n\
273 id: attributesRow; \n\
285 objectName: "attributesRow"; \n\
274 objectName: "attributesRow"; \n\
286 anchors { %1 } \n\
275 anchors { %1 } \n\
287 color: %2; \n\
276 color: %2; \n\
288− model: cardData["attributes"]; \n\
277+ model: cardData && cardData["attributes"]; \n\
289 }\n';
278 }\n';
290
279
291// %1 is used as top anchor of summary
280// %1 is used as top anchor of summary
@@ -335,10 +324,11 @@ function cardString(template, components) {
335 var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);
324 var hasBackground = !isHorizontal && (template["card-background"] || components["background"] || artAndSummary);
336 var hasTitle = components["title"] || false;
325 var hasTitle = components["title"] || false;
337 var hasMascot = components["mascot"] || false;
326 var hasMascot = components["mascot"] || false;
327+ var hasEmblem = components["emblem"] && !(hasMascot && template["card-size"] === "small") || false;
338 var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);
328 var headerAsOverlay = hasArt && template && template["overlay"] === true && (hasTitle || hasMascot);
339 var hasSubtitle = hasTitle && components["subtitle"] || false;
329 var hasSubtitle = hasTitle && components["subtitle"] || false;
340 var hasHeaderRow = hasMascot && hasTitle;
330 var hasHeaderRow = hasMascot && hasTitle;
341− var hasAttributes = hasTitle && components["attributes"] || false;
331+ var hasAttributes = hasTitle && components["attributes"]["field"] || false;
342
332
343 if (hasBackground) {
333 if (hasBackground) {
344 code += kBackgroundLoaderCode;
334 code += kBackgroundLoaderCode;
@@ -349,9 +339,9 @@ function cardString(template, components) {
349 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
339 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
350
340
351 var widthCode, heightCode;
341 var widthCode, heightCode;
352− var anchors;
342+ var artAnchors;
353 if (isHorizontal) {
343 if (isHorizontal) {
354− anchors = 'left: parent.left';
344+ artAnchors = 'left: parent.left';
355 if (hasMascot || hasTitle) {
345 if (hasMascot || hasTitle) {
356 widthCode = 'height * artShape.aspect'
346 widthCode = 'height * artShape.aspect'
357 heightCode = 'headerHeight + 2 * units.gu(1)';
347 heightCode = 'headerHeight + 2 * units.gu(1)';
@@ -362,12 +352,12 @@ function cardString(template, components) {
362 heightCode = 'units.gu(7.625)';
352 heightCode = 'units.gu(7.625)';
363 }
353 }
364 } else {
354 } else {
365− anchors = 'horizontalCenter: parent.horizontalCenter;';
355+ artAnchors = 'horizontalCenter: parent.horizontalCenter;';
366 widthCode = 'root.width'
356 widthCode = 'root.width'
367 heightCode = 'width / artShape.aspect';
357 heightCode = 'width / artShape.aspect';
368 }
358 }
369
359
370− code += kArtShapeHolderCode.arg(anchors).arg(widthCode).arg(heightCode);
360+ code += kArtShapeHolderCode.arg(artAnchors).arg(widthCode).arg(heightCode);
371 } else {
361 } else {
372 code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
362 code += 'readonly property size artShapeSize: Qt.size(-1, -1);\n'
373 }
363 }
@@ -404,6 +394,8 @@ function cardString(template, components) {
404 headerLeftAnchor = 'left: parent.left;\n';
394 headerLeftAnchor = 'left: parent.left;\n';
405 }
395 }
406
396
397+ var touchdownOnArtShape = !hasBackground && hasArt && !hasMascot && !hasSummary;
398+
407 if (hasHeaderRow) {
399 if (hasHeaderRow) {
408 code += 'readonly property int headerHeight: row.height;\n'
400 code += 'readonly property int headerHeight: row.height;\n'
409 } else if (hasMascot) {
401 } else if (hasMascot) {
@@ -424,192 +416,241 @@ function cardString(template, components) {
424 code += 'readonly property int headerHeight: 0;\n'
416 code += 'readonly property int headerHeight: 0;\n'
425 }
417 }
426
418
427− var mascotShapeCode = "";
419+ var mascotShapeCode = '';
428− var mascotCode = "";
420+ var mascotCode = '';
429 if (hasMascot) {
421 if (hasMascot) {
430 var useMascotShape = !hasBackground && !headerAsOverlay;
422 var useMascotShape = !hasBackground && !headerAsOverlay;
431− var anchors = "";
423+ var mascotAnchors = '';
432 if (!hasHeaderRow) {
424 if (!hasHeaderRow) {
433− anchors += headerLeftAnchor;
425+ mascotAnchors += headerLeftAnchor;
434− anchors += headerVerticalAnchors;
426+ mascotAnchors += headerVerticalAnchors;
435 if (!headerLeftAnchorHasMargin) {
427 if (!headerLeftAnchorHasMargin) {
436− anchors += 'leftMargin: units.gu(1);\n'
428+ mascotAnchors += 'leftMargin: units.gu(1);\n'
437 }
429 }
438 } else {
430 } else {
439− anchors = "verticalCenter: parent.verticalCenter;"
431+ mascotAnchors = 'verticalCenter: parent.verticalCenter;'
440 }
432 }
441
433
442 if (useMascotShape) {
434 if (useMascotShape) {
443− mascotShapeCode = kMascotShapeLoaderCode.arg(anchors);
435+ mascotShapeCode = kMascotShapeLoaderCode.arg(mascotAnchors);
444 }
436 }
445
437
446 var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
438 var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
447− mascotCode = kMascotImageCode.arg(anchors).arg(mascotImageVisible);
439+ mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible);
448 }
440 }
449
441
450− 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)';
451
443
444+ var hasTitleContainer = hasTitle && (hasEmblem || (hasMascot && (hasSubtitle || hasAttributes)));
452− var titleSubtitleCode = "";
445+ var titleSubtitleCode = '';
453 if (hasTitle) {
446 if (hasTitle) {
454− var color;
447+ var titleColor;
455 if (headerAsOverlay) {
448 if (headerAsOverlay) {
456− color = '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)';
457 } else if (hasSummary) {
450 } else if (hasSummary) {
458− color = 'summary.color';
451+ titleColor = 'summary.color';
459 } else if (hasBackground) {
452 } else if (hasBackground) {
460− color = summaryColorWithBackground;
453+ titleColor = summaryColorWithBackground;
461 } else {
454 } else {
462− color = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';
455+ titleColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
463 }
456 }
464
457
465 var titleAnchors;
458 var titleAnchors;
466 var subtitleAnchors;
459 var subtitleAnchors;
467 var attributesAnchors;
460 var attributesAnchors;
461+ var titleContainerAnchors;
462+ var titleRightAnchor;
463+
464+ var extraRightAnchor = '';
465+ var extraLeftAnchor = '';
466+ if (!touchdownOnArtShape) {
467+ extraRightAnchor = 'rightMargin: units.gu(1); \n';
468+ extraLeftAnchor = 'leftMargin: units.gu(1); \n';
469+ }
470+
468− if (hasMascot && (hasSubtitle || hasAttributes)) {
471+ if (hasMascot) {
469− // Using row + column
472+ titleContainerAnchors = 'verticalCenter: parent.verticalCenter; ';
473+ } else {
474+ titleContainerAnchors = 'right: parent.right; ';
475+ titleContainerAnchors += headerLeftAnchor;
476+ titleContainerAnchors += headerVerticalAnchors;
477+ if (!headerLeftAnchorHasMargin) {
478+ titleContainerAnchors += extraLeftAnchor;
479+ }
480+ }
481+ if (hasEmblem) {
482+ titleRightAnchor = 'right: emblemIcon.left; \n\
483+ rightMargin: emblemIcon.width > 0 ? units.gu(0.5) : 0; \n';
484+ } else {
485+ titleRightAnchor = 'right: parent.right; \n'
486+ titleRightAnchor += extraRightAnchor;
487+ }
488+
489+ if (hasTitleContainer) {
490+ // Using headerTitleContainer
491+ titleAnchors = titleRightAnchor;
470− titleAnchors = 'left: parent.left; right: parent.right';
492+ titleAnchors += 'left: parent.left; \n\
493+ top: parent.top;';
494+ subtitleAnchors = 'right: parent.right; \n\
495+ left: parent.left; \n';
471− subtitleAnchors = titleAnchors;
496+ subtitleAnchors += extraRightAnchor;
497+ if (hasSubtitle) {
498+ attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
499+ subtitleAnchors += 'top: titleLabel.bottom;\n';
500+ } else {
472− attributesAnchors = subtitleAnchors;
501+ attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
502+ }
473 } else if (hasMascot) {
503 } else if (hasMascot) {
474− // Using row + label
504+ // Using row + titleContainer
475− titleAnchors = 'verticalCenter: parent.verticalCenter;\n'
505+ titleAnchors = 'verticalCenter: parent.verticalCenter;\n';
476 } else {
506 } else {
477 if (headerAsOverlay) {
507 if (headerAsOverlay) {
478 // Using anchors to the overlay
508 // Using anchors to the overlay
509+ titleAnchors = titleRightAnchor;
479− titleAnchors = 'left: parent.left; \n\
510+ titleAnchors += 'left: parent.left; \n\
480− leftMargin: units.gu(1); \n\
511+ leftMargin: units.gu(1); \n\
481− right: parent.right; \n\
482− rightMargin: units.gu(1); \n\
483− top: overlayLoader.top; \n\
512+ top: overlayLoader.top; \n\
484− topMargin: units.gu(1);\n';
513+ topMargin: units.gu(1);\n';
485 } else {
514 } else {
486 // Using anchors to the mascot/parent
515 // Using anchors to the mascot/parent
487− titleAnchors = "right: parent.right;\n";
516+ titleAnchors = titleRightAnchor;
488− titleAnchors += "rightMargin: units.gu(1);\n";
489 titleAnchors += headerLeftAnchor;
517 titleAnchors += headerLeftAnchor;
490 titleAnchors += headerVerticalAnchors;
518 titleAnchors += headerVerticalAnchors;
491 if (!headerLeftAnchorHasMargin) {
519 if (!headerLeftAnchorHasMargin) {
492− titleAnchors += 'leftMargin: units.gu(1);\n'
520+ titleAnchors += extraLeftAnchor;
493 }
521 }
494 }
522 }
495 subtitleAnchors = 'left: titleLabel.left; \n\
523 subtitleAnchors = 'left: titleLabel.left; \n\
496− leftMargin: titleLabel.leftMargin; \n\
524+ leftMargin: titleLabel.leftMargin; \n';
497− right: titleLabel.right; \n\
525+ subtitleAnchors += extraRightAnchor;
498− rightMargin: titleLabel.rightMargin; \n\
526+ if (hasEmblem) {
499− top: titleLabel.bottom; \n\
527+ // using container
500− topMargin: units.dp(2);\n';
528+ subtitleAnchors += 'right: parent.right; \n';
529+ } else {
530+ subtitleAnchors += 'right: titleLabel.right; \n';
531+ }
532+
501 if (hasSubtitle) {
533 if (hasSubtitle) {
502− attributesAnchors = 'left: subtitleLabel.left; \n\
534+ attributesAnchors = subtitleAnchors + 'top: subtitleLabel.bottom;\n';
503− leftMargin: subtitleLabel.leftMargin; \n\
535+ subtitleAnchors += 'top: titleLabel.bottom;\n';
504− right: subtitleLabel.right; \n\
505− rightMargin: subtitleLabel.rightMargin; \n\
506− top: subtitleLabel.bottom; \n\
507− topMargin: units.dp(2);\n';
508 } else {
536 } else {
509− attributesAnchors = subtitleAnchors;
537+ attributesAnchors = subtitleAnchors + 'top: titleLabel.bottom;\n';
510 }
538 }
511 }
539 }
512
540
541+ // code for different elements
513 var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
542 var titleLabelVisibleExtra = (headerAsOverlay ? '&& overlayLoader.active': '');
514− var titleCode = kTitleLabelCode.arg(titleAnchors).arg(color).arg(titleLabelVisibleExtra);
543+ var titleCode = kTitleLabelCode.arg(titleAnchors).arg(titleColor).arg(titleLabelVisibleExtra);
515− var subtitleCode = "";
544+ var subtitleCode;
545+ var attributesCode;
546+
547+ // code for the title container
548+ var containerCode = [];
549+ var containerHeight = 'titleLabel.height';
550+ containerCode.push(titleCode);
516 if (hasSubtitle) {
551 if (hasSubtitle) {
517− subtitleCode += kSubtitleLabelCode.arg(subtitleAnchors).arg(color);
552+ subtitleCode = kSubtitleLabelCode.arg(subtitleAnchors).arg(titleColor);
553+ containerCode.push(subtitleCode);
554+ containerHeight += ' + subtitleLabel.height';
555+ }
556+ if (hasEmblem) {
557+ containerCode.push(kEmblemIconCode.arg(extraRightAnchor).arg(titleColor));
558+ }
559+ if (hasAttributes) {
560+ attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(titleColor);
561+ containerCode.push(attributesCode);
562+ containerHeight += ' + attributesRow.height';
518 }
563 }
519
564
520− if (hasMascot && (hasSubtitle || hasAttributes)) {
565+ if (hasTitleContainer) {
521− // If using row + column wrap the code in the column
566+ // use container
522− titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(subtitleCode);
567+ titleSubtitleCode = kHeaderContainerCodeGenerator(titleContainerAnchors, containerHeight, containerCode);
523− if (hasSubtitle && hasAttributes) {
524− var attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(color);
525− titleSubtitleCode = kHeaderColumnCodeGenerator(titleCode, subtitleCode, attributesCode);
526− } else if (hasSubtitle) {
527− titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(subtitleCode);
528− } else if (hasAttributes) {
529− var attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(color);
530− titleSubtitleCode = kHeaderColumnCode.arg(titleCode).arg(attributesCode);
531− }
532 } else {
568 } else {
569+ // no container
533 titleSubtitleCode = titleCode;
570 titleSubtitleCode = titleCode;
534 if (hasSubtitle) {
571 if (hasSubtitle) {
535− titleSubtitleCode = titleSubtitleCode + subtitleCode;
572+ titleSubtitleCode += subtitleCode;
536 }
573 }
537 if (hasAttributes) {
574 if (hasAttributes) {
538− var attributesCode = kAttributesRowCode.arg(attributesAnchors).arg(color);
539− titleSubtitleCode = titleSubtitleCode + attributesCode;
575+ titleSubtitleCode += attributesCode;
540 }
576 }
541 }
577 }
542 }
578 }
543
579
544 if (hasHeaderRow) {
580 if (hasHeaderRow) {
581+ var rowCode = [mascotCode, titleSubtitleCode];
545− if (mascotShapeCode != "") {
582+ if (mascotShapeCode != '') {
546− code += kHeaderRow3Code.arg(headerVerticalAnchors + headerLeftAnchor).arg(mascotShapeCode).arg(mascotCode).arg(titleSubtitleCode);
583+ rowCode.unshift(mascotShapeCode);
547− } else {
548− code += kHeaderRow2Code.arg(headerVerticalAnchors + headerLeftAnchor).arg(mascotCode).arg(titleSubtitleCode);
549 }
584 }
585+ code += kHeaderRowCodeGenerator(headerVerticalAnchors + headerLeftAnchor, rowCode)
550 } else {
586 } else {
551 code += mascotShapeCode + mascotCode + titleSubtitleCode;
587 code += mascotShapeCode + mascotCode + titleSubtitleCode;
552 }
588 }
553
589
554 if (hasSummary) {
590 if (hasSummary) {
555 var summaryTopAnchor;
591 var summaryTopAnchor;
556− if (isHorizontal && hasArt) summaryTopAnchor = "artShapeHolder.bottom";
592+ if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
557− else if (headerAsOverlay && hasArt) summaryTopAnchor = "artShapeHolder.bottom";
593+ else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
558− else if (hasHeaderRow) summaryTopAnchor = "row.bottom";
594+ else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';
595+ else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';
559− else if (hasMascot) summaryTopAnchor = "mascotImage.bottom";
596+ else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';
560− else if (hasAttributes) summaryTopAnchor = "attributesRow.bottom";
597+ else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';
561− else if (hasSubtitle) summaryTopAnchor = "subtitleLabel.bottom";
598+ else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';
562− else if (hasTitle) summaryTopAnchor = "titleLabel.bottom";
599+ else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';
563− else if (hasArt) summaryTopAnchor = "artShapeHolder.bottom";
600+ else if (hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
564− else summaryTopAnchor = "parent.top";
601+ else summaryTopAnchor = 'parent.top';
565−
602+
566− var color;
603+ var summaryColor;
567 if (hasBackground) {
604 if (hasBackground) {
568− color = summaryColorWithBackground;
605+ summaryColor = summaryColorWithBackground;
569 } else {
606 } else {
570− color = 'root.scopeStyle ? root.scopeStyle.foreground : "grey"';
607+ summaryColor = 'root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText';
571 }
608 }
572
609
573 var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
610 var summaryTopMargin = (hasMascot || hasSubtitle || hasAttributes ? 'anchors.margins' : '0');
574
611
575− code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(color);
612+ code += kSummaryLabelCode.arg(summaryTopAnchor).arg(summaryTopMargin).arg(summaryColor);
576 }
613 }
577
614
578 var touchdownAnchors;
615 var touchdownAnchors;
579 if (hasBackground) {
616 if (hasBackground) {
580 touchdownAnchors = 'fill: backgroundLoader';
617 touchdownAnchors = 'fill: backgroundLoader';
581− } else if (hasArt && !hasMascot && !hasSummary) {
618+ } else if (touchdownOnArtShape) {
582 touchdownAnchors = 'fill: artShapeHolder';
619 touchdownAnchors = 'fill: artShapeHolder';
583 } else {
620 } else {
584 touchdownAnchors = 'fill: root'
621 touchdownAnchors = 'fill: root'
585 }
622 }
586 code += kTouchdownCode.arg(touchdownAnchors);
623 code += kTouchdownCode.arg(touchdownAnchors);
587
624
625+ var implicitHeight = 'implicitHeight: ';
588 if (hasSummary) {
626 if (hasSummary) {
589− code += 'implicitHeight: summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';
627+ implicitHeight += 'summary.y + summary.height + (summary.text ? units.gu(1) : 0);\n';
590 } else if (hasHeaderRow) {
628 } else if (hasHeaderRow) {
591− code += 'implicitHeight: row.y + row.height + units.gu(1);\n';
629+ implicitHeight += 'row.y + row.height + units.gu(1);\n';
592 } else if (hasMascot) {
630 } else if (hasMascot) {
593− code += 'implicitHeight: mascotImage.y + mascotImage.height;\n';
631+ implicitHeight += 'mascotImage.y + mascotImage.height;\n';
632+ } else if (hasTitleContainer) {
633+ implicitHeight += 'headerTitleContainer.y + headerTitleContainer.height + units.gu(1);\n';
594 } else if (hasAttributes) {
634 } else if (hasAttributes) {
595− code += 'implicitHeight: attributesRow.y + attributesRow.height + units.gu(1);\n';
635+ implicitHeight += 'attributesRow.y + attributesRow.height + units.gu(1);\n';
596 } else if (hasSubtitle) {
636 } else if (hasSubtitle) {
597− code += 'implicitHeight: subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';
637+ implicitHeight += 'subtitleLabel.y + subtitleLabel.height + units.gu(1);\n';
598 } else if (hasTitle) {
638 } else if (hasTitle) {
599− code += 'implicitHeight: titleLabel.y + titleLabel.height + units.gu(1);\n';
639+ implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';
600 } else if (hasArt) {
640 } else if (hasArt) {
601− code += 'implicitHeight: artShapeHolder.height;\n';
641+ implicitHeight += 'artShapeHolder.height;\n';
602 }
642 }
603 // Close the AbstractButton
643 // Close the AbstractButton
604− code += '}\n';
644+ code += implicitHeight + '}\n';
605
645
606 return code;
646 return code;
607}
647}
608
648
609function createCardComponent(parent, template, components) {
649function createCardComponent(parent, template, components) {
610 var imports = 'import QtQuick 2.2; \n\
650 var imports = 'import QtQuick 2.2; \n\
611− import Ubuntu.Components 0.1; \n\
651+ import Ubuntu.Components 1.1; \n\
612− import Dash 0.1;\n';
652+ import Dash 0.1;\n\
653+ import Utils 0.1;\n';
613 var card = cardString(template, components);
654 var card = cardString(template, components);
614 var code = imports + 'Component {\n' + card + '}\n';
655 var code = imports + 'Component {\n' + card + '}\n';
615
656
plugins/Dash/ScopeStyle.qml+18−16
@@ -15,6 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.2
17import QtQuick 2.2
18+import Utils 0.1
18
19
19/*! \brief Helper for processing scope customization options.
20/*! \brief Helper for processing scope customization options.
20
21
@@ -27,25 +28,17 @@ QtObject {
27 /// Style object passed from the scope
28 /// Style object passed from the scope
28 property var style: Object()
29 property var style: Object()
29
30
30− /*! \brief Calculate luminance of the passed color
31−
32− \note If not fully opaque, luminance is dependant on blending.
33− */
34− function luminance(color) {
35− return 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b;
36− }
37−
38 /// Color used for text and symbolic icons
31 /// Color used for text and symbolic icons
39 readonly property color foreground: "foreground-color" in style ? style["foreground-color"] : d.defaultDark
32 readonly property color foreground: "foreground-color" in style ? style["foreground-color"] : d.defaultDark
40
33
41 /// Luminance of the foreground color
34 /// Luminance of the foreground color
42− readonly property real foregroundLuminance: foreground ? luminance(foreground) : d.defaultForegroundLuminance
35+ readonly property real foregroundLuminance: foreground ? Style.luminance(foreground) : Style.luminance(d.defaultDark)
43
36
44 /// Color used for the overall background
37 /// Color used for the overall background
45− readonly property color background: "background-color" in style ? style["background-color"] : "transparent"
38+ readonly property color background: "background-color" in style ? style["background-color"] : "#00f5f5f5"
46
39
47− /// Luminance of the foreground color
40+ /// Luminance of the background color
48− readonly property real backgroundLuminance: background ? luminance(background) : d.defaultBackgroundLuminance
41+ readonly property real backgroundLuminance: background ? Style.luminance(background) : Style.luminance(d.defaultLight)
49
42
50 /*! \brief Luminance threshold for switching between fore and background color
43 /*! \brief Luminance threshold for switching between fore and background color
51
44
@@ -78,18 +71,27 @@ QtObject {
78 readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
71 readonly property url headerLogo: "logo" in d.headerStyle ? d.headerStyle["logo"] : ""
79
72
80 /// Background style for the header
73 /// Background style for the header
81− readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : ""
74+ readonly property url headerBackground: "background" in d.headerStyle ? d.headerStyle["background"] : "color:///#f5f5f5"
82
75
83 /// Foreground color for the header
76 /// Foreground color for the header
84 readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground
77 readonly property color headerForeground: "foreground-color" in d.headerStyle ? d.headerStyle["foreground-color"] : foreground
85
78
79+ /// Color of the header divider
80+ readonly property color headerDividerColor: "divider-color" in d.headerStyle ? d.headerStyle["divider-color"] : "#e0e0e0"
81+
82+ /// Background style for the navigation
83+ readonly property url navigationBackground: "navigation-background" in d.headerStyle ? d.headerStyle["navigation-background"] : "color:///#f5f5f5"
84+
85+ /// Color of the primary preview button
86+ readonly property color previewButtonColor: "preview-button-color" in style ? style["preview-button-color"] : Theme.palette.selected.foreground
87+
86 //! @cond
88 //! @cond
87 property var d: QtObject {
89 property var d: QtObject {
88 // FIXME: should be taken from the theme
90 // FIXME: should be taken from the theme
89 readonly property color defaultLight: "white"
91 readonly property color defaultLight: "white"
90− readonly property color defaultDark: "grey"
92+ readonly property color defaultDark: Theme.palette.normal.baseText
91− readonly property real defaultLightLuminance: luminance(defaultLight)
93+ readonly property real defaultLightLuminance: Style.luminance(defaultLight)
92− readonly property real defaultDarkLuminance: luminance(defaultDark)
94+ readonly property real defaultDarkLuminance: Style.luminance(defaultDark)
93
95
94 readonly property var headerStyle: "page-header" in style ? style["page-header"] : { }
96 readonly property var headerStyle: "page-header" in style ? style["page-header"] : { }
95 }
97 }
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/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/Utils/Style.jsnew file+33
@@ -0,0 +1,33 @@
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+.pragma library
18+
19+/*! \brief Calculate average luminance of the passed colors
20+
21+ \note If not fully opaque, luminance is dependant on blending.
22+ */
23+function luminance() {
24+ var sum = 0;
25+ for (var k in arguments) {
26+ // only way to convert string to color
27+ var c = Qt.lighter(arguments[k], 1.0);
28+
29+ sum += 0.2126 * c.r + 0.7152 * c.g + 0.0722 * c.b;
30+ }
31+
32+ return sum / arguments.length;
33+}
plugins/Utils/qmldir+1
@@ -1,3 +1,4 @@
1module Utils
1module Utils
2plugin Utils-qml
2plugin Utils-qml
3typeinfo Utils.qmltypes
3typeinfo Utils.qmltypes
4+Style 0.1 Style.js
po/am.po+75−39
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-08-04 16:30+0000\n"
11+"PO-Revision-Date: 2014-08-12 20:52+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-05 06:45+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr "አቋራጭ ማጣበቂያ"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "አቋራጭ መለያያ"
27msgstr "አቋራጭ መለያያ"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "በእርግጥ ሐይሉን ማጥፋት ይፈልጋሉ"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "ማጥፊያ"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "እንደገና ማስጀመሪያ"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "መሰረዣ"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "መግቢያውን መዝለያ"
47msgstr "መግቢያውን መዝለያ"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "የቀኝ ጠርዝ"
51msgstr "የቀኝ ጠርዝ"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"
55msgstr "ስልኩን ለመክፈት ከ ቀኝ ጠርዝ በኩል ወደ ግራ ይጥረጉ"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "የላይ ጠርዝ"
59msgstr "የላይ ጠርዝ"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"
63msgstr "ጠቋሚዎች ጋር ለመድረስ ከ ላይ ጠርዝ በኩል ወደ ታች ይጥረጉ"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "መዝጊያ"
67msgstr "መዝጊያ"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"
71msgstr "የማሰናጃውን መመልከቻ ለመዝጋት እንደገና ወደ ላይ ይጥረጉ"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "የግራ ጠርዝ"
75msgstr "የግራ ጠርዝ"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"
79msgstr "ከ ግራ በኩል ወደ ቀኝ ይጥረጉ በፍጥነት መተግበሪያዎች ጋር ለመድረስ እና ለማስጀመር"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "ጥሩ አድረገዋል"
83msgstr "ጥሩ አድረገዋል"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "የ ድንገተኛ ጥሪ"
93msgstr "የ ድንገተኛ ጥሪ"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr "እሺ"
97msgstr "እሺ"
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "ሰላም %1"
102msgstr "ሰላም %1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "ሰላም"
106msgstr "ሰላም"
91
107
@@ -97,19 +113,11 @@ msgstr "መሰረዣ"
97msgid "DONE"
113msgid "DONE"
98msgstr "ጨርሷል"
114msgstr "ጨርሷል"
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr "ተጨማሪ መመልከቻ"
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr "አነስተኛ መመልከቻ"
118msgstr "አነስተኛ መመልከቻ"
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr "የቅርብ ጊዜ"
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr "ሁሉንም መመልከቻ"
122msgstr "ሁሉንም መመልከቻ"
115
123
@@ -133,6 +141,26 @@ msgstr "ግምገማ መጨመሪያ"
133msgid "Send"
141msgid "Send"
134msgstr "መላኪያ"
142msgstr "መላኪያ"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr "ጨርሷል"
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr "ማስቀመጫ"
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr "የምወዳቸው"
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr "ሁሉንም"
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr "ለመክፈት ይጥረጉ"
166msgstr "ለመክፈት ይጥረጉ"
@@ -157,51 +185,59 @@ msgstr "አሁን ይናገሩ..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "በመናገር ላይ..."
186msgstr "በመናገር ላይ..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "የመግቢያ ቃል ማሳያ"
190msgstr "የመግቢያ ቃል ማሳያ"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
168#: qml/Panel/ActiveCallHint.qml:77
196#: qml/Panel/ActiveCallHint.qml:77
169msgid "Tap to return to call..."
197msgid "Tap to return to call..."
170−msgstr ""
198+msgstr "ወደ ጥሪው ለመመለስ መታ ያድርጉ..."
171
199
172#: qml/Panel/ActiveCallHint.qml:90
200#: qml/Panel/ActiveCallHint.qml:90
173msgid "Conference"
201msgid "Conference"
174msgstr "ስብሰባ"
202msgstr "ስብሰባ"
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr "ወረፋ በመጠበቅ ላይ…"
206msgstr "ወረፋ በመጠበቅ ላይ…"
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr "በማውረድ ላይ"
210msgstr "በማውረድ ላይ"
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186−msgstr ""
214+msgstr "ማስቆሚያ: ለመቀጠል መታ ያድርጉ"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr "ተሰርዟል"
218msgstr "ተሰርዟል"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr "ጨርሷል"
222msgstr "ጨርሷል"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
226+msgstr "አልተቻለም: እንደገና ለመሞከር መታ ያድርጉ"
227+
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
198msgstr ""
234msgstr ""
199
235
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "መፈለጊያ"
238msgstr "መፈለጊያ"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "እባክዎን ያስገቡ %1"
243msgstr "እባክዎን ያስገቡ %1"
po/ar.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,48 +26,64 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "تخطي المقدمة"
47msgstr "تخطي المقدمة"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "الحافة اليمنى"
51msgstr "الحافة اليمنى"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"
55msgstr "اسحب اصبعك من الحافة اليمنى لفتح قفل الهاتف"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "الحافة العلوية"
59msgstr "الحافة العلوية"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"
63msgstr "اسحب اصبعك من الحافة العلوية للوصول إلى المؤشرات"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "أغلق"
67msgstr "أغلق"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"
71msgstr "اسحب اصعبك لأعلى مرة أخرى لغلق شاشة الإعدادات"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "الحافة اليسرى"
75msgstr "الحافة اليسرى"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
80"اسحب أصبعك من الحافة اليسرى لإظهار شريط يونتي للوصول السريع للتطبيقات"
65
81
66−#: qml/Components/EdgeDemo.qml:227
82+#: qml/Components/EdgeDemo.qml:226
67msgid "Well done"
83msgid "Well done"
68msgstr "أحسنت!"
84msgstr "أحسنت!"
69
85
70−#: qml/Components/EdgeDemo.qml:228
86+#: qml/Components/EdgeDemo.qml:227
71msgid ""
87msgid ""
72"You have now mastered the edge gestures and can start using the "
88"You have now mastered the edge gestures and can start using the "
73"phone<br><br>Tap on the screen to start"
89"phone<br><br>Tap on the screen to start"
@@ -75,20 +91,20 @@ msgstr ""
75"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
91"أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "
76"الشاشة للبدء"
92"الشاشة للبدء"
77
93
78−#: qml/Components/Lockscreen.qml:214
94+#: qml/Components/Lockscreen.qml:220
79msgid "Emergency Call"
95msgid "Emergency Call"
80msgstr "مكالمة طوارئ"
96msgstr "مكالمة طوارئ"
81
97
82−#: qml/Components/Lockscreen.qml:231
98+#: qml/Components/Lockscreen.qml:243
83msgid "OK"
99msgid "OK"
84msgstr ""
100msgstr ""
85
101
86−#: qml/Components/PassphraseLockscreen.qml:60
102+#: qml/Components/PassphraseLockscreen.qml:62
87#, qt-format
103#, qt-format
88msgid "Hello %1"
104msgid "Hello %1"
89msgstr "مرحبا %1"
105msgstr "مرحبا %1"
90
106
91−#: qml/Components/PassphraseLockscreen.qml:60
107+#: qml/Components/PassphraseLockscreen.qml:62
92msgid "Hello"
108msgid "Hello"
93msgstr "مرحبًا"
109msgstr "مرحبًا"
94
110
@@ -100,19 +116,11 @@ msgstr ""
100msgid "DONE"
116msgid "DONE"
101msgstr ""
117msgstr ""
102
118
103−#: qml/Components/SeeMore.qml:35
104−msgid "See more"
105−msgstr "شاهد المزيد"
106−
107−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
119+#: qml/Dash/GenericScopeView.qml:358
108msgid "See less"
120msgid "See less"
109msgstr "شاهد أقل"
121msgstr "شاهد أقل"
110
122
111−#: qml/Dash/DashApps.qml:37
112−msgid "Recent"
113−msgstr "استُخدمت مؤخرًا"
114−
115−#: qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
116msgid "See all"
124msgid "See all"
117msgstr ""
125msgstr ""
118
126
@@ -136,6 +144,26 @@ msgstr "أضف تعليق"
136msgid "Send"
144msgid "Send"
137msgstr "أرسل"
145msgstr "أرسل"
138
146
147+#: qml/Dash/ScopesOverview.qml:200
148+msgid "Manage Dash"
149+msgstr ""
150+
151+#: qml/Dash/ScopesOverview.qml:405
152+msgid "Done"
153+msgstr ""
154+
155+#: qml/Dash/ScopesOverview.qml:431
156+msgid "Store"
157+msgstr ""
158+
159+#: qml/Dash/ScopesOverviewTab.qml:36
160+msgid "Favorites"
161+msgstr ""
162+
163+#: qml/Dash/ScopesOverviewTab.qml:54
164+msgid "All"
165+msgstr ""
166+
139#: qml/Greeter/Greeter.qml:157
167#: qml/Greeter/Greeter.qml:157
140msgid "Swipe to unlock"
168msgid "Swipe to unlock"
141msgstr "اسحب لفتح القفل"
169msgstr "اسحب لفتح القفل"
@@ -160,11 +188,11 @@ msgstr "تكلم الآن..."
160msgid "Speaking..."
188msgid "Speaking..."
161msgstr "تتكلم الآن..."
189msgstr "تتكلم الآن..."
162
190
163−#: qml/Notifications/NotificationMenuItemFactory.qml:91
191+#: qml/Notifications/NotificationMenuItemFactory.qml:100
164msgid "Show password"
192msgid "Show password"
165msgstr "عرض كلمة السر"
193msgstr "عرض كلمة السر"
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:103
195+#: qml/Notifications/NotificationMenuItemFactory.qml:115
168msgid "Please enter SIM PIN"
196msgid "Please enter SIM PIN"
169msgstr "من فضلك أدخِل رقم التعريف الشخصي لبطاقة SIM"
197msgstr "من فضلك أدخِل رقم التعريف الشخصي لبطاقة SIM"
170
198
@@ -176,35 +204,43 @@ msgstr ""
176msgid "Conference"
204msgid "Conference"
177msgstr ""
205msgstr ""
178
206
179−#: qml/Panel/Indicators/MenuItemFactory.qml:583
207+#: qml/Panel/Indicators/MenuItemFactory.qml:651
180msgid "In queue…"
208msgid "In queue…"
181msgstr ""
209msgstr ""
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:587
211+#: qml/Panel/Indicators/MenuItemFactory.qml:655
184msgid "Downloading"
212msgid "Downloading"
185msgstr ""
213msgstr ""
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:589
215+#: qml/Panel/Indicators/MenuItemFactory.qml:657
188msgid "Paused, tap to resume"
216msgid "Paused, tap to resume"
189msgstr ""
217msgstr ""
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:591
219+#: qml/Panel/Indicators/MenuItemFactory.qml:659
192msgid "Canceled"
220msgid "Canceled"
193msgstr ""
221msgstr ""
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:593
223+#: qml/Panel/Indicators/MenuItemFactory.qml:661
196msgid "Finished"
224msgid "Finished"
197msgstr ""
225msgstr ""
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:595
227+#: qml/Panel/Indicators/MenuItemFactory.qml:663
200msgid "Failed, tap to retry"
228msgid "Failed, tap to retry"
201msgstr ""
229msgstr ""
202
230
231+#: qml/Panel/Indicators/ModemInfoItem.qml:105
232+msgid "Unlock SIM"
233+msgstr ""
234+
235+#: qml/Panel/Indicators/RoamingIndication.qml:27
236+msgid "Roaming"
237+msgstr ""
238+
203#: qml/Panel/SearchIndicator.qml:27
239#: qml/Panel/SearchIndicator.qml:27
204msgid "Search"
240msgid "Search"
205msgstr "ابحث"
241msgstr "ابحث"
206
242
207−#: qml/Shell.qml:359
243+#: qml/Shell.qml:256
208#, qt-format
244#, qt-format
209msgid "Please enter %1"
245msgid "Please enter %1"
210msgstr "من فضلك أدخِل %1"
246msgstr "من فضلك أدخِل %1"
po/ast.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,49 +26,65 @@ msgstr "Anclar"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Desanclar"
27msgstr "Desanclar"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Omitir la intro"
47msgstr "Omitir la intro"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Berbesu drechu"
51msgstr "Berbesu drechu"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"
55msgstr "Esliza'l deu dende'l berbesu drechu pa desbloquiar el teléfonu"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Berbesu superior"
59msgstr "Berbesu superior"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"
63msgstr "Esliza'l deu dende'l berbesu superior p'acceder a los menús"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Zarrar"
67msgstr "Zarrar"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"
71msgstr "Esliza hacia arriba pa zarrar la pantalla d'axustes"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Berbesu esquierdu"
75msgstr "Berbesu esquierdu"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "
80"Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "
65"a les aplicaciones"
81"a les aplicaciones"
66
82
67−#: qml/Components/EdgeDemo.qml:227
83+#: qml/Components/EdgeDemo.qml:226
68msgid "Well done"
84msgid "Well done"
69msgstr "Bien fecho"
85msgstr "Bien fecho"
70
86
71−#: qml/Components/EdgeDemo.qml:228
87+#: qml/Components/EdgeDemo.qml:227
72msgid ""
88msgid ""
73"You have now mastered the edge gestures and can start using the "
89"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
90"phone<br><br>Tap on the screen to start"
@@ -76,20 +92,20 @@ msgstr ""
76"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
92"Agora yá domines los xestos de los berbesos y pues entamar a usar el "
77"teléfonu<br><br>Toca la pantalla pa comenzar"
93"teléfonu<br><br>Toca la pantalla pa comenzar"
78
94
79−#: qml/Components/Lockscreen.qml:214
95+#: qml/Components/Lockscreen.qml:220
80msgid "Emergency Call"
96msgid "Emergency Call"
81msgstr "Llamada d'emerxencia"
97msgstr "Llamada d'emerxencia"
82
98
83−#: qml/Components/Lockscreen.qml:231
99+#: qml/Components/Lockscreen.qml:243
84msgid "OK"
100msgid "OK"
85msgstr "Aceutar"
101msgstr "Aceutar"
86
102
87−#: qml/Components/PassphraseLockscreen.qml:60
103+#: qml/Components/PassphraseLockscreen.qml:62
88#, qt-format
104#, qt-format
89msgid "Hello %1"
105msgid "Hello %1"
90msgstr "Hola %1"
106msgstr "Hola %1"
91
107
92−#: qml/Components/PassphraseLockscreen.qml:60
108+#: qml/Components/PassphraseLockscreen.qml:62
93msgid "Hello"
109msgid "Hello"
94msgstr "Hola"
110msgstr "Hola"
95
111
@@ -101,19 +117,11 @@ msgstr "ENCABOXAR"
101msgid "DONE"
117msgid "DONE"
102msgstr "FECHO"
118msgstr "FECHO"
103
119
104−#: qml/Components/SeeMore.qml:35
105−msgid "See more"
106−msgstr "Ver más"
107−
108−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
109msgid "See less"
121msgid "See less"
110msgstr "Ver menos"
122msgstr "Ver menos"
111
123
112−#: qml/Dash/DashApps.qml:37
113−msgid "Recent"
114−msgstr "Reciente"
115−
116−#: qml/Dash/GenericScopeView.qml:330
124+#: qml/Dash/GenericScopeView.qml:358
117msgid "See all"
125msgid "See all"
118msgstr "Ver too"
126msgstr "Ver too"
119
127
@@ -137,6 +145,26 @@ msgstr "Amestar una reseña"
137msgid "Send"
145msgid "Send"
138msgstr "Unviar"
146msgstr "Unviar"
139
147
148+#: qml/Dash/ScopesOverview.qml:200
149+msgid "Manage Dash"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:405
153+msgid "Done"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverview.qml:431
157+msgid "Store"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:36
161+msgid "Favorites"
162+msgstr ""
163+
164+#: qml/Dash/ScopesOverviewTab.qml:54
165+msgid "All"
166+msgstr ""
167+
140#: qml/Greeter/Greeter.qml:157
168#: qml/Greeter/Greeter.qml:157
141msgid "Swipe to unlock"
169msgid "Swipe to unlock"
142msgstr "Esliza pa desbloquiar"
170msgstr "Esliza pa desbloquiar"
@@ -161,11 +189,11 @@ msgstr "Fala agora…"
161msgid "Speaking..."
189msgid "Speaking..."
162msgstr "Falando…"
190msgstr "Falando…"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:91
192+#: qml/Notifications/NotificationMenuItemFactory.qml:100
165msgid "Show password"
193msgid "Show password"
166msgstr "Amosar contraseña"
194msgstr "Amosar contraseña"
167
195
168−#: qml/Notifications/NotificationMenuItemFactory.qml:103
196+#: qml/Notifications/NotificationMenuItemFactory.qml:115
169msgid "Please enter SIM PIN"
197msgid "Please enter SIM PIN"
170msgstr "Escribi'l PIN de la SIM"
198msgstr "Escribi'l PIN de la SIM"
171
199
@@ -177,35 +205,43 @@ msgstr "Tocar pa tornar a la llamada..."
177msgid "Conference"
205msgid "Conference"
178msgstr "Conferencia"
206msgstr "Conferencia"
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:583
208+#: qml/Panel/Indicators/MenuItemFactory.qml:651
181msgid "In queue…"
209msgid "In queue…"
182msgstr "N'espera…"
210msgstr "N'espera…"
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:587
212+#: qml/Panel/Indicators/MenuItemFactory.qml:655
185msgid "Downloading"
213msgid "Downloading"
186msgstr "Baxando"
214msgstr "Baxando"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:589
216+#: qml/Panel/Indicators/MenuItemFactory.qml:657
189msgid "Paused, tap to resume"
217msgid "Paused, tap to resume"
190msgstr "Posáu, toca pa reanudar"
218msgstr "Posáu, toca pa reanudar"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:591
220+#: qml/Panel/Indicators/MenuItemFactory.qml:659
193msgid "Canceled"
221msgid "Canceled"
194msgstr "Encaboxáu"
222msgstr "Encaboxáu"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:593
224+#: qml/Panel/Indicators/MenuItemFactory.qml:661
197msgid "Finished"
225msgid "Finished"
198msgstr "Finó"
226msgstr "Finó"
199
227
200−#: qml/Panel/Indicators/MenuItemFactory.qml:595
228+#: qml/Panel/Indicators/MenuItemFactory.qml:663
201msgid "Failed, tap to retry"
229msgid "Failed, tap to retry"
202msgstr "Falló, toca pa reintentar"
230msgstr "Falló, toca pa reintentar"
203
231
232+#: qml/Panel/Indicators/ModemInfoItem.qml:105
233+msgid "Unlock SIM"
234+msgstr ""
235+
236+#: qml/Panel/Indicators/RoamingIndication.qml:27
237+msgid "Roaming"
238+msgstr ""
239+
204#: qml/Panel/SearchIndicator.qml:27
240#: qml/Panel/SearchIndicator.qml:27
205msgid "Search"
241msgid "Search"
206msgstr "Guetar"
242msgstr "Guetar"
207
243
208−#: qml/Shell.qml:359
244+#: qml/Shell.qml:256
209#, qt-format
245#, qt-format
210msgid "Please enter %1"
246msgid "Please enter %1"
211msgstr "Introduz %1"
247msgstr "Introduz %1"
po/az.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,67 +26,83 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Intro -nu keç"
47msgstr "Intro -nu keç"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Sağ Künc"
51msgstr "Sağ Künc"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Kilidi açmaq üçün sağ küncdən çəkin"
55msgstr "Kilidi açmaq üçün sağ küncdən çəkin"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Yuxarı künc"
59msgstr "Yuxarı künc"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Göstəricilərə keçid üçün yuxarı küncdən çəkin"
63msgstr "Göstəricilərə keçid üçün yuxarı küncdən çəkin"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Bağla"
67msgstr "Bağla"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı çəkin"
71msgstr "Nizamlamalar ekranını bağlamaq üçün yenidən yuxarı çəkin"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Sol künc"
75msgstr "Sol künc"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
80"Applikasiyalara sürətli keçid üçün paneli açmaq üçün sol küncdən çəkin"
65
81
66−#: qml/Components/EdgeDemo.qml:227
82+#: qml/Components/EdgeDemo.qml:226
67msgid "Well done"
83msgid "Well done"
68msgstr "Təbriklər"
84msgstr "Təbriklər"
69
85
70−#: qml/Components/EdgeDemo.qml:228
86+#: qml/Components/EdgeDemo.qml:227
71msgid ""
87msgid ""
72"You have now mastered the edge gestures and can start using the "
88"You have now mastered the edge gestures and can start using the "
73"phone<br><br>Tap on the screen to start"
89"phone<br><br>Tap on the screen to start"
74msgstr ""
90msgstr ""
75
91
76−#: qml/Components/Lockscreen.qml:214
92+#: qml/Components/Lockscreen.qml:220
77msgid "Emergency Call"
93msgid "Emergency Call"
78msgstr "Zərurət zəngi"
94msgstr "Zərurət zəngi"
79
95
80−#: qml/Components/Lockscreen.qml:231
96+#: qml/Components/Lockscreen.qml:243
81msgid "OK"
97msgid "OK"
82msgstr ""
98msgstr ""
83
99
84−#: qml/Components/PassphraseLockscreen.qml:60
100+#: qml/Components/PassphraseLockscreen.qml:62
85#, qt-format
101#, qt-format
86msgid "Hello %1"
102msgid "Hello %1"
87msgstr "Xoş gördük %1"
103msgstr "Xoş gördük %1"
88
104
89−#: qml/Components/PassphraseLockscreen.qml:60
105+#: qml/Components/PassphraseLockscreen.qml:62
90msgid "Hello"
106msgid "Hello"
91msgstr "Xoş gördük"
107msgstr "Xoş gördük"
92
108
@@ -98,19 +114,11 @@ msgstr ""
98msgid "DONE"
114msgid "DONE"
99msgstr ""
115msgstr ""
100
116
101−#: qml/Components/SeeMore.qml:35
102−msgid "See more"
103−msgstr ""
104−
105−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
117+#: qml/Dash/GenericScopeView.qml:358
106msgid "See less"
118msgid "See less"
107msgstr ""
119msgstr ""
108
120
109−#: qml/Dash/DashApps.qml:37
110−msgid "Recent"
111−msgstr ""
112−
113−#: qml/Dash/GenericScopeView.qml:330
121+#: qml/Dash/GenericScopeView.qml:358
114msgid "See all"
122msgid "See all"
115msgstr ""
123msgstr ""
116
124
@@ -134,6 +142,26 @@ msgstr "Rəy yaz"
134msgid "Send"
142msgid "Send"
135msgstr "Göndər"
143msgstr "Göndər"
136
144
145+#: qml/Dash/ScopesOverview.qml:200
146+msgid "Manage Dash"
147+msgstr ""
148+
149+#: qml/Dash/ScopesOverview.qml:405
150+msgid "Done"
151+msgstr ""
152+
153+#: qml/Dash/ScopesOverview.qml:431
154+msgid "Store"
155+msgstr ""
156+
157+#: qml/Dash/ScopesOverviewTab.qml:36
158+msgid "Favorites"
159+msgstr ""
160+
161+#: qml/Dash/ScopesOverviewTab.qml:54
162+msgid "All"
163+msgstr ""
164+
137#: qml/Greeter/Greeter.qml:157
165#: qml/Greeter/Greeter.qml:157
138msgid "Swipe to unlock"
166msgid "Swipe to unlock"
139msgstr ""
167msgstr ""
@@ -158,11 +186,11 @@ msgstr "Danışın..."
158msgid "Speaking..."
186msgid "Speaking..."
159msgstr "Danışır..."
187msgstr "Danışır..."
160
188
161−#: qml/Notifications/NotificationMenuItemFactory.qml:91
189+#: qml/Notifications/NotificationMenuItemFactory.qml:100
162msgid "Show password"
190msgid "Show password"
163msgstr "Parolu göstər"
191msgstr "Parolu göstər"
164
192
165−#: qml/Notifications/NotificationMenuItemFactory.qml:103
193+#: qml/Notifications/NotificationMenuItemFactory.qml:115
166msgid "Please enter SIM PIN"
194msgid "Please enter SIM PIN"
167msgstr ""
195msgstr ""
168
196
@@ -174,35 +202,43 @@ msgstr ""
174msgid "Conference"
202msgid "Conference"
175msgstr ""
203msgstr ""
176
204
177−#: qml/Panel/Indicators/MenuItemFactory.qml:583
205+#: qml/Panel/Indicators/MenuItemFactory.qml:651
178msgid "In queue…"
206msgid "In queue…"
179msgstr ""
207msgstr ""
180
208
181−#: qml/Panel/Indicators/MenuItemFactory.qml:587
209+#: qml/Panel/Indicators/MenuItemFactory.qml:655
182msgid "Downloading"
210msgid "Downloading"
183msgstr ""
211msgstr ""
184
212
185−#: qml/Panel/Indicators/MenuItemFactory.qml:589
213+#: qml/Panel/Indicators/MenuItemFactory.qml:657
186msgid "Paused, tap to resume"
214msgid "Paused, tap to resume"
187msgstr ""
215msgstr ""
188
216
189−#: qml/Panel/Indicators/MenuItemFactory.qml:591
217+#: qml/Panel/Indicators/MenuItemFactory.qml:659
190msgid "Canceled"
218msgid "Canceled"
191msgstr ""
219msgstr ""
192
220
193−#: qml/Panel/Indicators/MenuItemFactory.qml:593
221+#: qml/Panel/Indicators/MenuItemFactory.qml:661
194msgid "Finished"
222msgid "Finished"
195msgstr ""
223msgstr ""
196
224
197−#: qml/Panel/Indicators/MenuItemFactory.qml:595
225+#: qml/Panel/Indicators/MenuItemFactory.qml:663
198msgid "Failed, tap to retry"
226msgid "Failed, tap to retry"
199msgstr ""
227msgstr ""
200
228
229+#: qml/Panel/Indicators/ModemInfoItem.qml:105
230+msgid "Unlock SIM"
231+msgstr ""
232+
233+#: qml/Panel/Indicators/RoamingIndication.qml:27
234+msgid "Roaming"
235+msgstr ""
236+
201#: qml/Panel/SearchIndicator.qml:27
237#: qml/Panel/SearchIndicator.qml:27
202msgid "Search"
238msgid "Search"
203msgstr "Axtar"
239msgstr "Axtar"
204
240
205−#: qml/Shell.qml:359
241+#: qml/Shell.qml:256
206#, qt-format
242#, qt-format
207msgid "Please enter %1"
243msgid "Please enter %1"
208msgstr "Xahiş edirik daxil edin: %1"
244msgstr "Xahiş edirik daxil edin: %1"
po/bg.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,73 +26,89 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Пропусни интрото"
47msgstr "Пропусни интрото"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Десен край"
51msgstr "Десен край"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40"Опитайте се да приплъзнете пръста си от десния край към левия, за да "
56"Опитайте се да приплъзнете пръста си от десния край към левия, за да "
41"отключите телефона"
57"отключите телефона"
42
58
43−#: qml/Components/EdgeDemo.qml:145
59+#: qml/Components/EdgeDemo.qml:144
44msgid "Top edge"
60msgid "Top edge"
45msgstr "Горен край"
61msgstr "Горен край"
46
62
47−#: qml/Components/EdgeDemo.qml:146
63+#: qml/Components/EdgeDemo.qml:145
48msgid "Try swiping from the top edge to access the indicators"
64msgid "Try swiping from the top edge to access the indicators"
49msgstr ""
65msgstr ""
50"Опитайте се да приплъзнете пръста си от горния край към долния, за да "
66"Опитайте се да приплъзнете пръста си от горния край към долния, за да "
51"получите достъп до индикаторите"
67"получите достъп до индикаторите"
52
68
53−#: qml/Components/EdgeDemo.qml:171
69+#: qml/Components/EdgeDemo.qml:170
54msgid "Close"
70msgid "Close"
55msgstr "Затвори"
71msgstr "Затвори"
56
72
57−#: qml/Components/EdgeDemo.qml:172
73+#: qml/Components/EdgeDemo.qml:171
58msgid "Swipe up again to close the settings screen"
74msgid "Swipe up again to close the settings screen"
59msgstr ""
75msgstr ""
60"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"
76"Отново приплъзнете пръста си нагоре за да затворите екрана с настройките"
61
77
62−#: qml/Components/EdgeDemo.qml:199
78+#: qml/Components/EdgeDemo.qml:198
63msgid "Left edge"
79msgid "Left edge"
64msgstr "Ляв край"
80msgstr "Ляв край"
65
81
66−#: qml/Components/EdgeDemo.qml:200
82+#: qml/Components/EdgeDemo.qml:199
67msgid "Swipe from the left to reveal the launcher for quick access to apps"
83msgid "Swipe from the left to reveal the launcher for quick access to apps"
68msgstr ""
84msgstr ""
69"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "
85"Приплъзнете пръста си от левия край към десния, за да отворите стартера за "
70"бърз достъп до приложенията"
86"бърз достъп до приложенията"
71
87
72−#: qml/Components/EdgeDemo.qml:227
88+#: qml/Components/EdgeDemo.qml:226
73msgid "Well done"
89msgid "Well done"
74msgstr "Великолепно"
90msgstr "Великолепно"
75
91
76−#: qml/Components/EdgeDemo.qml:228
92+#: qml/Components/EdgeDemo.qml:227
77msgid ""
93msgid ""
78"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 "
79"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
80msgstr ""
96msgstr ""
81
97
82−#: qml/Components/Lockscreen.qml:214
98+#: qml/Components/Lockscreen.qml:220
83msgid "Emergency Call"
99msgid "Emergency Call"
84msgstr "Спешно повикване"
100msgstr "Спешно повикване"
85
101
86−#: qml/Components/Lockscreen.qml:231
102+#: qml/Components/Lockscreen.qml:243
87msgid "OK"
103msgid "OK"
88msgstr ""
104msgstr ""
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91#, qt-format
107#, qt-format
92msgid "Hello %1"
108msgid "Hello %1"
93msgstr "Здравей, %1"
109msgstr "Здравей, %1"
94
110
95−#: qml/Components/PassphraseLockscreen.qml:60
111+#: qml/Components/PassphraseLockscreen.qml:62
96msgid "Hello"
112msgid "Hello"
97msgstr "Здравей"
113msgstr "Здравей"
98
114
@@ -104,19 +120,11 @@ msgstr ""
104msgid "DONE"
120msgid "DONE"
105msgstr ""
121msgstr ""
106
122
107−#: qml/Components/SeeMore.qml:35
108−msgid "See more"
109−msgstr ""
110−
111−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
112msgid "See less"
124msgid "See less"
113msgstr ""
125msgstr ""
114
126
115−#: qml/Dash/DashApps.qml:37
116−msgid "Recent"
117−msgstr "Последни"
118−
119−#: qml/Dash/GenericScopeView.qml:330
127+#: qml/Dash/GenericScopeView.qml:358
120msgid "See all"
128msgid "See all"
121msgstr ""
129msgstr ""
122
130
@@ -140,6 +148,26 @@ msgstr "Добави отзив"
140msgid "Send"
148msgid "Send"
141msgstr "Изпрати"
149msgstr "Изпрати"
142
150
151+#: qml/Dash/ScopesOverview.qml:200
152+msgid "Manage Dash"
153+msgstr ""
154+
155+#: qml/Dash/ScopesOverview.qml:405
156+msgid "Done"
157+msgstr ""
158+
159+#: qml/Dash/ScopesOverview.qml:431
160+msgid "Store"
161+msgstr ""
162+
163+#: qml/Dash/ScopesOverviewTab.qml:36
164+msgid "Favorites"
165+msgstr ""
166+
167+#: qml/Dash/ScopesOverviewTab.qml:54
168+msgid "All"
169+msgstr ""
170+
143#: qml/Greeter/Greeter.qml:157
171#: qml/Greeter/Greeter.qml:157
144msgid "Swipe to unlock"
172msgid "Swipe to unlock"
145msgstr ""
173msgstr ""
@@ -164,11 +192,11 @@ msgstr "Говорете сега..."
164msgid "Speaking..."
192msgid "Speaking..."
165msgstr "Говорете..."
193msgstr "Говорете..."
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:91
195+#: qml/Notifications/NotificationMenuItemFactory.qml:100
168msgid "Show password"
196msgid "Show password"
169msgstr "Покажи паролата"
197msgstr "Покажи паролата"
170
198
171−#: qml/Notifications/NotificationMenuItemFactory.qml:103
199+#: qml/Notifications/NotificationMenuItemFactory.qml:115
172msgid "Please enter SIM PIN"
200msgid "Please enter SIM PIN"
173msgstr ""
201msgstr ""
174
202
@@ -180,35 +208,43 @@ msgstr ""
180msgid "Conference"
208msgid "Conference"
181msgstr ""
209msgstr ""
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:583
211+#: qml/Panel/Indicators/MenuItemFactory.qml:651
184msgid "In queue…"
212msgid "In queue…"
185msgstr ""
213msgstr ""
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:587
215+#: qml/Panel/Indicators/MenuItemFactory.qml:655
188msgid "Downloading"
216msgid "Downloading"
189msgstr ""
217msgstr ""
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:589
219+#: qml/Panel/Indicators/MenuItemFactory.qml:657
192msgid "Paused, tap to resume"
220msgid "Paused, tap to resume"
193msgstr ""
221msgstr ""
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:591
223+#: qml/Panel/Indicators/MenuItemFactory.qml:659
196msgid "Canceled"
224msgid "Canceled"
197msgstr ""
225msgstr ""
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:593
227+#: qml/Panel/Indicators/MenuItemFactory.qml:661
200msgid "Finished"
228msgid "Finished"
201msgstr ""
229msgstr ""
202
230
203−#: qml/Panel/Indicators/MenuItemFactory.qml:595
231+#: qml/Panel/Indicators/MenuItemFactory.qml:663
204msgid "Failed, tap to retry"
232msgid "Failed, tap to retry"
205msgstr ""
233msgstr ""
206
234
235+#: qml/Panel/Indicators/ModemInfoItem.qml:105
236+msgid "Unlock SIM"
237+msgstr ""
238+
239+#: qml/Panel/Indicators/RoamingIndication.qml:27
240+msgid "Roaming"
241+msgstr ""
242+
207#: qml/Panel/SearchIndicator.qml:27
243#: qml/Panel/SearchIndicator.qml:27
208msgid "Search"
244msgid "Search"
209msgstr "Търсене"
245msgstr "Търсене"
210
246
211−#: qml/Shell.qml:359
247+#: qml/Shell.qml:256
212#, qt-format
248#, qt-format
213msgid "Please enter %1"
249msgid "Please enter %1"
214msgstr "Моля, въведете %1"
250msgstr "Моля, въведете %1"
po/br.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-29 06:54+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,52 +26,68 @@ msgstr "Spilhennañ ar verradenn"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Dispilhennañ ar verradenn"
27msgstr "Dispilhennañ ar verradenn"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Tremen hep sellet ouzh an digoradur"
47msgstr "Tremen hep sellet ouzh an digoradur"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Bord dehoù"
51msgstr "Bord dehoù"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."
56"Lakait ho piz da riklañ adalek ar bord dehoù da zibrennañ ar pellgomzer."
41
57
42−#: qml/Components/EdgeDemo.qml:145
58+#: qml/Components/EdgeDemo.qml:144
43msgid "Top edge"
59msgid "Top edge"
44msgstr "Bord uhelañ"
60msgstr "Bord uhelañ"
45
61
46−#: qml/Components/EdgeDemo.qml:146
62+#: qml/Components/EdgeDemo.qml:145
47msgid "Try swiping from the top edge to access the indicators"
63msgid "Try swiping from the top edge to access the indicators"
48msgstr ""
64msgstr ""
49"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."
65"Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."
50
66
51−#: qml/Components/EdgeDemo.qml:171
67+#: qml/Components/EdgeDemo.qml:170
52msgid "Close"
68msgid "Close"
53msgstr "Serriñ"
69msgstr "Serriñ"
54
70
55−#: qml/Components/EdgeDemo.qml:172
71+#: qml/Components/EdgeDemo.qml:171
56msgid "Swipe up again to close the settings screen"
72msgid "Swipe up again to close the settings screen"
57msgstr ""
73msgstr ""
58"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"
74"Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"
59
75
60−#: qml/Components/EdgeDemo.qml:199
76+#: qml/Components/EdgeDemo.qml:198
61msgid "Left edge"
77msgid "Left edge"
62msgstr "Bord kleiz"
78msgstr "Bord kleiz"
63
79
64−#: qml/Components/EdgeDemo.qml:200
80+#: qml/Components/EdgeDemo.qml:199
65msgid "Swipe from the left to reveal the launcher for quick access to apps"
81msgid "Swipe from the left to reveal the launcher for quick access to apps"
66msgstr ""
82msgstr ""
67"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "
83"Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "
68"prim."
84"prim."
69
85
70−#: qml/Components/EdgeDemo.qml:227
86+#: qml/Components/EdgeDemo.qml:226
71msgid "Well done"
87msgid "Well done"
72msgstr "Gourc'hemennoù !"
88msgstr "Gourc'hemennoù !"
73
89
74−#: qml/Components/EdgeDemo.qml:228
90+#: qml/Components/EdgeDemo.qml:227
75msgid ""
91msgid ""
76"You have now mastered the edge gestures and can start using the "
92"You have now mastered the edge gestures and can start using the "
77"phone<br><br>Tap on the screen to start"
93"phone<br><br>Tap on the screen to start"
@@ -79,20 +95,20 @@ msgstr ""
79"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
95"Mestroniañ a rit ar jestroù ha gallout a rit kregiñ da implijout ar "
80"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
96"pellgomzer<br><br>Touchit d'ar skramm evit kregiñ ganti"
81
97
82−#: qml/Components/Lockscreen.qml:214
98+#: qml/Components/Lockscreen.qml:220
83msgid "Emergency Call"
99msgid "Emergency Call"
84msgstr "Pellgomzadenn vallus"
100msgstr "Pellgomzadenn vallus"
85
101
86−#: qml/Components/Lockscreen.qml:231
102+#: qml/Components/Lockscreen.qml:243
87msgid "OK"
103msgid "OK"
88msgstr "Mat eo"
104msgstr "Mat eo"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91#, qt-format
107#, qt-format
92msgid "Hello %1"
108msgid "Hello %1"
93msgstr "Demat %1"
109msgstr "Demat %1"
94
110
95−#: qml/Components/PassphraseLockscreen.qml:60
111+#: qml/Components/PassphraseLockscreen.qml:62
96msgid "Hello"
112msgid "Hello"
97msgstr "Demat"
113msgstr "Demat"
98
114
@@ -104,19 +120,11 @@ msgstr "NULLAÑ"
104msgid "DONE"
120msgid "DONE"
105msgstr "ECHU"
121msgstr "ECHU"
106
122
107−#: qml/Components/SeeMore.qml:35
108−msgid "See more"
109−msgstr "Gwelet muioc'h"
110−
111−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
112msgid "See less"
124msgid "See less"
113msgstr "Gwelet nebeutoc'h"
125msgstr "Gwelet nebeutoc'h"
114
126
115−#: qml/Dash/DashApps.qml:37
116−msgid "Recent"
117−msgstr "Nevez zo"
118−
119−#: qml/Dash/GenericScopeView.qml:330
127+#: qml/Dash/GenericScopeView.qml:358
120msgid "See all"
128msgid "See all"
121msgstr "Gwelet pep tra"
129msgstr "Gwelet pep tra"
122
130
@@ -140,6 +148,26 @@ msgstr "Ouzhpennañ un ali"
140msgid "Send"
148msgid "Send"
141msgstr "Kas"
149msgstr "Kas"
142
150
151+#: qml/Dash/ScopesOverview.qml:200
152+msgid "Manage Dash"
153+msgstr ""
154+
155+#: qml/Dash/ScopesOverview.qml:405
156+msgid "Done"
157+msgstr ""
158+
159+#: qml/Dash/ScopesOverview.qml:431
160+msgid "Store"
161+msgstr ""
162+
163+#: qml/Dash/ScopesOverviewTab.qml:36
164+msgid "Favorites"
165+msgstr ""
166+
167+#: qml/Dash/ScopesOverviewTab.qml:54
168+msgid "All"
169+msgstr ""
170+
143#: qml/Greeter/Greeter.qml:157
171#: qml/Greeter/Greeter.qml:157
144msgid "Swipe to unlock"
172msgid "Swipe to unlock"
145msgstr "Riklañ evit dibrennañ"
173msgstr "Riklañ evit dibrennañ"
@@ -164,11 +192,11 @@ msgstr "Komzit bremañ..."
164msgid "Speaking..."
192msgid "Speaking..."
165msgstr "O komz..."
193msgstr "O komz..."
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:91
195+#: qml/Notifications/NotificationMenuItemFactory.qml:100
168msgid "Show password"
196msgid "Show password"
169msgstr "Diskouez ar ger-tremen"
197msgstr "Diskouez ar ger-tremen"
170
198
171−#: qml/Notifications/NotificationMenuItemFactory.qml:103
199+#: qml/Notifications/NotificationMenuItemFactory.qml:115
172msgid "Please enter SIM PIN"
200msgid "Please enter SIM PIN"
173msgstr "Ebarzhit kod PIN ho kartenn SIM, mar plij"
201msgstr "Ebarzhit kod PIN ho kartenn SIM, mar plij"
174
202
@@ -180,35 +208,43 @@ msgstr "Touchit evit distreiñ d'ar bellgomzadenn..."
180msgid "Conference"
208msgid "Conference"
181msgstr "Kendiviz"
209msgstr "Kendiviz"
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:583
211+#: qml/Panel/Indicators/MenuItemFactory.qml:651
184msgid "In queue…"
212msgid "In queue…"
185msgstr "El lostennad..."
213msgstr "El lostennad..."
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:587
215+#: qml/Panel/Indicators/MenuItemFactory.qml:655
188msgid "Downloading"
216msgid "Downloading"
189msgstr "O pellgargañ"
217msgstr "O pellgargañ"
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:589
219+#: qml/Panel/Indicators/MenuItemFactory.qml:657
192msgid "Paused, tap to resume"
220msgid "Paused, tap to resume"
193msgstr "Ehanet, touchit evit adkregiñ"
221msgstr "Ehanet, touchit evit adkregiñ"
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:591
223+#: qml/Panel/Indicators/MenuItemFactory.qml:659
196msgid "Canceled"
224msgid "Canceled"
197msgstr "Nullet"
225msgstr "Nullet"
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:593
227+#: qml/Panel/Indicators/MenuItemFactory.qml:661
200msgid "Finished"
228msgid "Finished"
201msgstr "Echu"
229msgstr "Echu"
202
230
203−#: qml/Panel/Indicators/MenuItemFactory.qml:595
231+#: qml/Panel/Indicators/MenuItemFactory.qml:663
204msgid "Failed, tap to retry"
232msgid "Failed, tap to retry"
205msgstr "C'hwitet, touchit evit adkregiñ"
233msgstr "C'hwitet, touchit evit adkregiñ"
206
234
235+#: qml/Panel/Indicators/ModemInfoItem.qml:105
236+msgid "Unlock SIM"
237+msgstr ""
238+
239+#: qml/Panel/Indicators/RoamingIndication.qml:27
240+msgid "Roaming"
241+msgstr ""
242+
207#: qml/Panel/SearchIndicator.qml:27
243#: qml/Panel/SearchIndicator.qml:27
208msgid "Search"
244msgid "Search"
209msgstr "Klask"
245msgstr "Klask"
210
246
211−#: qml/Shell.qml:359
247+#: qml/Shell.qml:256
212#, qt-format
248#, qt-format
213msgid "Please enter %1"
249msgid "Please enter %1"
214msgstr "Ebarzhit %1, mar plij"
250msgstr "Ebarzhit %1, mar plij"
po/bs.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr ""
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr ""
186msgstr ""
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr ""
238msgstr ""
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/ca.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-25 10:21+0000\n"
11+"PO-Revision-Date: 2014-08-12 09:17+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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,53 +26,69 @@ msgstr "Enganxa la drecera"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Desenganxa la drecera"
27msgstr "Desenganxa la drecera"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Segur que voleu apagar el dispositiu?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Apaga'l"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Reinicia'l"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Cancel·la"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Omet la introducció"
47msgstr "Omet la introducció"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Vora dreta"
51msgstr "Vora dreta"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
56"Proveu de lliscar el dit des de la vora dreta per desblocar el telèfon"
41
57
42−#: qml/Components/EdgeDemo.qml:145
58+#: qml/Components/EdgeDemo.qml:144
43msgid "Top edge"
59msgid "Top edge"
44msgstr "Vora superior"
60msgstr "Vora superior"
45
61
46−#: qml/Components/EdgeDemo.qml:146
62+#: qml/Components/EdgeDemo.qml:145
47msgid "Try swiping from the top edge to access the indicators"
63msgid "Try swiping from the top edge to access the indicators"
48msgstr ""
64msgstr ""
49"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
65"Proveu de lliscar el dit des de la vora superior per accedir als indicadors"
50
66
51−#: qml/Components/EdgeDemo.qml:171
67+#: qml/Components/EdgeDemo.qml:170
52msgid "Close"
68msgid "Close"
53msgstr "Tanca"
69msgstr "Tanca"
54
70
55−#: qml/Components/EdgeDemo.qml:172
71+#: qml/Components/EdgeDemo.qml:171
56msgid "Swipe up again to close the settings screen"
72msgid "Swipe up again to close the settings screen"
57msgstr ""
73msgstr ""
58"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
74"Llisqueu el dit cap amunt una altra vegada per tancar la pantalla de "
59"configuració"
75"configuració"
60
76
61−#: qml/Components/EdgeDemo.qml:199
77+#: qml/Components/EdgeDemo.qml:198
62msgid "Left edge"
78msgid "Left edge"
63msgstr "Vora esquerra"
79msgstr "Vora esquerra"
64
80
65−#: qml/Components/EdgeDemo.qml:200
81+#: qml/Components/EdgeDemo.qml:199
66msgid "Swipe from the left to reveal the launcher for quick access to apps"
82msgid "Swipe from the left to reveal the launcher for quick access to apps"
67msgstr ""
83msgstr ""
68"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
84"Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "
69"ràpidament a les aplicacions"
85"ràpidament a les aplicacions"
70
86
71−#: qml/Components/EdgeDemo.qml:227
87+#: qml/Components/EdgeDemo.qml:226
72msgid "Well done"
88msgid "Well done"
73msgstr "Enhorabona!"
89msgstr "Enhorabona!"
74
90
75−#: qml/Components/EdgeDemo.qml:228
91+#: qml/Components/EdgeDemo.qml:227
76msgid ""
92msgid ""
77"You have now mastered the edge gestures and can start using the "
93"You have now mastered the edge gestures and can start using the "
78"phone<br><br>Tap on the screen to start"
94"phone<br><br>Tap on the screen to start"
@@ -80,20 +96,20 @@ msgstr ""
80"Ja heu après com utilitzar els gestos de les vores per fer servir el "
96"Ja heu après com utilitzar els gestos de les vores per fer servir el "
81"telèfon<br><br>Feu un toc a la pantalla per començar"
97"telèfon<br><br>Feu un toc a la pantalla per començar"
82
98
83−#: qml/Components/Lockscreen.qml:214
99+#: qml/Components/Lockscreen.qml:220
84msgid "Emergency Call"
100msgid "Emergency Call"
85msgstr "Trucada d'emergència"
101msgstr "Trucada d'emergència"
86
102
87−#: qml/Components/Lockscreen.qml:231
103+#: qml/Components/Lockscreen.qml:243
88msgid "OK"
104msgid "OK"
89msgstr "D'acord"
105msgstr "D'acord"
90
106
91−#: qml/Components/PassphraseLockscreen.qml:60
107+#: qml/Components/PassphraseLockscreen.qml:62
92#, qt-format
108#, qt-format
93msgid "Hello %1"
109msgid "Hello %1"
94msgstr "Hola %1"
110msgstr "Hola %1"
95
111
96−#: qml/Components/PassphraseLockscreen.qml:60
112+#: qml/Components/PassphraseLockscreen.qml:62
97msgid "Hello"
113msgid "Hello"
98msgstr "Hola"
114msgstr "Hola"
99
115
@@ -105,19 +121,11 @@ msgstr "Cancel·la"
105msgid "DONE"
121msgid "DONE"
106msgstr "Fet"
122msgstr "Fet"
107
123
108−#: qml/Components/SeeMore.qml:35
109−msgid "See more"
110−msgstr "Mostra'n més"
111−
112−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
124+#: qml/Dash/GenericScopeView.qml:358
113msgid "See less"
125msgid "See less"
114msgstr "Mostra'n menys"
126msgstr "Mostra'n menys"
115
127
116−#: qml/Dash/DashApps.qml:37
117−msgid "Recent"
118−msgstr "Recents"
119−
120−#: qml/Dash/GenericScopeView.qml:330
128+#: qml/Dash/GenericScopeView.qml:358
121msgid "See all"
129msgid "See all"
122msgstr "Mostra-ho tot"
130msgstr "Mostra-ho tot"
123
131
@@ -141,6 +149,26 @@ msgstr "Afegiu una ressenya"
141msgid "Send"
149msgid "Send"
142msgstr "Envia"
150msgstr "Envia"
143
151
152+#: qml/Dash/ScopesOverview.qml:200
153+msgid "Manage Dash"
154+msgstr "Gestiona el tauler"
155+
156+#: qml/Dash/ScopesOverview.qml:405
157+msgid "Done"
158+msgstr "Fet"
159+
160+#: qml/Dash/ScopesOverview.qml:431
161+msgid "Store"
162+msgstr "Botiga"
163+
164+#: qml/Dash/ScopesOverviewTab.qml:36
165+msgid "Favorites"
166+msgstr "Preferits"
167+
168+#: qml/Dash/ScopesOverviewTab.qml:54
169+msgid "All"
170+msgstr "Tots"
171+
144#: qml/Greeter/Greeter.qml:157
172#: qml/Greeter/Greeter.qml:157
145msgid "Swipe to unlock"
173msgid "Swipe to unlock"
146msgstr "Feu lliscar el dit per desbloquejar"
174msgstr "Feu lliscar el dit per desbloquejar"
@@ -165,11 +193,11 @@ msgstr "Parleu..."
165msgid "Speaking..."
193msgid "Speaking..."
166msgstr "S'està parlant..."
194msgstr "S'està parlant..."
167
195
168−#: qml/Notifications/NotificationMenuItemFactory.qml:91
196+#: qml/Notifications/NotificationMenuItemFactory.qml:100
169msgid "Show password"
197msgid "Show password"
170msgstr "Mostra la contrasenya"
198msgstr "Mostra la contrasenya"
171
199
172−#: qml/Notifications/NotificationMenuItemFactory.qml:103
200+#: qml/Notifications/NotificationMenuItemFactory.qml:115
173msgid "Please enter SIM PIN"
201msgid "Please enter SIM PIN"
174msgstr "Introduïu el PIN de la targeta SIM"
202msgstr "Introduïu el PIN de la targeta SIM"
175
203
@@ -181,35 +209,43 @@ msgstr "Feu un toc per tornar a la trucada..."
181msgid "Conference"
209msgid "Conference"
182msgstr "Conferència"
210msgstr "Conferència"
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:583
212+#: qml/Panel/Indicators/MenuItemFactory.qml:651
185msgid "In queue…"
213msgid "In queue…"
186msgstr "A la cua..."
214msgstr "A la cua..."
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:587
216+#: qml/Panel/Indicators/MenuItemFactory.qml:655
189msgid "Downloading"
217msgid "Downloading"
190msgstr "S'està baixant"
218msgstr "S'està baixant"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:589
220+#: qml/Panel/Indicators/MenuItemFactory.qml:657
193msgid "Paused, tap to resume"
221msgid "Paused, tap to resume"
194msgstr "En pausa, feu un toc per continuar"
222msgstr "En pausa, feu un toc per continuar"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:591
224+#: qml/Panel/Indicators/MenuItemFactory.qml:659
197msgid "Canceled"
225msgid "Canceled"
198msgstr "S'ha cancel·lat"
226msgstr "S'ha cancel·lat"
199
227
200−#: qml/Panel/Indicators/MenuItemFactory.qml:593
228+#: qml/Panel/Indicators/MenuItemFactory.qml:661
201msgid "Finished"
229msgid "Finished"
202msgstr "S'ha finalitzat"
230msgstr "S'ha finalitzat"
203
231
204−#: qml/Panel/Indicators/MenuItemFactory.qml:595
232+#: qml/Panel/Indicators/MenuItemFactory.qml:663
205msgid "Failed, tap to retry"
233msgid "Failed, tap to retry"
206msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
234msgstr "Ha fallat, feu un toc per tornar-ho a intentar"
207
235
236+#: qml/Panel/Indicators/ModemInfoItem.qml:105
237+msgid "Unlock SIM"
238+msgstr "Desbloca la SIM"
239+
240+#: qml/Panel/Indicators/RoamingIndication.qml:27
241+msgid "Roaming"
242+msgstr "Itinerància"
243+
208#: qml/Panel/SearchIndicator.qml:27
244#: qml/Panel/SearchIndicator.qml:27
209msgid "Search"
245msgid "Search"
210msgstr "Cerca"
246msgstr "Cerca"
211
247
212−#: qml/Shell.qml:359
248+#: qml/Shell.qml:256
213#, qt-format
249#, qt-format
214msgid "Please enter %1"
250msgid "Please enter %1"
215msgstr "Introduïu %1"
251msgstr "Introduïu %1"
po/ckb.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "پێشەکیی بپەڕێنە"
47msgstr "پێشەکیی بپەڕێنە"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "لێواری ڕاست"
51msgstr "لێواری ڕاست"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"
55msgstr "لێواری ڕاست ڕابکێشە بۆ کردنەوەی مۆبایلەکە"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "لێواری سەرەوە"
59msgstr "لێواری سەرەوە"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"
63msgstr "لێواری سەرەوە ڕابکێشە بۆ گەیشتن بە نیشاندەرەکان"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "داخستن"
67msgstr "داخستن"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"
71msgstr "ڕایکێشەوە سەرەوە جارێکی تر بۆ داخستنی پەردەی ڕێکخستنەکان"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "لێواری چەپ"
75msgstr "لێواری چەپ"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"
79msgstr "لە چەپەوە بچۆرەوە سەر دەستپێک بۆئەوەی بتوانی هەموو ئەپەکان ببینی"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "دەستخۆش"
83msgstr "دەستخۆش"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "هێڵی فریاگوزاری"
93msgstr "هێڵی فریاگوزاری"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "سڵاو %1"
102msgstr "سڵاو %1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "سڵاو"
106msgstr "سڵاو"
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr "پێداچوونەوە زۆر بکە"
133msgid "Send"
141msgid "Send"
134msgstr "ناردن"
142msgstr "ناردن"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "ئێستا قسە بکە"
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "قسە دەکات..."
186msgstr "قسە دەکات..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "تێپەڕەوشە پیشان بدە"
190msgstr "تێپەڕەوشە پیشان بدە"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "گەڕان"
238msgstr "گەڕان"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "تکایە %1 بنووسە"
243msgstr "تکایە %1 بنووسە"
po/cs.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Přeskočit intro"
47msgstr "Přeskočit intro"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Pravý okraj"
51msgstr "Pravý okraj"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
55msgstr "Pokuste se odemknout telefon potažením prstu z pravého okraje."
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Horní okraj"
59msgstr "Horní okraj"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"
63msgstr "Pokuste se zpřístupnit indikátory potažením prstu z horního okraje"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Uzavřít"
67msgstr "Uzavřít"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
71msgstr "Přetažením nahoru dojde k uzavření obrazovky nastavení"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Levý okraj"
75msgstr "Levý okraj"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."
79msgstr "Pro rychlý přístup k aplikacím potáhněte prst z levého okraje."
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "Výborně"
83msgstr "Výborně"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "Tísňové volání"
93msgstr "Tísňové volání"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "Ahoj %1"
102msgstr "Ahoj %1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "Ahoj"
106msgstr "Ahoj"
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr "Přidat recenzi"
133msgid "Send"
141msgid "Send"
134msgstr "Odeslat"
142msgstr "Odeslat"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "Mluvte..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "Mluvte..."
186msgstr "Mluvte..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "Zobrazit heslo"
190msgstr "Zobrazit heslo"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "Hledat"
238msgstr "Hledat"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "Zadejte prosím %1"
243msgstr "Zadejte prosím %1"
po/da.po+72−36
@@ -8,15 +8,15 @@ 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-07-11 14:59+0200\n"
11+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-31 07:15+0000\n"
18+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
19−"X-Generator: Launchpad (build 17131)\n"
19+"X-Generator: Launchpad (build 17156)\n"
20
20
21#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:43
22#: plugins/Unity/Launcher/launcheritem.cpp:73
22#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -27,47 +27,63 @@ msgstr "Fastgør genvej"
27msgid "Unpin shortcut"
27msgid "Unpin shortcut"
28msgstr "Gør genvej flytbar"
28msgstr "Gør genvej flytbar"
29
29
30+#: qml/Components/Dialogs.qml:142
31+msgid "Are you sure you would like to turn power off?"
32+msgstr ""
33+
34+#: qml/Components/Dialogs.qml:144
35+msgid "Power off"
36+msgstr ""
37+
38+#: qml/Components/Dialogs.qml:153
39+msgid "Restart"
40+msgstr ""
41+
42+#: qml/Components/Dialogs.qml:162
43+msgid "Cancel"
44+msgstr ""
45+
30#: qml/Components/EdgeDemoOverlay.qml:151
46#: qml/Components/EdgeDemoOverlay.qml:151
31msgid "Skip intro"
47msgid "Skip intro"
32msgstr "Spring intro over"
48msgstr "Spring intro over"
33
49
34−#: qml/Components/EdgeDemo.qml:113
50+#: qml/Components/EdgeDemo.qml:112
35msgid "Right edge"
51msgid "Right edge"
36msgstr "Højre kant"
52msgstr "Højre kant"
37
53
38−#: qml/Components/EdgeDemo.qml:114
54+#: qml/Components/EdgeDemo.qml:113
39msgid "Try swiping from the right edge to unlock the phone"
55msgid "Try swiping from the right edge to unlock the phone"
40msgstr "Prøv at stryge fra højre kant for at låse telefonen op"
56msgstr "Prøv at stryge fra højre kant for at låse telefonen op"
41
57
42−#: qml/Components/EdgeDemo.qml:145
58+#: qml/Components/EdgeDemo.qml:144
43msgid "Top edge"
59msgid "Top edge"
44msgstr "Øvre kant"
60msgstr "Øvre kant"
45
61
46−#: qml/Components/EdgeDemo.qml:146
62+#: qml/Components/EdgeDemo.qml:145
47msgid "Try swiping from the top edge to access the indicators"
63msgid "Try swiping from the top edge to access the indicators"
48msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"
64msgstr "Prøv at stryge fra den øvre kant for at tilgå indikatorerne"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "Luk"
68msgstr "Luk"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr "Stryg op igen for at låse indstillingsskærmen"
72msgstr "Stryg op igen for at låse indstillingsskærmen"
57
73
58−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
59msgid "Left edge"
75msgid "Left edge"
60msgstr "Venstre kant"
76msgstr "Venstre kant"
61
77
62−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
64msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"
80msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"
65
81
66−#: qml/Components/EdgeDemo.qml:227
82+#: qml/Components/EdgeDemo.qml:226
67msgid "Well done"
83msgid "Well done"
68msgstr "Godt gjort"
84msgstr "Godt gjort"
69
85
70−#: qml/Components/EdgeDemo.qml:228
86+#: qml/Components/EdgeDemo.qml:227
71msgid ""
87msgid ""
72"You have now mastered the edge gestures and can start using the "
88"You have now mastered the edge gestures and can start using the "
73"phone<br><br>Tap on the screen to start"
89"phone<br><br>Tap on the screen to start"
@@ -75,20 +91,20 @@ msgstr ""
75"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
91"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
76"på skærmen for at starte"
92"på skærmen for at starte"
77
93
78−#: qml/Components/Lockscreen.qml:214
94+#: qml/Components/Lockscreen.qml:220
79msgid "Emergency Call"
95msgid "Emergency Call"
80msgstr "Nødopkald"
96msgstr "Nødopkald"
81
97
82−#: qml/Components/Lockscreen.qml:231
98+#: qml/Components/Lockscreen.qml:243
83msgid "OK"
99msgid "OK"
84msgstr "O.k."
100msgstr "O.k."
85
101
86−#: qml/Components/PassphraseLockscreen.qml:60
102+#: qml/Components/PassphraseLockscreen.qml:62
87#, qt-format
103#, qt-format
88msgid "Hello %1"
104msgid "Hello %1"
89msgstr "Hej %1"
105msgstr "Hej %1"
90
106
91−#: qml/Components/PassphraseLockscreen.qml:60
107+#: qml/Components/PassphraseLockscreen.qml:62
92msgid "Hello"
108msgid "Hello"
93msgstr "Hej"
109msgstr "Hej"
94
110
@@ -100,19 +116,11 @@ msgstr "ANNULLÉR"
100msgid "DONE"
116msgid "DONE"
101msgstr "FÆRDIG"
117msgstr "FÆRDIG"
102
118
103−#: qml/Components/SeeMore.qml:35
104−msgid "See more"
105−msgstr "Vis mere"
106−
107−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
119+#: qml/Dash/GenericScopeView.qml:358
108msgid "See less"
120msgid "See less"
109msgstr "Vis mindre"
121msgstr "Vis mindre"
110
122
111−#: qml/Dash/DashApps.qml:37
112−msgid "Recent"
113−msgstr "Seneste"
114−
115−#: qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
116msgid "See all"
124msgid "See all"
117msgstr "Se alle"
125msgstr "Se alle"
118
126
@@ -136,6 +144,26 @@ msgstr "Tilføj en forhåndsvisning"
136msgid "Send"
144msgid "Send"
137msgstr "Send"
145msgstr "Send"
138
146
147+#: qml/Dash/ScopesOverview.qml:200
148+msgid "Manage Dash"
149+msgstr ""
150+
151+#: qml/Dash/ScopesOverview.qml:405
152+msgid "Done"
153+msgstr ""
154+
155+#: qml/Dash/ScopesOverview.qml:431
156+msgid "Store"
157+msgstr ""
158+
159+#: qml/Dash/ScopesOverviewTab.qml:36
160+msgid "Favorites"
161+msgstr ""
162+
163+#: qml/Dash/ScopesOverviewTab.qml:54
164+msgid "All"
165+msgstr ""
166+
139#: qml/Greeter/Greeter.qml:157
167#: qml/Greeter/Greeter.qml:157
140msgid "Swipe to unlock"
168msgid "Swipe to unlock"
141msgstr "Stryg for at låse op"
169msgstr "Stryg for at låse op"
@@ -160,11 +188,11 @@ msgstr "Tal nu..."
160msgid "Speaking..."
188msgid "Speaking..."
161msgstr "Taler..."
189msgstr "Taler..."
162
190
163−#: qml/Notifications/NotificationMenuItemFactory.qml:91
191+#: qml/Notifications/NotificationMenuItemFactory.qml:100
164msgid "Show password"
192msgid "Show password"
165msgstr "Vis adgangskode"
193msgstr "Vis adgangskode"
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:103
195+#: qml/Notifications/NotificationMenuItemFactory.qml:115
168msgid "Please enter SIM PIN"
196msgid "Please enter SIM PIN"
169msgstr "Indtast venligst PIN for SIM"
197msgstr "Indtast venligst PIN for SIM"
170
198
@@ -176,35 +204,43 @@ msgstr "Tryk for at besvare opkaldet..."
176msgid "Conference"
204msgid "Conference"
177msgstr "Konference"
205msgstr "Konference"
178
206
179−#: qml/Panel/Indicators/MenuItemFactory.qml:583
207+#: qml/Panel/Indicators/MenuItemFactory.qml:651
180msgid "In queue…"
208msgid "In queue…"
181msgstr "I kø…"
209msgstr "I kø…"
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:587
211+#: qml/Panel/Indicators/MenuItemFactory.qml:655
184msgid "Downloading"
212msgid "Downloading"
185msgstr "Henter"
213msgstr "Henter"
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:589
215+#: qml/Panel/Indicators/MenuItemFactory.qml:657
188msgid "Paused, tap to resume"
216msgid "Paused, tap to resume"
189msgstr "På pause; tryk for at fortsætte"
217msgstr "På pause; tryk for at fortsætte"
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:591
219+#: qml/Panel/Indicators/MenuItemFactory.qml:659
192msgid "Canceled"
220msgid "Canceled"
193msgstr "Annulleret"
221msgstr "Annulleret"
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:593
223+#: qml/Panel/Indicators/MenuItemFactory.qml:661
196msgid "Finished"
224msgid "Finished"
197msgstr "Færdig"
225msgstr "Færdig"
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:595
227+#: qml/Panel/Indicators/MenuItemFactory.qml:663
200msgid "Failed, tap to retry"
228msgid "Failed, tap to retry"
201msgstr "Mislykkedes; tryk for at prøve igen"
229msgstr "Mislykkedes; tryk for at prøve igen"
202
230
231+#: qml/Panel/Indicators/ModemInfoItem.qml:105
232+msgid "Unlock SIM"
233+msgstr ""
234+
235+#: qml/Panel/Indicators/RoamingIndication.qml:27
236+msgid "Roaming"
237+msgstr ""
238+
203#: qml/Panel/SearchIndicator.qml:27
239#: qml/Panel/SearchIndicator.qml:27
204msgid "Search"
240msgid "Search"
205msgstr "Søg"
241msgstr "Søg"
206
242
207−#: qml/Shell.qml:359
243+#: qml/Shell.qml:256
208#, qt-format
244#, qt-format
209msgid "Please enter %1"
245msgid "Please enter %1"
210msgstr "Indtast venligst %1"
246msgstr "Indtast venligst %1"
po/de.po+77−41
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-15 13:20+0000\n"
11+"PO-Revision-Date: 2014-08-08 08:58+0000\n"
12−"Last-Translator: Phillip Sz <Unknown>\n"
12+"Last-Translator: Martin Pitt <martin.pitt@ubuntu.com>\n"
13"Language-Team: German <de@li.org>\n"
13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,50 +26,66 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Einführung überspringen"
47msgstr "Einführung überspringen"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Rechter Bildschirmrand"
51msgstr "Rechter Bildschirmrand"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"
55msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Oberer Bildschirmrand"
59msgstr "Oberer Bildschirmrand"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"
64"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "Schließen"
68msgstr "Schließen"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"
72msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"
57
73
58−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
59msgid "Left edge"
75msgid "Left edge"
60msgstr "Linker Rand"
76msgstr "Linker Rand"
61
77
62−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
64msgstr ""
80msgstr ""
65"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"
81"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"
66"Schnellzugriff aufzurufen"
82"Schnellzugriff aufzurufen"
67
83
68−#: qml/Components/EdgeDemo.qml:227
84+#: qml/Components/EdgeDemo.qml:226
69msgid "Well done"
85msgid "Well done"
70msgstr "Gut gemacht"
86msgstr "Gut gemacht"
71
87
72−#: qml/Components/EdgeDemo.qml:228
88+#: qml/Components/EdgeDemo.qml:227
73msgid ""
89msgid ""
74"You have now mastered the edge gestures and can start using the "
90"You have now mastered the edge gestures and can start using the "
75"phone<br><br>Tap on the screen to start"
91"phone<br><br>Tap on the screen to start"
@@ -77,20 +93,20 @@ msgstr ""
77"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
93"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
78"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
94"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
79
95
80−#: qml/Components/Lockscreen.qml:214
96+#: qml/Components/Lockscreen.qml:220
81msgid "Emergency Call"
97msgid "Emergency Call"
82msgstr "Notruf"
98msgstr "Notruf"
83
99
84−#: qml/Components/Lockscreen.qml:231
100+#: qml/Components/Lockscreen.qml:243
85msgid "OK"
101msgid "OK"
86msgstr "OK"
102msgstr "OK"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89#, qt-format
105#, qt-format
90msgid "Hello %1"
106msgid "Hello %1"
91msgstr "Hallo %1"
107msgstr "Hallo %1"
92
108
93−#: qml/Components/PassphraseLockscreen.qml:60
109+#: qml/Components/PassphraseLockscreen.qml:62
94msgid "Hello"
110msgid "Hello"
95msgstr "Hallo"
111msgstr "Hallo"
96
112
@@ -102,21 +118,13 @@ msgstr "ABBRECHEN"
102msgid "DONE"
118msgid "DONE"
103msgstr "ERLEDIGT"
119msgstr "ERLEDIGT"
104
120
105−#: qml/Components/SeeMore.qml:35
106−msgid "See more"
107−msgstr "Mehr ansehen"
108−
109−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
121+#: qml/Dash/GenericScopeView.qml:358
110msgid "See less"
122msgid "See less"
111msgstr "Weniger ansehen"
123msgstr "Weniger ansehen"
112
124
113−#: qml/Dash/DashApps.qml:37
114−msgid "Recent"
115−msgstr "Kürzlich"
116−
117−#: qml/Dash/GenericScopeView.qml:330
125+#: qml/Dash/GenericScopeView.qml:358
118msgid "See all"
126msgid "See all"
119−msgstr ""
127+msgstr "Alle anzeigen"
120
128
121#: qml/Dash/Previews/PreviewActionCombo.qml:34
129#: qml/Dash/Previews/PreviewActionCombo.qml:34
122msgid "More..."
130msgid "More..."
@@ -138,6 +146,26 @@ msgstr "Bewertung hinzufügen"
138msgid "Send"
146msgid "Send"
139msgstr "Senden"
147msgstr "Senden"
140
148
149+#: qml/Dash/ScopesOverview.qml:200
150+msgid "Manage Dash"
151+msgstr ""
152+
153+#: qml/Dash/ScopesOverview.qml:405
154+msgid "Done"
155+msgstr ""
156+
157+#: qml/Dash/ScopesOverview.qml:431
158+msgid "Store"
159+msgstr ""
160+
161+#: qml/Dash/ScopesOverviewTab.qml:36
162+msgid "Favorites"
163+msgstr ""
164+
165+#: qml/Dash/ScopesOverviewTab.qml:54
166+msgid "All"
167+msgstr ""
168+
141#: qml/Greeter/Greeter.qml:157
169#: qml/Greeter/Greeter.qml:157
142msgid "Swipe to unlock"
170msgid "Swipe to unlock"
143msgstr "Wischen zum Entsperren"
171msgstr "Wischen zum Entsperren"
@@ -162,51 +190,59 @@ msgstr "Sprechen Sie jetzt …"
162msgid "Speaking..."
190msgid "Speaking..."
163msgstr "Sprechen Sie …"
191msgstr "Sprechen Sie …"
164
192
165−#: qml/Notifications/NotificationMenuItemFactory.qml:91
193+#: qml/Notifications/NotificationMenuItemFactory.qml:100
166msgid "Show password"
194msgid "Show password"
167msgstr "Passwort anzeigen"
195msgstr "Passwort anzeigen"
168
196
169−#: qml/Notifications/NotificationMenuItemFactory.qml:103
197+#: qml/Notifications/NotificationMenuItemFactory.qml:115
170msgid "Please enter SIM PIN"
198msgid "Please enter SIM PIN"
171msgstr "Bitte die PIN der SIM eingeben"
199msgstr "Bitte die PIN der SIM eingeben"
172
200
173#: qml/Panel/ActiveCallHint.qml:77
201#: qml/Panel/ActiveCallHint.qml:77
174msgid "Tap to return to call..."
202msgid "Tap to return to call..."
175−msgstr ""
203+msgstr "Tippen um zum Anruf zurückzugehen"
176
204
177#: qml/Panel/ActiveCallHint.qml:90
205#: qml/Panel/ActiveCallHint.qml:90
178msgid "Conference"
206msgid "Conference"
179−msgstr ""
207+msgstr "Konferenz"
180
208
181−#: qml/Panel/Indicators/MenuItemFactory.qml:583
209+#: qml/Panel/Indicators/MenuItemFactory.qml:651
182msgid "In queue…"
210msgid "In queue…"
183msgstr "In Warteschlange …"
211msgstr "In Warteschlange …"
184
212
185−#: qml/Panel/Indicators/MenuItemFactory.qml:587
213+#: qml/Panel/Indicators/MenuItemFactory.qml:655
186msgid "Downloading"
214msgid "Downloading"
187msgstr "Wird heruntergeladen"
215msgstr "Wird heruntergeladen"
188
216
189−#: qml/Panel/Indicators/MenuItemFactory.qml:589
217+#: qml/Panel/Indicators/MenuItemFactory.qml:657
190msgid "Paused, tap to resume"
218msgid "Paused, tap to resume"
191msgstr "Pausiert, tippen Sie zum fortsetzen"
219msgstr "Pausiert, tippen Sie zum fortsetzen"
192
220
193−#: qml/Panel/Indicators/MenuItemFactory.qml:591
221+#: qml/Panel/Indicators/MenuItemFactory.qml:659
194msgid "Canceled"
222msgid "Canceled"
195msgstr "Abgebrochen"
223msgstr "Abgebrochen"
196
224
197−#: qml/Panel/Indicators/MenuItemFactory.qml:593
225+#: qml/Panel/Indicators/MenuItemFactory.qml:661
198msgid "Finished"
226msgid "Finished"
199msgstr "Erledigt"
227msgstr "Erledigt"
200
228
201−#: qml/Panel/Indicators/MenuItemFactory.qml:595
229+#: qml/Panel/Indicators/MenuItemFactory.qml:663
202msgid "Failed, tap to retry"
230msgid "Failed, tap to retry"
203msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
231msgstr "Fehlgeschlagen, tippen Sie zum Wiederholen"
204
232
233+#: qml/Panel/Indicators/ModemInfoItem.qml:105
234+msgid "Unlock SIM"
235+msgstr ""
236+
237+#: qml/Panel/Indicators/RoamingIndication.qml:27
238+msgid "Roaming"
239+msgstr ""
240+
205#: qml/Panel/SearchIndicator.qml:27
241#: qml/Panel/SearchIndicator.qml:27
206msgid "Search"
242msgid "Search"
207msgstr "Suchen"
243msgstr "Suchen"
208
244
209−#: qml/Shell.qml:359
245+#: qml/Shell.qml:256
210#, qt-format
246#, qt-format
211msgid "Please enter %1"
247msgid "Please enter %1"
212msgstr "Bitte geben Sie %1 ein"
248msgstr "Bitte geben Sie %1 ein"
po/el.po+75−39
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-08-04 18:44+0000\n"
11+"PO-Revision-Date: 2014-08-08 13:03+0000\n"
12−"Last-Translator: madvinegar <madvinegar@hotmail.com>\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-05 06:45+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,49 +26,65 @@ msgstr "Καρφίτσωμα συντόμευσης"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Ξεκαρφίτσωμα συντόμευσης"
27msgstr "Ξεκαρφίτσωμα συντόμευσης"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Παράλειψη εισαγωγής"
47msgstr "Παράλειψη εισαγωγής"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Δεξί άκρο"
51msgstr "Δεξί άκρο"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
55msgstr "Σύρετε από το δεξί άκρο για ξεκλείδωμα του τηλεφώνου"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Πάνω άκρο"
59msgstr "Πάνω άκρο"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
63msgstr "Σύρετε από το πάνω άκρο για πρόσβαση στις ρυθμίσεις"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Κλείσιμο"
67msgstr "Κλείσιμο"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
71msgstr "Σύρετε προς τα επάνω για κλείσιμο των ρυθμίσεων"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Αριστερό άκρο"
75msgstr "Αριστερό άκρο"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
80"Σύρετε από τα αριστερό άκρο για εμφάνιση του εκκινητή για άμεση πρόσβαση "
65"στις εφαρμογές"
81"στις εφαρμογές"
66
82
67−#: qml/Components/EdgeDemo.qml:227
83+#: qml/Components/EdgeDemo.qml:226
68msgid "Well done"
84msgid "Well done"
69msgstr "Συγχαρητήρια"
85msgstr "Συγχαρητήρια"
70
86
71−#: qml/Components/EdgeDemo.qml:228
87+#: qml/Components/EdgeDemo.qml:227
72msgid ""
88msgid ""
73"You have now mastered the edge gestures and can start using the "
89"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
90"phone<br><br>Tap on the screen to start"
@@ -76,20 +92,20 @@ msgstr ""
76"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
92"Πλέον γνωρίζετε τις χειρονομίες από τα άκρα και μπορείτε να ξεκινήσετε να "
77"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
93"χρησιμοποιείτε το τηλέφωνο<br><br>Αγγίξτε την οθόνη για να ξεκινήσετε"
78
94
79−#: qml/Components/Lockscreen.qml:214
95+#: qml/Components/Lockscreen.qml:220
80msgid "Emergency Call"
96msgid "Emergency Call"
81msgstr "Κλήση έκτακτης ανάγκης"
97msgstr "Κλήση έκτακτης ανάγκης"
82
98
83−#: qml/Components/Lockscreen.qml:231
99+#: qml/Components/Lockscreen.qml:243
84msgid "OK"
100msgid "OK"
85msgstr "OK"
101msgstr "OK"
86
102
87−#: qml/Components/PassphraseLockscreen.qml:60
103+#: qml/Components/PassphraseLockscreen.qml:62
88#, qt-format
104#, qt-format
89msgid "Hello %1"
105msgid "Hello %1"
90msgstr "Γεια σας %1"
106msgstr "Γεια σας %1"
91
107
92−#: qml/Components/PassphraseLockscreen.qml:60
108+#: qml/Components/PassphraseLockscreen.qml:62
93msgid "Hello"
109msgid "Hello"
94msgstr "Γεια σας"
110msgstr "Γεια σας"
95
111
@@ -101,19 +117,11 @@ msgstr "ΑΚΥΡΩΣΗ"
101msgid "DONE"
117msgid "DONE"
102msgstr "ΟΛΟΚΛΗΡΩΣΗ"
118msgstr "ΟΛΟΚΛΗΡΩΣΗ"
103
119
104−#: qml/Components/SeeMore.qml:35
105−msgid "See more"
106−msgstr "Περρισότερα"
107−
108−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
109msgid "See less"
121msgid "See less"
110msgstr "Λιγότερα"
122msgstr "Λιγότερα"
111
123
112−#: qml/Dash/DashApps.qml:37
113−msgid "Recent"
114−msgstr "Πρόσφατα"
115−
116−#: qml/Dash/GenericScopeView.qml:330
124+#: qml/Dash/GenericScopeView.qml:358
117msgid "See all"
125msgid "See all"
118msgstr "Εμφάνιση όλων"
126msgstr "Εμφάνιση όλων"
119
127
@@ -137,6 +145,26 @@ msgstr "Προσθέστε την αξιολόγησή σας"
137msgid "Send"
145msgid "Send"
138msgstr "Αποστολή"
146msgstr "Αποστολή"
139
147
148+#: qml/Dash/ScopesOverview.qml:200
149+msgid "Manage Dash"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:405
153+msgid "Done"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverview.qml:431
157+msgid "Store"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:36
161+msgid "Favorites"
162+msgstr ""
163+
164+#: qml/Dash/ScopesOverviewTab.qml:54
165+msgid "All"
166+msgstr ""
167+
140#: qml/Greeter/Greeter.qml:157
168#: qml/Greeter/Greeter.qml:157
141msgid "Swipe to unlock"
169msgid "Swipe to unlock"
142msgstr "Σύρετε για να ξεκλειδώσετε"
170msgstr "Σύρετε για να ξεκλειδώσετε"
@@ -161,11 +189,11 @@ msgstr "Μιλήστε τώρα..."
161msgid "Speaking..."
189msgid "Speaking..."
162msgstr "Ομιλία..."
190msgstr "Ομιλία..."
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:91
192+#: qml/Notifications/NotificationMenuItemFactory.qml:100
165msgid "Show password"
193msgid "Show password"
166msgstr "Εμφάνιση κωδικού"
194msgstr "Εμφάνιση κωδικού"
167
195
168−#: qml/Notifications/NotificationMenuItemFactory.qml:103
196+#: qml/Notifications/NotificationMenuItemFactory.qml:115
169msgid "Please enter SIM PIN"
197msgid "Please enter SIM PIN"
170msgstr "Παρακαλώ εισάγετε το PIN της κάρτας SIM"
198msgstr "Παρακαλώ εισάγετε το PIN της κάρτας SIM"
171
199
@@ -177,35 +205,43 @@ msgstr "Πατήστε για να γυρίσετε στην κλήση..."
177msgid "Conference"
205msgid "Conference"
178msgstr "Συνδιάσκεψη"
206msgstr "Συνδιάσκεψη"
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:583
208+#: qml/Panel/Indicators/MenuItemFactory.qml:651
181msgid "In queue…"
209msgid "In queue…"
182−msgstr ""
210+msgstr "Στην ουρά..."
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:587
212+#: qml/Panel/Indicators/MenuItemFactory.qml:655
185msgid "Downloading"
213msgid "Downloading"
186msgstr "Λήψη σε εξέλιξη"
214msgstr "Λήψη σε εξέλιξη"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:589
216+#: qml/Panel/Indicators/MenuItemFactory.qml:657
189msgid "Paused, tap to resume"
217msgid "Paused, tap to resume"
190msgstr "Σταματημένο, αγγίξτε για συνέχιση"
218msgstr "Σταματημένο, αγγίξτε για συνέχιση"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:591
220+#: qml/Panel/Indicators/MenuItemFactory.qml:659
193msgid "Canceled"
221msgid "Canceled"
194msgstr "Ακυρώθηκε"
222msgstr "Ακυρώθηκε"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:593
224+#: qml/Panel/Indicators/MenuItemFactory.qml:661
197msgid "Finished"
225msgid "Finished"
198msgstr "Ολοκληρώθηκε"
226msgstr "Ολοκληρώθηκε"
199
227
200−#: qml/Panel/Indicators/MenuItemFactory.qml:595
228+#: qml/Panel/Indicators/MenuItemFactory.qml:663
201msgid "Failed, tap to retry"
229msgid "Failed, tap to retry"
202msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
230msgstr "Αποτυχία, πατήστε για να ξαναπροσπαθήσετε"
203
231
232+#: qml/Panel/Indicators/ModemInfoItem.qml:105
233+msgid "Unlock SIM"
234+msgstr ""
235+
236+#: qml/Panel/Indicators/RoamingIndication.qml:27
237+msgid "Roaming"
238+msgstr ""
239+
204#: qml/Panel/SearchIndicator.qml:27
240#: qml/Panel/SearchIndicator.qml:27
205msgid "Search"
241msgid "Search"
206msgstr "Αναζήτηση"
242msgstr "Αναζήτηση"
207
243
208−#: qml/Shell.qml:359
244+#: qml/Shell.qml:256
209#, qt-format
245#, qt-format
210msgid "Please enter %1"
246msgid "Please enter %1"
211msgstr "Πληκτρολογήστε %1"
247msgstr "Πληκτρολογήστε %1"
po/en_AU.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-27 12:14+0000\n"
11+"PO-Revision-Date: 2014-08-13 02:04+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-07-28 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-14 07:38+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,47 +26,63 @@ msgstr "Pin shortcut"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Unpin shortcut"
27msgstr "Unpin shortcut"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Are you sure you would like to turn power off?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Power off"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Restart"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Cancel"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Skip intro"
47msgstr "Skip intro"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Right edge"
51msgstr "Right edge"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Try swiping from the right edge to unlock the phone"
55msgstr "Try swiping from the right edge to unlock the phone"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Top edge"
59msgstr "Top edge"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Try swiping from the top edge to access the indicators"
63msgstr "Try swiping from the top edge to access the indicators"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Close"
67msgstr "Close"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Swipe up again to close the settings screen"
71msgstr "Swipe up again to close the settings screen"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Left edge"
75msgstr "Left edge"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "Swipe from the left to reveal the launcher for quick access to apps"
79msgstr "Swipe from the left to reveal the launcher for quick access to apps"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "Well done"
83msgstr "Well done"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
@@ -74,20 +90,20 @@ msgstr ""
74"You have now mastered the edge gestures and can start using the "
90"You have now mastered the edge gestures and can start using the "
75"phone<br><br>Tap on the screen to start"
91"phone<br><br>Tap on the screen to start"
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "Emergency Call"
95msgstr "Emergency Call"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr "OK"
99msgstr "OK"
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "Hello %1"
104msgstr "Hello %1"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "Hello"
108msgstr "Hello"
93
109
@@ -99,19 +115,11 @@ msgstr "CANCEL"
99msgid "DONE"
115msgid "DONE"
100msgstr "DONE"
116msgstr "DONE"
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr "See more"
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr "See less"
120msgstr "See less"
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr "Recent"
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr "See all"
124msgstr "See all"
117
125
@@ -135,6 +143,26 @@ msgstr "Add a review"
135msgid "Send"
143msgid "Send"
136msgstr "Send"
144msgstr "Send"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr "Manage Dash"
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr "Done"
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr "Store"
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr "Favourites"
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr "All"
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr "Swipe to unlock"
168msgstr "Swipe to unlock"
@@ -159,11 +187,11 @@ msgstr "Speak Now..."
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "Speaking..."
188msgstr "Speaking..."
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "Show password"
192msgstr "Show password"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr "Please enter SIM PIN"
196msgstr "Please enter SIM PIN"
169
197
@@ -175,35 +203,43 @@ msgstr "Tap to return to call..."
175msgid "Conference"
203msgid "Conference"
176msgstr "Conference"
204msgstr "Conference"
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr "In queue…"
208msgstr "In queue…"
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr "Downloading"
212msgstr "Downloading"
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr "Paused, tap to resume"
216msgstr "Paused, tap to resume"
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr "Cancelled"
220msgstr "Cancelled"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr "Finished"
224msgstr "Finished"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr "Failed, tap to retry"
228msgstr "Failed, tap to retry"
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr "Unlock SIM"
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr "Roaming"
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "Search"
240msgstr "Search"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "Please enter %1"
245msgstr "Please enter %1"
po/en_GB.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-27 14:09+0000\n"
11+"PO-Revision-Date: 2014-08-12 12:46+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-07-28 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,47 +26,63 @@ msgstr "Pin shortcut"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Unpin shortcut"
27msgstr "Unpin shortcut"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Are you sure you would like to turn power off?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Power off"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Restart"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Cancel"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Skip intro"
47msgstr "Skip intro"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Right edge"
51msgstr "Right edge"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Try swiping from the right edge to unlock the phone"
55msgstr "Try swiping from the right edge to unlock the phone"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Top edge"
59msgstr "Top edge"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Try swiping from the top edge to access the indicators"
63msgstr "Try swiping from the top edge to access the indicators"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Close"
67msgstr "Close"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Swipe up again to close the settings screen"
71msgstr "Swipe up again to close the settings screen"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Left edge"
75msgstr "Left edge"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "Swipe from the left to reveal the launcher for quick access to apps"
79msgstr "Swipe from the left to reveal the launcher for quick access to apps"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "Well done"
83msgstr "Well done"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
@@ -74,20 +90,20 @@ msgstr ""
74"You have now mastered the edge gestures and can start using the "
90"You have now mastered the edge gestures and can start using the "
75"phone<br><br>Tap on the screen to start"
91"phone<br><br>Tap on the screen to start"
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "Emergency Call"
95msgstr "Emergency Call"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr "OK"
99msgstr "OK"
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "Hello %1"
104msgstr "Hello %1"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "Hello"
108msgstr "Hello"
93
109
@@ -99,19 +115,11 @@ msgstr "CANCEL"
99msgid "DONE"
115msgid "DONE"
100msgstr "DONE"
116msgstr "DONE"
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr "See more"
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr "See less"
120msgstr "See less"
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr "Recent"
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr "See all"
124msgstr "See all"
117
125
@@ -135,6 +143,26 @@ msgstr "Add a review"
135msgid "Send"
143msgid "Send"
136msgstr "Send"
144msgstr "Send"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr "Manage Dash"
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr "Done"
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr "Store"
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr "Favourites"
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr "All"
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr "Swipe to unlock"
168msgstr "Swipe to unlock"
@@ -159,11 +187,11 @@ msgstr "Speak Now..."
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "Speaking..."
188msgstr "Speaking..."
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "Show password"
192msgstr "Show password"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr "Please enter SIM PIN"
196msgstr "Please enter SIM PIN"
169
197
@@ -175,35 +203,43 @@ msgstr "Tap to return to call..."
175msgid "Conference"
203msgid "Conference"
176msgstr "Conference"
204msgstr "Conference"
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr "In queue…"
208msgstr "In queue…"
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr "Downloading"
212msgstr "Downloading"
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr "Paused, tap to resume"
216msgstr "Paused, tap to resume"
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr "Cancelled"
220msgstr "Cancelled"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr "Finished"
224msgstr "Finished"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr "Failed, tap to retry"
228msgstr "Failed, tap to retry"
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr "Unlock SIM"
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr "Roaming"
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "Search"
240msgstr "Search"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "Please enter %1"
245msgstr "Please enter %1"
po/eo.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr ""
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr ""
186msgstr ""
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr ""
238msgstr ""
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/es.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11"PO-Revision-Date: 2014-08-06 15:24+0000\n"
11"PO-Revision-Date: 2014-08-06 15:24+0000\n"
12"Last-Translator: Leo Arias <leo.arias@canonical.com>\n"
12"Last-Translator: Leo Arias <leo.arias@canonical.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-07 06:27+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,50 +26,66 @@ msgstr "Anclar"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Desanclar"
27msgstr "Desanclar"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Omitir la introducción"
47msgstr "Omitir la introducción"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Borde derecho"
51msgstr "Borde derecho"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"
55msgstr "Deslice el dedo desde el borde derecho para desbloquear el teléfono"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Borde superior"
59msgstr "Borde superior"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48"Deslice el dedo desde el borde superior para acceder a los indicadores"
64"Deslice el dedo desde el borde superior para acceder a los indicadores"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "Cerrar"
68msgstr "Cerrar"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"
72msgstr "Deslice hacia arriba para cerrar la pantalla de configuración"
57
73
58−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
59msgid "Left edge"
75msgid "Left edge"
60msgstr "Borde izquierdo"
76msgstr "Borde izquierdo"
61
77
62−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
64msgstr ""
80msgstr ""
65"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "
81"Deslice el dedo desde la izquierda para mostrar el lanzador y acceder "
66"rápidamente a las aplicaciones"
82"rápidamente a las aplicaciones"
67
83
68−#: qml/Components/EdgeDemo.qml:227
84+#: qml/Components/EdgeDemo.qml:226
69msgid "Well done"
85msgid "Well done"
70msgstr "Bien hecho"
86msgstr "Bien hecho"
71
87
72−#: qml/Components/EdgeDemo.qml:228
88+#: qml/Components/EdgeDemo.qml:227
73msgid ""
89msgid ""
74"You have now mastered the edge gestures and can start using the "
90"You have now mastered the edge gestures and can start using the "
75"phone<br><br>Tap on the screen to start"
91"phone<br><br>Tap on the screen to start"
@@ -77,20 +93,20 @@ msgstr ""
77"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
93"Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "
78"la pantalla para comenzar"
94"la pantalla para comenzar"
79
95
80−#: qml/Components/Lockscreen.qml:214
96+#: qml/Components/Lockscreen.qml:220
81msgid "Emergency Call"
97msgid "Emergency Call"
82msgstr "Llamada de emergencia"
98msgstr "Llamada de emergencia"
83
99
84−#: qml/Components/Lockscreen.qml:231
100+#: qml/Components/Lockscreen.qml:243
85msgid "OK"
101msgid "OK"
86msgstr "Aceptar"
102msgstr "Aceptar"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89#, qt-format
105#, qt-format
90msgid "Hello %1"
106msgid "Hello %1"
91msgstr "Hola, %1"
107msgstr "Hola, %1"
92
108
93−#: qml/Components/PassphraseLockscreen.qml:60
109+#: qml/Components/PassphraseLockscreen.qml:62
94msgid "Hello"
110msgid "Hello"
95msgstr "Hola"
111msgstr "Hola"
96
112
@@ -102,19 +118,11 @@ msgstr "CANCELAR"
102msgid "DONE"
118msgid "DONE"
103msgstr "HECHO"
119msgstr "HECHO"
104
120
105−#: qml/Components/SeeMore.qml:35
106−msgid "See more"
107−msgstr "Ver más"
108−
109−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
121+#: qml/Dash/GenericScopeView.qml:358
110msgid "See less"
122msgid "See less"
111msgstr "Ver menos"
123msgstr "Ver menos"
112
124
113−#: qml/Dash/DashApps.qml:37
114−msgid "Recent"
115−msgstr "Recientes"
116−
117−#: qml/Dash/GenericScopeView.qml:330
125+#: qml/Dash/GenericScopeView.qml:358
118msgid "See all"
126msgid "See all"
119msgstr "Ver todas"
127msgstr "Ver todas"
120
128
@@ -138,6 +146,26 @@ msgstr "Añadir una reseña"
138msgid "Send"
146msgid "Send"
139msgstr "Enviar"
147msgstr "Enviar"
140
148
149+#: qml/Dash/ScopesOverview.qml:200
150+msgid "Manage Dash"
151+msgstr ""
152+
153+#: qml/Dash/ScopesOverview.qml:405
154+msgid "Done"
155+msgstr ""
156+
157+#: qml/Dash/ScopesOverview.qml:431
158+msgid "Store"
159+msgstr ""
160+
161+#: qml/Dash/ScopesOverviewTab.qml:36
162+msgid "Favorites"
163+msgstr ""
164+
165+#: qml/Dash/ScopesOverviewTab.qml:54
166+msgid "All"
167+msgstr ""
168+
141#: qml/Greeter/Greeter.qml:157
169#: qml/Greeter/Greeter.qml:157
142msgid "Swipe to unlock"
170msgid "Swipe to unlock"
143msgstr "Deslice para desbloquear"
171msgstr "Deslice para desbloquear"
@@ -162,11 +190,11 @@ msgstr "Hable ahora…"
162msgid "Speaking..."
190msgid "Speaking..."
163msgstr "Hablando…"
191msgstr "Hablando…"
164
192
165−#: qml/Notifications/NotificationMenuItemFactory.qml:91
193+#: qml/Notifications/NotificationMenuItemFactory.qml:100
166msgid "Show password"
194msgid "Show password"
167msgstr "Mostrar contraseña"
195msgstr "Mostrar contraseña"
168
196
169−#: qml/Notifications/NotificationMenuItemFactory.qml:103
197+#: qml/Notifications/NotificationMenuItemFactory.qml:115
170msgid "Please enter SIM PIN"
198msgid "Please enter SIM PIN"
171msgstr "Escriba el PIN de la SIM"
199msgstr "Escriba el PIN de la SIM"
172
200
@@ -178,35 +206,43 @@ msgstr "Toque para volver a llamar..."
178msgid "Conference"
206msgid "Conference"
179msgstr "Conferencia"
207msgstr "Conferencia"
180
208
181−#: qml/Panel/Indicators/MenuItemFactory.qml:583
209+#: qml/Panel/Indicators/MenuItemFactory.qml:651
182msgid "In queue…"
210msgid "In queue…"
183msgstr "En espera…"
211msgstr "En espera…"
184
212
185−#: qml/Panel/Indicators/MenuItemFactory.qml:587
213+#: qml/Panel/Indicators/MenuItemFactory.qml:655
186msgid "Downloading"
214msgid "Downloading"
187msgstr "Descargando"
215msgstr "Descargando"
188
216
189−#: qml/Panel/Indicators/MenuItemFactory.qml:589
217+#: qml/Panel/Indicators/MenuItemFactory.qml:657
190msgid "Paused, tap to resume"
218msgid "Paused, tap to resume"
191msgstr "Pausado, toque para reanudar"
219msgstr "Pausado, toque para reanudar"
192
220
193−#: qml/Panel/Indicators/MenuItemFactory.qml:591
221+#: qml/Panel/Indicators/MenuItemFactory.qml:659
194msgid "Canceled"
222msgid "Canceled"
195msgstr "Cancelado"
223msgstr "Cancelado"
196
224
197−#: qml/Panel/Indicators/MenuItemFactory.qml:593
225+#: qml/Panel/Indicators/MenuItemFactory.qml:661
198msgid "Finished"
226msgid "Finished"
199msgstr "Finalizado"
227msgstr "Finalizado"
200
228
201−#: qml/Panel/Indicators/MenuItemFactory.qml:595
229+#: qml/Panel/Indicators/MenuItemFactory.qml:663
202msgid "Failed, tap to retry"
230msgid "Failed, tap to retry"
203msgstr "Falló, toque para reintentar"
231msgstr "Falló, toque para reintentar"
204
232
233+#: qml/Panel/Indicators/ModemInfoItem.qml:105
234+msgid "Unlock SIM"
235+msgstr ""
236+
237+#: qml/Panel/Indicators/RoamingIndication.qml:27
238+msgid "Roaming"
239+msgstr ""
240+
205#: qml/Panel/SearchIndicator.qml:27
241#: qml/Panel/SearchIndicator.qml:27
206msgid "Search"
242msgid "Search"
207msgstr "Buscar"
243msgstr "Buscar"
208
244
209−#: qml/Shell.qml:359
245+#: qml/Shell.qml:256
210#, qt-format
246#, qt-format
211msgid "Please enter %1"
247msgid "Please enter %1"
212msgstr "Introduzca %1"
248msgstr "Introduzca %1"
po/eu.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07 06:27+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,50 +26,66 @@ msgstr "Ainguratu lasterbidea"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Askatu lasterbidea"
27msgstr "Askatu lasterbidea"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Saltatu aurkezpena"
47msgstr "Saltatu aurkezpena"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Eskuineko ertza"
51msgstr "Eskuineko ertza"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
56"Pasatu hatza eskuineko ertzetik ezkerrerantz telefonoa desblokeatzeko"
41
57
42−#: qml/Components/EdgeDemo.qml:145
58+#: qml/Components/EdgeDemo.qml:144
43msgid "Top edge"
59msgid "Top edge"
44msgstr "Goiko ertza"
60msgstr "Goiko ertza"
45
61
46−#: qml/Components/EdgeDemo.qml:146
62+#: qml/Components/EdgeDemo.qml:145
47msgid "Try swiping from the top edge to access the indicators"
63msgid "Try swiping from the top edge to access the indicators"
48msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"
64msgstr "Pasatu hatza goiko ertzetik beherantz adierazleak ikusteko"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "Itxi"
68msgstr "Itxi"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"
72msgstr "Pasatu hatza berriro gora ezarpenen leihoa ixteko"
57
73
58−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
59msgid "Left edge"
75msgid "Left edge"
60msgstr "Ezkerreko ertza"
76msgstr "Ezkerreko ertza"
61
77
62−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
64msgstr ""
80msgstr ""
65"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak eskura berehala "
81"Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak eskura berehala "
66"izateko"
82"izateko"
67
83
68−#: qml/Components/EdgeDemo.qml:227
84+#: qml/Components/EdgeDemo.qml:226
69msgid "Well done"
85msgid "Well done"
70msgstr "Bikain"
86msgstr "Bikain"
71
87
72−#: qml/Components/EdgeDemo.qml:228
88+#: qml/Components/EdgeDemo.qml:227
73msgid ""
89msgid ""
74"You have now mastered the edge gestures and can start using the "
90"You have now mastered the edge gestures and can start using the "
75"phone<br><br>Tap on the screen to start"
91"phone<br><br>Tap on the screen to start"
@@ -77,20 +93,20 @@ msgstr ""
77"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
93"Jadanik ezagutzen dituzu ertzetako keinuak, eta mugikorra erabiltzen has "
78"zaitezke<br><br>Sakatu pantailan hasteko"
94"zaitezke<br><br>Sakatu pantailan hasteko"
79
95
80−#: qml/Components/Lockscreen.qml:214
96+#: qml/Components/Lockscreen.qml:220
81msgid "Emergency Call"
97msgid "Emergency Call"
82msgstr "Larrialdi-deia"
98msgstr "Larrialdi-deia"
83
99
84−#: qml/Components/Lockscreen.qml:231
100+#: qml/Components/Lockscreen.qml:243
85msgid "OK"
101msgid "OK"
86msgstr "Ados"
102msgstr "Ados"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89#, qt-format
105#, qt-format
90msgid "Hello %1"
106msgid "Hello %1"
91msgstr "Kaixo %1"
107msgstr "Kaixo %1"
92
108
93−#: qml/Components/PassphraseLockscreen.qml:60
109+#: qml/Components/PassphraseLockscreen.qml:62
94msgid "Hello"
110msgid "Hello"
95msgstr "Kaixo"
111msgstr "Kaixo"
96
112
@@ -102,19 +118,11 @@ msgstr "UTZI"
102msgid "DONE"
118msgid "DONE"
103msgstr "EGINDA"
119msgstr "EGINDA"
104
120
105−#: qml/Components/SeeMore.qml:35
106−msgid "See more"
107−msgstr "Ikusi gehiago"
108−
109−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
121+#: qml/Dash/GenericScopeView.qml:358
110msgid "See less"
122msgid "See less"
111msgstr "Ikusi gutxiago"
123msgstr "Ikusi gutxiago"
112
124
113−#: qml/Dash/DashApps.qml:37
114−msgid "Recent"
115−msgstr "Azkenak"
116−
117−#: qml/Dash/GenericScopeView.qml:330
125+#: qml/Dash/GenericScopeView.qml:358
118msgid "See all"
126msgid "See all"
119msgstr "Ikusi guztiak"
127msgstr "Ikusi guztiak"
120
128
@@ -138,6 +146,26 @@ msgstr "Gehitu kritika"
138msgid "Send"
146msgid "Send"
139msgstr "Bidali"
147msgstr "Bidali"
140
148
149+#: qml/Dash/ScopesOverview.qml:200
150+msgid "Manage Dash"
151+msgstr ""
152+
153+#: qml/Dash/ScopesOverview.qml:405
154+msgid "Done"
155+msgstr ""
156+
157+#: qml/Dash/ScopesOverview.qml:431
158+msgid "Store"
159+msgstr ""
160+
161+#: qml/Dash/ScopesOverviewTab.qml:36
162+msgid "Favorites"
163+msgstr ""
164+
165+#: qml/Dash/ScopesOverviewTab.qml:54
166+msgid "All"
167+msgstr ""
168+
141#: qml/Greeter/Greeter.qml:157
169#: qml/Greeter/Greeter.qml:157
142msgid "Swipe to unlock"
170msgid "Swipe to unlock"
143msgstr "Pasatu hatza desblokeatzeko"
171msgstr "Pasatu hatza desblokeatzeko"
@@ -162,11 +190,11 @@ msgstr "Hitz egin orain..."
162msgid "Speaking..."
190msgid "Speaking..."
163msgstr "Hitz egiten..."
191msgstr "Hitz egiten..."
164
192
165−#: qml/Notifications/NotificationMenuItemFactory.qml:91
193+#: qml/Notifications/NotificationMenuItemFactory.qml:100
166msgid "Show password"
194msgid "Show password"
167msgstr "Erakutsi pasahitza"
195msgstr "Erakutsi pasahitza"
168
196
169−#: qml/Notifications/NotificationMenuItemFactory.qml:103
197+#: qml/Notifications/NotificationMenuItemFactory.qml:115
170msgid "Please enter SIM PIN"
198msgid "Please enter SIM PIN"
171msgstr "Sartu SIMaren PINa"
199msgstr "Sartu SIMaren PINa"
172
200
@@ -178,35 +206,43 @@ msgstr "Sakatu deia itzultzeko..."
178msgid "Conference"
206msgid "Conference"
179msgstr "Konferentzia"
207msgstr "Konferentzia"
180
208
181−#: qml/Panel/Indicators/MenuItemFactory.qml:583
209+#: qml/Panel/Indicators/MenuItemFactory.qml:651
182msgid "In queue…"
210msgid "In queue…"
183msgstr "Ilaran..."
211msgstr "Ilaran..."
184
212
185−#: qml/Panel/Indicators/MenuItemFactory.qml:587
213+#: qml/Panel/Indicators/MenuItemFactory.qml:655
186msgid "Downloading"
214msgid "Downloading"
187msgstr "Deskargatzen"
215msgstr "Deskargatzen"
188
216
189−#: qml/Panel/Indicators/MenuItemFactory.qml:589
217+#: qml/Panel/Indicators/MenuItemFactory.qml:657
190msgid "Paused, tap to resume"
218msgid "Paused, tap to resume"
191msgstr "Pausatuta, sakatu jarraitzeko"
219msgstr "Pausatuta, sakatu jarraitzeko"
192
220
193−#: qml/Panel/Indicators/MenuItemFactory.qml:591
221+#: qml/Panel/Indicators/MenuItemFactory.qml:659
194msgid "Canceled"
222msgid "Canceled"
195msgstr "Utzita"
223msgstr "Utzita"
196
224
197−#: qml/Panel/Indicators/MenuItemFactory.qml:593
225+#: qml/Panel/Indicators/MenuItemFactory.qml:661
198msgid "Finished"
226msgid "Finished"
199msgstr "Amaituta"
227msgstr "Amaituta"
200
228
201−#: qml/Panel/Indicators/MenuItemFactory.qml:595
229+#: qml/Panel/Indicators/MenuItemFactory.qml:663
202msgid "Failed, tap to retry"
230msgid "Failed, tap to retry"
203msgstr "Huts egin du, sakatu berriro saiatzeko"
231msgstr "Huts egin du, sakatu berriro saiatzeko"
204
232
233+#: qml/Panel/Indicators/ModemInfoItem.qml:105
234+msgid "Unlock SIM"
235+msgstr ""
236+
237+#: qml/Panel/Indicators/RoamingIndication.qml:27
238+msgid "Roaming"
239+msgstr ""
240+
205#: qml/Panel/SearchIndicator.qml:27
241#: qml/Panel/SearchIndicator.qml:27
206msgid "Search"
242msgid "Search"
207msgstr "Bilatu"
243msgstr "Bilatu"
208
244
209−#: qml/Shell.qml:359
245+#: qml/Shell.qml:256
210#, qt-format
246#, qt-format
211msgid "Please enter %1"
247msgid "Please enter %1"
212msgstr "Sartu %1"
248msgstr "Sartu %1"
po/fa.po+74−38
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-08-03 13:00+0000\n"
11+"PO-Revision-Date: 2014-08-12 13:40+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-04 06:32+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,47 +26,63 @@ msgstr "سنجاق کردن میانبر"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "برداشتن سنجاق میانبر"
27msgstr "برداشتن سنجاق میانبر"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "مطمئنید که می‌خواهید خاموش کنید؟"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "خاموش کردن"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "شروع مجدّد"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "لغو"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "پرش از مقدّمه"
47msgstr "پرش از مقدّمه"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "لبه‌ی راست"
51msgstr "لبه‌ی راست"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "برای باز کردن قفل تلفن، از لبه‌ی راست بکشید"
55msgstr "برای باز کردن قفل تلفن، از لبه‌ی راست بکشید"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "لبه‌ی بالا"
59msgstr "لبه‌ی بالا"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "برای دست‌رسی به نشانگرها، از لبه‌ی بالا بکشید"
63msgstr "برای دست‌رسی به نشانگرها، از لبه‌ی بالا بکشید"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "بستن"
67msgstr "بستن"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "برای بستن صفحه‌ی تنظیمات، دوباره به بالا بکشپد"
71msgstr "برای بستن صفحه‌ی تنظیمات، دوباره به بالا بکشپد"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "لبه‌ی چپ"
75msgstr "لبه‌ی چپ"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "برای آشکار شدن اجراگر به منظور دست‌رسی سریع به اپ‌ها از سمت چپ بکشید"
79msgstr "برای آشکار شدن اجراگر به منظور دست‌رسی سریع به اپ‌ها از سمت چپ بکشید"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "عالی بود"
83msgstr "عالی بود"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
@@ -74,20 +90,20 @@ msgstr ""
74"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
90"هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "
75"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
91"از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "تماس اضطراری"
95msgstr "تماس اضطراری"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr "قبول"
99msgstr "قبول"
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "سلام %1"
104msgstr "سلام %1"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "سلام"
108msgstr "سلام"
93
109
@@ -99,19 +115,11 @@ msgstr "لغو"
99msgid "DONE"
115msgid "DONE"
100msgstr "انجام شد"
116msgstr "انجام شد"
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr "بیش‌تر ببینید"
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr "کم‌تر ببینید"
120msgstr "کم‌تر ببینید"
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr "موارد اخیر"
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr "دیدن همه"
124msgstr "دیدن همه"
117
125
@@ -135,6 +143,26 @@ msgstr "افزودن یک بازبینی"
135msgid "Send"
143msgid "Send"
136msgstr "ارسال"
144msgstr "ارسال"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr "مدیریت دش"
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr "انجام شد"
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr "فروشگاه"
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr "برگزیده‌ها"
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr "همه"
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr "برای باز کردن قفل بکشد"
168msgstr "برای باز کردن قفل بکشد"
@@ -159,11 +187,11 @@ msgstr "اکنون صحبت کنید…"
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "در حال صحبت کردن…"
188msgstr "در حال صحبت کردن…"
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "نمایش گذرواژه"
192msgstr "نمایش گذرواژه"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr "لطفاً PIN سیم‌کارت را وارد کنید"
196msgstr "لطفاً PIN سیم‌کارت را وارد کنید"
169
197
@@ -175,35 +203,43 @@ msgstr "برای بازگشت به تماس ضربه بزنید…"
175msgid "Conference"
203msgid "Conference"
176msgstr "کنفرانس"
204msgstr "کنفرانس"
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr "در صف…"
208msgstr "در صف…"
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr "در حال بارگیری"
212msgstr "در حال بارگیری"
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr "مکث شد، برای از سر گیری ضربه بزنید"
216msgstr "مکث شد، برای از سر گیری ضربه بزنید"
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr "لغو شد"
220msgstr "لغو شد"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr "پایان یافت"
224msgstr "پایان یافت"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
228msgstr "شکست خورد، برای تلاش دوباره ضربه بزنید"
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr "باز کردن قفل سیم‌کارت"
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr "رومینگ"
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "جست‌وجو"
240msgstr "جست‌وجو"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "لطفا %1 را وارد کنید"
245msgstr "لطفا %1 را وارد کنید"
po/fi.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-25 16:07+0000\n"
11+"PO-Revision-Date: 2014-08-13 06:38+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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-14 07:37+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,47 +26,63 @@ msgstr "Kiinnitä pikakuvake"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Poista pikakuvakkeen kiinnitys"
27msgstr "Poista pikakuvakkeen kiinnitys"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Haluatko varmasti sammuttaa laitteen?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Sammuta"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Käynnistä uudelleen"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Peru"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Ohita esittely"
47msgstr "Ohita esittely"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Oikea reuna"
51msgstr "Oikea reuna"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Vedä oikealta avataksesi puhelimen lukituksen"
55msgstr "Vedä oikealta avataksesi puhelimen lukituksen"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Yläreuna"
59msgstr "Yläreuna"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"
63msgstr "Vedä yläreunasta käyttääksesi ilmaisimia"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Sulje"
67msgstr "Sulje"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"
71msgstr "Vedä uudestaan sulkeaksesi asetusnäkymän"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Vasen reuna"
75msgstr "Vasen reuna"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"
79msgstr "Vedä vasemmalta saattaaksesi sovellusten käynnistimen esiin"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "Hyvin tehty"
83msgstr "Hyvin tehty"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
@@ -74,20 +90,20 @@ msgstr ""
74"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
90"Hallitset nyt reunaeleet, joten voit aloittaa puhelimen "
75"käytön<br><br>Napauta näyttöä aloittaaksesi"
91"käytön<br><br>Napauta näyttöä aloittaaksesi"
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "Hätäpuhelu"
95msgstr "Hätäpuhelu"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr "OK"
99msgstr "OK"
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "Hei %1!"
104msgstr "Hei %1!"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "Hei"
108msgstr "Hei"
93
109
@@ -99,19 +115,11 @@ msgstr "PERU"
99msgid "DONE"
115msgid "DONE"
100msgstr "VALMIS"
116msgstr "VALMIS"
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr "Näytä lisää"
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr "Näytä vähemmän"
120msgstr "Näytä vähemmän"
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr "Viimeisimmät"
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr "Näytä kaikki"
124msgstr "Näytä kaikki"
117
125
@@ -135,6 +143,26 @@ msgstr "Lisää arvostelu"
135msgid "Send"
143msgid "Send"
136msgstr "Lähetä"
144msgstr "Lähetä"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr "Dashin hallinta"
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr "Valmis"
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr "Kauppa"
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr "Suosikit"
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr "Kaikki"
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr "Avaa pyyhkäisemällä"
168msgstr "Avaa pyyhkäisemällä"
@@ -159,11 +187,11 @@ msgstr "Puhu nyt..."
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "Puhutaan..."
188msgstr "Puhutaan..."
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "Näytä salasana"
192msgstr "Näytä salasana"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr "Anna SIM-kortin PIN-koodi"
196msgstr "Anna SIM-kortin PIN-koodi"
169
197
@@ -175,35 +203,43 @@ msgstr "Napauta palataksesi puheluun..."
175msgid "Conference"
203msgid "Conference"
176msgstr "Ryhmäpuhelu"
204msgstr "Ryhmäpuhelu"
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr "Jonossa…"
208msgstr "Jonossa…"
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr "Ladataan"
212msgstr "Ladataan"
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr "Keskeytetty, napauta palauttaaksesi"
216msgstr "Keskeytetty, napauta palauttaaksesi"
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr "Peruttu"
220msgstr "Peruttu"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr "Valmistunut"
224msgstr "Valmistunut"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
228msgstr "Epäonnistunut, napauta yrittääksesi uudelleen"
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr "Avaa SIM-kortin lukitus"
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr "Verkkovierailu"
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "Hae"
240msgstr "Hae"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "Kirjoita %1"
245msgstr "Kirjoita %1"
po/fo.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Høgra kant"
51msgstr "Høgra kant"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Topp kantur"
59msgstr "Topp kantur"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "Snakka nú..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "Snakkar..."
186msgstr "Snakkar..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "Leita"
238msgstr "Leita"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/fr.po+74−38
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-26 20:52+0000\n"
11+"PO-Revision-Date: 2014-08-12 18:47+0000\n"
12−"Last-Translator: Anne <anneonyme017@gmail.com>\n"
12+"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\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-07-27 06:35+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,54 +26,70 @@ msgstr "Épingler le raccourci"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Détacher le raccourci"
27msgstr "Détacher le raccourci"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Êtes-vous sûr de vouloir éteindre ?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Éteindre"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Redémarrer"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Annuler"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Passer l'intro"
47msgstr "Passer l'intro"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Bord droit"
51msgstr "Bord droit"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40"Faites glisser votre doigt à partir du bord droit pour déverrouiller."
56"Faites glisser votre doigt à partir du bord droit pour déverrouiller."
41
57
42−#: qml/Components/EdgeDemo.qml:145
58+#: qml/Components/EdgeDemo.qml:144
43msgid "Top edge"
59msgid "Top edge"
44msgstr "Bord supérieur"
60msgstr "Bord supérieur"
45
61
46−#: qml/Components/EdgeDemo.qml:146
62+#: qml/Components/EdgeDemo.qml:145
47msgid "Try swiping from the top edge to access the indicators"
63msgid "Try swiping from the top edge to access the indicators"
48msgstr ""
64msgstr ""
49"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "
65"Faites glisser votre doigt à partir du bord supérieur pour accéder aux "
50"indicateurs."
66"indicateurs."
51
67
52−#: qml/Components/EdgeDemo.qml:171
68+#: qml/Components/EdgeDemo.qml:170
53msgid "Close"
69msgid "Close"
54msgstr "Fermer"
70msgstr "Fermer"
55
71
56−#: qml/Components/EdgeDemo.qml:172
72+#: qml/Components/EdgeDemo.qml:171
57msgid "Swipe up again to close the settings screen"
73msgid "Swipe up again to close the settings screen"
58msgstr ""
74msgstr ""
59"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "
75"Faites glisser à nouveau votre doigt vers le bord supérieur pour fermer "
60"l'écran des paramètres"
76"l'écran des paramètres"
61
77
62−#: qml/Components/EdgeDemo.qml:199
78+#: qml/Components/EdgeDemo.qml:198
63msgid "Left edge"
79msgid "Left edge"
64msgstr "Bord gauche"
80msgstr "Bord gauche"
65
81
66−#: qml/Components/EdgeDemo.qml:200
82+#: qml/Components/EdgeDemo.qml:199
67msgid "Swipe from the left to reveal the launcher for quick access to apps"
83msgid "Swipe from the left to reveal the launcher for quick access to apps"
68msgstr ""
84msgstr ""
69"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "
85"Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "
70"d'applications."
86"d'applications."
71
87
72−#: qml/Components/EdgeDemo.qml:227
88+#: qml/Components/EdgeDemo.qml:226
73msgid "Well done"
89msgid "Well done"
74msgstr "Félicitations"
90msgstr "Félicitations"
75
91
76−#: qml/Components/EdgeDemo.qml:228
92+#: qml/Components/EdgeDemo.qml:227
77msgid ""
93msgid ""
78"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 "
79"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
@@ -81,20 +97,20 @@ msgstr ""
81"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
97"Vous maîtrisez maintenant les différents gestes et pouvez commencer à "
82"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
98"utiliser le téléphone<br><br>Appuyez sur l'écran pour commencer"
83
99
84−#: qml/Components/Lockscreen.qml:214
100+#: qml/Components/Lockscreen.qml:220
85msgid "Emergency Call"
101msgid "Emergency Call"
86msgstr "Appel d'urgence"
102msgstr "Appel d'urgence"
87
103
88−#: qml/Components/Lockscreen.qml:231
104+#: qml/Components/Lockscreen.qml:243
89msgid "OK"
105msgid "OK"
90msgstr "OK"
106msgstr "OK"
91
107
92−#: qml/Components/PassphraseLockscreen.qml:60
108+#: qml/Components/PassphraseLockscreen.qml:62
93#, qt-format
109#, qt-format
94msgid "Hello %1"
110msgid "Hello %1"
95msgstr "Bonjour %1"
111msgstr "Bonjour %1"
96
112
97−#: qml/Components/PassphraseLockscreen.qml:60
113+#: qml/Components/PassphraseLockscreen.qml:62
98msgid "Hello"
114msgid "Hello"
99msgstr "Bonjour"
115msgstr "Bonjour"
100
116
@@ -106,19 +122,11 @@ msgstr "ANNULER"
106msgid "DONE"
122msgid "DONE"
107msgstr "VALIDER"
123msgstr "VALIDER"
108
124
109−#: qml/Components/SeeMore.qml:35
110−msgid "See more"
111−msgstr "Voir plus"
112−
113−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
125+#: qml/Dash/GenericScopeView.qml:358
114msgid "See less"
126msgid "See less"
115msgstr "Voir moins"
127msgstr "Voir moins"
116
128
117−#: qml/Dash/DashApps.qml:37
118−msgid "Recent"
119−msgstr "Récent"
120−
121−#: qml/Dash/GenericScopeView.qml:330
129+#: qml/Dash/GenericScopeView.qml:358
122msgid "See all"
130msgid "See all"
123msgstr "Tout voir"
131msgstr "Tout voir"
124
132
@@ -142,6 +150,26 @@ msgstr "Ajouter un avis"
142msgid "Send"
150msgid "Send"
143msgstr "Envoyer"
151msgstr "Envoyer"
144
152
153+#: qml/Dash/ScopesOverview.qml:200
154+msgid "Manage Dash"
155+msgstr "Gérer le tableau de bord"
156+
157+#: qml/Dash/ScopesOverview.qml:405
158+msgid "Done"
159+msgstr ""
160+
161+#: qml/Dash/ScopesOverview.qml:431
162+msgid "Store"
163+msgstr ""
164+
165+#: qml/Dash/ScopesOverviewTab.qml:36
166+msgid "Favorites"
167+msgstr ""
168+
169+#: qml/Dash/ScopesOverviewTab.qml:54
170+msgid "All"
171+msgstr ""
172+
145#: qml/Greeter/Greeter.qml:157
173#: qml/Greeter/Greeter.qml:157
146msgid "Swipe to unlock"
174msgid "Swipe to unlock"
147msgstr "Faites glisser pour déverrouiller"
175msgstr "Faites glisser pour déverrouiller"
@@ -166,11 +194,11 @@ msgstr "Parlez maintenant…"
166msgid "Speaking..."
194msgid "Speaking..."
167msgstr "En cours d'écoute..."
195msgstr "En cours d'écoute..."
168
196
169−#: qml/Notifications/NotificationMenuItemFactory.qml:91
197+#: qml/Notifications/NotificationMenuItemFactory.qml:100
170msgid "Show password"
198msgid "Show password"
171msgstr "Afficher le mot de passe"
199msgstr "Afficher le mot de passe"
172
200
173−#: qml/Notifications/NotificationMenuItemFactory.qml:103
201+#: qml/Notifications/NotificationMenuItemFactory.qml:115
174msgid "Please enter SIM PIN"
202msgid "Please enter SIM PIN"
175msgstr "Entrez le code PIN"
203msgstr "Entrez le code PIN"
176
204
@@ -182,35 +210,43 @@ msgstr "Appuyez pour revenir à l'appel…"
182msgid "Conference"
210msgid "Conference"
183msgstr "Conférence"
211msgstr "Conférence"
184
212
185−#: qml/Panel/Indicators/MenuItemFactory.qml:583
213+#: qml/Panel/Indicators/MenuItemFactory.qml:651
186msgid "In queue…"
214msgid "In queue…"
187msgstr "Dans la file d'attente..."
215msgstr "Dans la file d'attente..."
188
216
189−#: qml/Panel/Indicators/MenuItemFactory.qml:587
217+#: qml/Panel/Indicators/MenuItemFactory.qml:655
190msgid "Downloading"
218msgid "Downloading"
191msgstr "Téléchargement en cours"
219msgstr "Téléchargement en cours"
192
220
193−#: qml/Panel/Indicators/MenuItemFactory.qml:589
221+#: qml/Panel/Indicators/MenuItemFactory.qml:657
194msgid "Paused, tap to resume"
222msgid "Paused, tap to resume"
195msgstr "En pause, appuyez pour reprendre"
223msgstr "En pause, appuyez pour reprendre"
196
224
197−#: qml/Panel/Indicators/MenuItemFactory.qml:591
225+#: qml/Panel/Indicators/MenuItemFactory.qml:659
198msgid "Canceled"
226msgid "Canceled"
199msgstr "Annulé"
227msgstr "Annulé"
200
228
201−#: qml/Panel/Indicators/MenuItemFactory.qml:593
229+#: qml/Panel/Indicators/MenuItemFactory.qml:661
202msgid "Finished"
230msgid "Finished"
203msgstr "Terminé"
231msgstr "Terminé"
204
232
205−#: qml/Panel/Indicators/MenuItemFactory.qml:595
233+#: qml/Panel/Indicators/MenuItemFactory.qml:663
206msgid "Failed, tap to retry"
234msgid "Failed, tap to retry"
207msgstr "Échec, appuyez pour réessayer"
235msgstr "Échec, appuyez pour réessayer"
208
236
237+#: qml/Panel/Indicators/ModemInfoItem.qml:105
238+msgid "Unlock SIM"
239+msgstr "Déverrouiller la carte SIM"
240+
241+#: qml/Panel/Indicators/RoamingIndication.qml:27
242+msgid "Roaming"
243+msgstr ""
244+
209#: qml/Panel/SearchIndicator.qml:27
245#: qml/Panel/SearchIndicator.qml:27
210msgid "Search"
246msgid "Search"
211msgstr "Rechercher"
247msgstr "Rechercher"
212
248
213−#: qml/Shell.qml:359
249+#: qml/Shell.qml:256
214#, qt-format
250#, qt-format
215msgid "Please enter %1"
251msgid "Please enter %1"
216msgstr "Veuillez saisir %1"
252msgstr "Veuillez saisir %1"
po/gd.po+74−38
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19"Language: gd\n"
19"Language: gd\n"
20
20
21#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -27,53 +27,69 @@ msgstr "Prìnich ath-ghoirid"
27msgid "Unpin shortcut"
27msgid "Unpin shortcut"
28msgstr "Neo-phrìnich an ath-ghoirid"
28msgstr "Neo-phrìnich an ath-ghoirid"
29
29
30+#: qml/Components/Dialogs.qml:142
31+msgid "Are you sure you would like to turn power off?"
32+msgstr "A bheil thu cinnteach gu bheil thu airson a chur dheth?"
33+
34+#: qml/Components/Dialogs.qml:144
35+msgid "Power off"
36+msgstr "Cuir a' chumhachd dheth"
37+
38+#: qml/Components/Dialogs.qml:153
39+msgid "Restart"
40+msgstr "Ath-thòisich"
41+
42+#: qml/Components/Dialogs.qml:162
43+msgid "Cancel"
44+msgstr "Sguir dheth"
45+
30#: qml/Components/EdgeDemoOverlay.qml:151
46#: qml/Components/EdgeDemoOverlay.qml:151
31msgid "Skip intro"
47msgid "Skip intro"
32msgstr "Gearr leum thairis air an ro-ràdh"
48msgstr "Gearr leum thairis air an ro-ràdh"
33
49
34−#: qml/Components/EdgeDemo.qml:113
50+#: qml/Components/EdgeDemo.qml:112
35msgid "Right edge"
51msgid "Right edge"
36msgstr "An oir dheas"
52msgstr "An oir dheas"
37
53
38−#: qml/Components/EdgeDemo.qml:114
54+#: qml/Components/EdgeDemo.qml:113
39msgid "Try swiping from the right edge to unlock the phone"
55msgid "Try swiping from the right edge to unlock the phone"
40msgstr ""
56msgstr ""
41"Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "
57"Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "
42"far an fhòn"
58"far an fhòn"
43
59
44−#: qml/Components/EdgeDemo.qml:145
60+#: qml/Components/EdgeDemo.qml:144
45msgid "Top edge"
61msgid "Top edge"
46msgstr "An oir aig a' bharr"
62msgstr "An oir aig a' bharr"
47
63
48−#: qml/Components/EdgeDemo.qml:146
64+#: qml/Components/EdgeDemo.qml:145
49msgid "Try swiping from the top edge to access the indicators"
65msgid "Try swiping from the top edge to access the indicators"
50msgstr ""
66msgstr ""
51"Feuch is dèan grad-shlaighdeadh a-steach on oir aig a' bharr gus greim "
67"Feuch is dèan grad-shlaighdeadh a-steach on oir aig a' bharr gus greim "
52"fhaighinn air na taisbeanairean"
68"fhaighinn air na taisbeanairean"
53
69
54−#: qml/Components/EdgeDemo.qml:171
70+#: qml/Components/EdgeDemo.qml:170
55msgid "Close"
71msgid "Close"
56msgstr "Dùin"
72msgstr "Dùin"
57
73
58−#: qml/Components/EdgeDemo.qml:172
74+#: qml/Components/EdgeDemo.qml:171
59msgid "Swipe up again to close the settings screen"
75msgid "Swipe up again to close the settings screen"
60msgstr "Dèan grad-shlaighdeadh a-nìos gus sgrìn nan roghainnean a dhùnadh"
76msgstr "Dèan grad-shlaighdeadh a-nìos gus sgrìn nan roghainnean a dhùnadh"
61
77
62−#: qml/Components/EdgeDemo.qml:199
78+#: qml/Components/EdgeDemo.qml:198
63msgid "Left edge"
79msgid "Left edge"
64msgstr "An oir chlì"
80msgstr "An oir chlì"
65
81
66−#: qml/Components/EdgeDemo.qml:200
82+#: qml/Components/EdgeDemo.qml:199
67msgid "Swipe from the left to reveal the launcher for quick access to apps"
83msgid "Swipe from the left to reveal the launcher for quick access to apps"
68msgstr ""
84msgstr ""
69"Dèan grad-shlaighdeadh on oir chlì air an lòinseir a bheir dhut cothrom "
85"Dèan grad-shlaighdeadh on oir chlì air an lòinseir a bheir dhut cothrom "
70"luath air na h-aplacaidean"
86"luath air na h-aplacaidean"
71
87
72−#: qml/Components/EdgeDemo.qml:227
88+#: qml/Components/EdgeDemo.qml:226
73msgid "Well done"
89msgid "Well done"
74msgstr "Gasta!"
90msgstr "Gasta!"
75
91
76−#: qml/Components/EdgeDemo.qml:228
92+#: qml/Components/EdgeDemo.qml:227
77msgid ""
93msgid ""
78"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 "
79"phone<br><br>Tap on the screen to start"
95"phone<br><br>Tap on the screen to start"
@@ -81,20 +97,20 @@ msgstr ""
81"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
97"Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "
82"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
98"am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"
83
99
84−#: qml/Components/Lockscreen.qml:214
100+#: qml/Components/Lockscreen.qml:220
85msgid "Emergency Call"
101msgid "Emergency Call"
86msgstr "Gairm èiginn"
102msgstr "Gairm èiginn"
87
103
88−#: qml/Components/Lockscreen.qml:231
104+#: qml/Components/Lockscreen.qml:243
89msgid "OK"
105msgid "OK"
90msgstr "Ceart ma-thà"
106msgstr "Ceart ma-thà"
91
107
92−#: qml/Components/PassphraseLockscreen.qml:60
108+#: qml/Components/PassphraseLockscreen.qml:62
93#, qt-format
109#, qt-format
94msgid "Hello %1"
110msgid "Hello %1"
95msgstr "Shin thu, %1"
111msgstr "Shin thu, %1"
96
112
97−#: qml/Components/PassphraseLockscreen.qml:60
113+#: qml/Components/PassphraseLockscreen.qml:62
98msgid "Hello"
114msgid "Hello"
99msgstr "Shin thu"
115msgstr "Shin thu"
100
116
@@ -106,19 +122,11 @@ msgstr "SGUIR DHETH"
106msgid "DONE"
122msgid "DONE"
107msgstr "DÈANTA"
123msgstr "DÈANTA"
108
124
109−#: qml/Components/SeeMore.qml:35
110−msgid "See more"
111−msgstr "Seall barrachd"
112−
113−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
125+#: qml/Dash/GenericScopeView.qml:358
114msgid "See less"
126msgid "See less"
115msgstr "Seall nas lugha"
127msgstr "Seall nas lugha"
116
128
117−#: qml/Dash/DashApps.qml:37
118−msgid "Recent"
119−msgstr "O chionn goirid"
120−
121−#: qml/Dash/GenericScopeView.qml:330
129+#: qml/Dash/GenericScopeView.qml:358
122msgid "See all"
130msgid "See all"
123msgstr "Seall na h-uile"
131msgstr "Seall na h-uile"
124
132
@@ -142,6 +150,26 @@ msgstr "Cuir lèirmheas ris"
142msgid "Send"
150msgid "Send"
143msgstr "Cuir"
151msgstr "Cuir"
144
152
153+#: qml/Dash/ScopesOverview.qml:200
154+msgid "Manage Dash"
155+msgstr "Stiùirich an deas-bhòrd"
156+
157+#: qml/Dash/ScopesOverview.qml:405
158+msgid "Done"
159+msgstr "Deiseil"
160+
161+#: qml/Dash/ScopesOverview.qml:431
162+msgid "Store"
163+msgstr "Am bùth"
164+
165+#: qml/Dash/ScopesOverviewTab.qml:36
166+msgid "Favorites"
167+msgstr "Annsachdan"
168+
169+#: qml/Dash/ScopesOverviewTab.qml:54
170+msgid "All"
171+msgstr "Na h-uile"
172+
145#: qml/Greeter/Greeter.qml:157
173#: qml/Greeter/Greeter.qml:157
146msgid "Swipe to unlock"
174msgid "Swipe to unlock"
147msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"
175msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"
@@ -166,11 +194,11 @@ msgstr "Can rud a-nis..."
166msgid "Speaking..."
194msgid "Speaking..."
167msgstr "A' bruidhinn..."
195msgstr "A' bruidhinn..."
168
196
169−#: qml/Notifications/NotificationMenuItemFactory.qml:91
197+#: qml/Notifications/NotificationMenuItemFactory.qml:100
170msgid "Show password"
198msgid "Show password"
171msgstr "Seall am facal-faire"
199msgstr "Seall am facal-faire"
172
200
173−#: qml/Notifications/NotificationMenuItemFactory.qml:103
201+#: qml/Notifications/NotificationMenuItemFactory.qml:115
174msgid "Please enter SIM PIN"
202msgid "Please enter SIM PIN"
175msgstr "Cuir a-steach SIM PIN"
203msgstr "Cuir a-steach SIM PIN"
176
204
@@ -182,35 +210,43 @@ msgstr "Gnog gus tilleadh dhan ghairm..."
182msgid "Conference"
210msgid "Conference"
183msgstr "Gairm co-labhairt"
211msgstr "Gairm co-labhairt"
184
212
185−#: qml/Panel/Indicators/MenuItemFactory.qml:583
213+#: qml/Panel/Indicators/MenuItemFactory.qml:651
186msgid "In queue…"
214msgid "In queue…"
187msgstr "Air a' chiudha…"
215msgstr "Air a' chiudha…"
188
216
189−#: qml/Panel/Indicators/MenuItemFactory.qml:587
217+#: qml/Panel/Indicators/MenuItemFactory.qml:655
190msgid "Downloading"
218msgid "Downloading"
191msgstr "'Ga luchdadh a-nuas"
219msgstr "'Ga luchdadh a-nuas"
192
220
193−#: qml/Panel/Indicators/MenuItemFactory.qml:589
221+#: qml/Panel/Indicators/MenuItemFactory.qml:657
194msgid "Paused, tap to resume"
222msgid "Paused, tap to resume"
195msgstr "'Na stad, thoir gnogag gus leantainn air"
223msgstr "'Na stad, thoir gnogag gus leantainn air"
196
224
197−#: qml/Panel/Indicators/MenuItemFactory.qml:591
225+#: qml/Panel/Indicators/MenuItemFactory.qml:659
198msgid "Canceled"
226msgid "Canceled"
199msgstr "Air a sgur dheth"
227msgstr "Air a sgur dheth"
200
228
201−#: qml/Panel/Indicators/MenuItemFactory.qml:593
229+#: qml/Panel/Indicators/MenuItemFactory.qml:661
202msgid "Finished"
230msgid "Finished"
203msgstr "Coileanta"
231msgstr "Coileanta"
204
232
205−#: qml/Panel/Indicators/MenuItemFactory.qml:595
233+#: qml/Panel/Indicators/MenuItemFactory.qml:663
206msgid "Failed, tap to retry"
234msgid "Failed, tap to retry"
207msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
235msgstr "Dh'fhàillig leis, thoir gnogag gus feuchainn a-rithist"
208
236
237+#: qml/Panel/Indicators/ModemInfoItem.qml:105
238+msgid "Unlock SIM"
239+msgstr "Thoir a' ghlas far an SIM"
240+
241+#: qml/Panel/Indicators/RoamingIndication.qml:27
242+msgid "Roaming"
243+msgstr "Air fàrsan"
244+
209#: qml/Panel/SearchIndicator.qml:27
245#: qml/Panel/SearchIndicator.qml:27
210msgid "Search"
246msgid "Search"
211msgstr "Lorg"
247msgstr "Lorg"
212
248
213−#: qml/Shell.qml:359
249+#: qml/Shell.qml:256
214#, qt-format
250#, qt-format
215msgid "Please enter %1"
251msgid "Please enter %1"
216msgstr "Cuir a-steach %1"
252msgstr "Cuir a-steach %1"
po/gl.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-25 17:22+0000\n"
11+"PO-Revision-Date: 2014-08-13 09:36+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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-14 07:37+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,49 +26,65 @@ msgstr "Fixar o atallo"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Eliminar o atallo"
27msgstr "Eliminar o atallo"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Está certo de apagar o aparato?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Apagar"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Reiniciar"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Cancelar"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Saltar introdución"
47msgstr "Saltar introdución"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Bordo dereito"
51msgstr "Bordo dereito"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Esvare o dedo desde o bordo dereito para desbloquear o teléfono"
55msgstr "Esvare o dedo desde o bordo dereito para desbloquear o teléfono"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Bordo superior"
59msgstr "Bordo superior"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Esvare o dedo desde o bordo superior para acceder aos indicadores."
63msgstr "Esvare o dedo desde o bordo superior para acceder aos indicadores."
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Pechar"
67msgstr "Pechar"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"
71msgstr "Esvare o dedo de novo cara a arriba para pechar os axustes"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Bordo esquerdo"
75msgstr "Bordo esquerdo"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "
80"Esvare o dedo desde a esquerda para mostrar o iniciador rápido dos "
65"aplicativos"
81"aplicativos"
66
82
67−#: qml/Components/EdgeDemo.qml:227
83+#: qml/Components/EdgeDemo.qml:226
68msgid "Well done"
84msgid "Well done"
69msgstr "Ben feito!"
85msgstr "Ben feito!"
70
86
71−#: qml/Components/EdgeDemo.qml:228
87+#: qml/Components/EdgeDemo.qml:227
72msgid ""
88msgid ""
73"You have now mastered the edge gestures and can start using the "
89"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
90"phone<br><br>Tap on the screen to start"
@@ -76,20 +92,20 @@ msgstr ""
76"Agora xa domina os xestos dos bordos e pode comezar a usar o "
92"Agora xa domina os xestos dos bordos e pode comezar a usar o "
77"teléfono<br><br>Toque na pantalla para comezar"
93"teléfono<br><br>Toque na pantalla para comezar"
78
94
79−#: qml/Components/Lockscreen.qml:214
95+#: qml/Components/Lockscreen.qml:220
80msgid "Emergency Call"
96msgid "Emergency Call"
81msgstr "Chamada de emerxencia"
97msgstr "Chamada de emerxencia"
82
98
83−#: qml/Components/Lockscreen.qml:231
99+#: qml/Components/Lockscreen.qml:243
84msgid "OK"
100msgid "OK"
85msgstr "Aceptar"
101msgstr "Aceptar"
86
102
87−#: qml/Components/PassphraseLockscreen.qml:60
103+#: qml/Components/PassphraseLockscreen.qml:62
88#, qt-format
104#, qt-format
89msgid "Hello %1"
105msgid "Hello %1"
90msgstr "Ola %1"
106msgstr "Ola %1"
91
107
92−#: qml/Components/PassphraseLockscreen.qml:60
108+#: qml/Components/PassphraseLockscreen.qml:62
93msgid "Hello"
109msgid "Hello"
94msgstr "Ola"
110msgstr "Ola"
95
111
@@ -101,19 +117,11 @@ msgstr "CANCELAR"
101msgid "DONE"
117msgid "DONE"
102msgstr "FEITO"
118msgstr "FEITO"
103
119
104−#: qml/Components/SeeMore.qml:35
105−msgid "See more"
106−msgstr "Ver máis"
107−
108−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
109msgid "See less"
121msgid "See less"
110msgstr "Ver menos"
122msgstr "Ver menos"
111
123
112−#: qml/Dash/DashApps.qml:37
113−msgid "Recent"
114−msgstr "Recentes"
115−
116−#: qml/Dash/GenericScopeView.qml:330
124+#: qml/Dash/GenericScopeView.qml:358
117msgid "See all"
125msgid "See all"
118msgstr "Ver todo"
126msgstr "Ver todo"
119
127
@@ -137,6 +145,26 @@ msgstr "Engadir unha opinión"
137msgid "Send"
145msgid "Send"
138msgstr "Enviar"
146msgstr "Enviar"
139
147
148+#: qml/Dash/ScopesOverview.qml:200
149+msgid "Manage Dash"
150+msgstr "Xestionar o Panel"
151+
152+#: qml/Dash/ScopesOverview.qml:405
153+msgid "Done"
154+msgstr "Feito"
155+
156+#: qml/Dash/ScopesOverview.qml:431
157+msgid "Store"
158+msgstr "Tenda"
159+
160+#: qml/Dash/ScopesOverviewTab.qml:36
161+msgid "Favorites"
162+msgstr "Favoritos"
163+
164+#: qml/Dash/ScopesOverviewTab.qml:54
165+msgid "All"
166+msgstr "Todos"
167+
140#: qml/Greeter/Greeter.qml:157
168#: qml/Greeter/Greeter.qml:157
141msgid "Swipe to unlock"
169msgid "Swipe to unlock"
142msgstr "Esvare o dedo para desbloquear"
170msgstr "Esvare o dedo para desbloquear"
@@ -161,11 +189,11 @@ msgstr "Fale agora…"
161msgid "Speaking..."
189msgid "Speaking..."
162msgstr "Falando…"
190msgstr "Falando…"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:91
192+#: qml/Notifications/NotificationMenuItemFactory.qml:100
165msgid "Show password"
193msgid "Show password"
166msgstr "Mostrar contrasinal"
194msgstr "Mostrar contrasinal"
167
195
168−#: qml/Notifications/NotificationMenuItemFactory.qml:103
196+#: qml/Notifications/NotificationMenuItemFactory.qml:115
169msgid "Please enter SIM PIN"
197msgid "Please enter SIM PIN"
170msgstr "Introduza o PIN da SIM"
198msgstr "Introduza o PIN da SIM"
171
199
@@ -177,35 +205,43 @@ msgstr "Toque para volver a chamar..."
177msgid "Conference"
205msgid "Conference"
178msgstr "Conferencia"
206msgstr "Conferencia"
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:583
208+#: qml/Panel/Indicators/MenuItemFactory.qml:651
181msgid "In queue…"
209msgid "In queue…"
182msgstr "Na cola..."
210msgstr "Na cola..."
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:587
212+#: qml/Panel/Indicators/MenuItemFactory.qml:655
185msgid "Downloading"
213msgid "Downloading"
186msgstr "Descargando"
214msgstr "Descargando"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:589
216+#: qml/Panel/Indicators/MenuItemFactory.qml:657
189msgid "Paused, tap to resume"
217msgid "Paused, tap to resume"
190msgstr "Detido, toque para continuar"
218msgstr "Detido, toque para continuar"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:591
220+#: qml/Panel/Indicators/MenuItemFactory.qml:659
193msgid "Canceled"
221msgid "Canceled"
194msgstr "Cancelado"
222msgstr "Cancelado"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:593
224+#: qml/Panel/Indicators/MenuItemFactory.qml:661
197msgid "Finished"
225msgid "Finished"
198msgstr "Rematado"
226msgstr "Rematado"
199
227
200−#: qml/Panel/Indicators/MenuItemFactory.qml:595
228+#: qml/Panel/Indicators/MenuItemFactory.qml:663
201msgid "Failed, tap to retry"
229msgid "Failed, tap to retry"
202msgstr "Fallou, toque para reintentar"
230msgstr "Fallou, toque para reintentar"
203
231
232+#: qml/Panel/Indicators/ModemInfoItem.qml:105
233+msgid "Unlock SIM"
234+msgstr "Desbloquear a SIM"
235+
236+#: qml/Panel/Indicators/RoamingIndication.qml:27
237+msgid "Roaming"
238+msgstr "Itinerancia"
239+
204#: qml/Panel/SearchIndicator.qml:27
240#: qml/Panel/SearchIndicator.qml:27
205msgid "Search"
241msgid "Search"
206msgstr "Buscar"
242msgstr "Buscar"
207
243
208−#: qml/Shell.qml:359
244+#: qml/Shell.qml:256
209#, qt-format
245#, qt-format
210msgid "Please enter %1"
246msgid "Please enter %1"
211msgstr "Introduza %1"
247msgstr "Introduza %1"
po/he.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,47 +26,63 @@ msgstr "הצמדת קיצור דרך"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "הפרדת קיצור הדרך"
27msgstr "הפרדת קיצור הדרך"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "לדלג על הפתיחה"
47msgstr "לדלג על הפתיחה"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "שול ימני"
51msgstr "שול ימני"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "נא לנסות למשוך מהשול הימני כדי לשחרר את נעילת הטלפון"
55msgstr "נא לנסות למשוך מהשול הימני כדי לשחרר את נעילת הטלפון"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "השול העליון"
59msgstr "השול העליון"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "נא לנסות למשוך מהשול העליון כדי לגשת למחוונים"
63msgstr "נא לנסות למשוך מהשול העליון כדי לגשת למחוונים"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "סגירה"
67msgstr "סגירה"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "ניתן למשוך שוב כדי לסגור את מסך ההגדרות"
71msgstr "ניתן למשוך שוב כדי לסגור את מסך ההגדרות"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "שול שמאלי"
75msgstr "שול שמאלי"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "יש למשוך משמאל כדי לחשוף את המשגר לצורך גישה מהירה ליישומים"
79msgstr "יש למשוך משמאל כדי לחשוף את המשגר לצורך גישה מהירה ליישומים"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "כל הכבוד"
83msgstr "כל הכבוד"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
@@ -74,20 +90,20 @@ msgstr ""
74"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
90"ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "
75"לגעת במסך כדי להתחיל"
91"לגעת במסך כדי להתחיל"
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "שיחת חירום"
95msgstr "שיחת חירום"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr "אישור"
99msgstr "אישור"
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "שלום %1"
104msgstr "שלום %1"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "שלום"
108msgstr "שלום"
93
109
@@ -99,19 +115,11 @@ msgstr "ביטול"
99msgid "DONE"
115msgid "DONE"
100msgstr "בוצע"
116msgstr "בוצע"
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr "לראות עוד"
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr "לראות פחות"
120msgstr "לראות פחות"
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr "בשימוש לאחרונה"
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr "להציג הכול"
124msgstr "להציג הכול"
117
125
@@ -135,6 +143,26 @@ msgstr "הוספת סקירה"
135msgid "Send"
143msgid "Send"
136msgstr "שליחה"
144msgstr "שליחה"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr ""
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr ""
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr ""
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr ""
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr ""
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr "יש להחליק לפתיחה"
168msgstr "יש להחליק לפתיחה"
@@ -159,11 +187,11 @@ msgstr "יש לדבר כעת..."
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "הדיבור מושמע…"
188msgstr "הדיבור מושמע…"
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "הצגת הססמה"
192msgstr "הצגת הססמה"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr "נא להזין את קוד ה־<U+200F>SIM"
196msgstr "נא להזין את קוד ה־<U+200F>SIM"
169
197
@@ -175,35 +203,43 @@ msgstr "יש לגעת כדי להחזיר שיחה…"
175msgid "Conference"
203msgid "Conference"
176msgstr "ועידה"
204msgstr "ועידה"
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr "בתור…"
208msgstr "בתור…"
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr "בהורדה"
212msgstr "בהורדה"
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr "מושהה, יש לגעת כדי להמשיך"
216msgstr "מושהה, יש לגעת כדי להמשיך"
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr "בוטל"
220msgstr "בוטל"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr "הושלם"
224msgstr "הושלם"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr "נכשל, יש לגעת כדי לנסות שוב"
228msgstr "נכשל, יש לגעת כדי לנסות שוב"
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr ""
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr ""
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "חיפוש"
240msgstr "חיפוש"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "נא להזין %1"
245msgstr "נא להזין %1"
po/hi.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "परिचय छोड़"
47msgstr "परिचय छोड़"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "दायाँ किनारा"
51msgstr "दायाँ किनारा"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "ऊपर किनारे"
59msgstr "ऊपर किनारे"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "बंद करें"
67msgstr "बंद करें"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "बायाँ किनारा"
75msgstr "बायाँ किनारा"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "शाबाश"
83msgstr "शाबाश"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "आपातकालीन कॉल"
93msgstr "आपातकालीन कॉल"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "नमस्ते"
106msgstr "नमस्ते"
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr "समीक्षा दे"
133msgid "Send"
141msgid "Send"
134msgstr "भेजें"
142msgstr "भेजें"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "अब बात करें"
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "अब बोल रहे हैं"
186msgstr "अब बोल रहे हैं"
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "खोजें"
238msgstr "खोजें"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/hr.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "Recite..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "Govor..."
186msgstr "Govor..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "Pretraživanje"
238msgstr "Pretraživanje"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/hu.po+27−27
@@ -6,17 +6,16 @@
6msgid ""
6msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9−"Report-Msgid-Bugs-To: \n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-05 19:54+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11"PO-Revision-Date: 2014-08-06 07:41+0000\n"
11"PO-Revision-Date: 2014-08-06 07:41+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−"Language: hu\n"
15"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
18−"X-Launchpad-Export-Date: 2014-08-07 06:27+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
19−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
20
19
21#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
22#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -90,8 +89,8 @@ msgid ""
90"You have now mastered the edge gestures and can start using the "
89"You have now mastered the edge gestures and can start using the "
91"phone<br><br>Tap on the screen to start"
90"phone<br><br>Tap on the screen to start"
92msgstr ""
91msgstr ""
93−"Elsajátította a gesztusokat, és megkezdheti a telefon használatát."
92+"Elsajátította a gesztusokat, és megkezdheti a telefon "
94−"<br><br>Koppintson a képernyőre a kezdéshez."
93+"használatát.<br><br>Koppintson a képernyőre a kezdéshez."
95
94
96#: qml/Components/Lockscreen.qml:220
95#: qml/Components/Lockscreen.qml:220
97msgid "Emergency Call"
96msgid "Emergency Call"
@@ -118,15 +117,11 @@ msgstr "MÉGSE"
118msgid "DONE"
117msgid "DONE"
119msgstr "KÉSZ"
118msgstr "KÉSZ"
120
119
121−#: qml/Components/SeeMore.qml:35
122−msgid "See more"
123−msgstr "Több"
124−
125−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:354
120+#: qml/Dash/GenericScopeView.qml:358
126msgid "See less"
121msgid "See less"
127msgstr "Kevesebb"
122msgstr "Kevesebb"
128
123
129−#: qml/Dash/GenericScopeView.qml:354
124+#: qml/Dash/GenericScopeView.qml:358
130msgid "See all"
125msgid "See all"
131msgstr "Összes megtekintése"
126msgstr "Összes megtekintése"
132
127
@@ -150,15 +145,15 @@ msgstr "Értékelés hozzáadása"
150msgid "Send"
145msgid "Send"
151msgstr "Küldés"
146msgstr "Küldés"
152
147
153−#: qml/Dash/ScopesOverview.qml:187
148+#: qml/Dash/ScopesOverview.qml:200
154msgid "Manage Dash"
149msgid "Manage Dash"
155msgstr ""
150msgstr ""
156
151
157−#: qml/Dash/ScopesOverview.qml:392
152+#: qml/Dash/ScopesOverview.qml:405
158msgid "Done"
153msgid "Done"
159msgstr ""
154msgstr ""
160
155
161−#: qml/Dash/ScopesOverview.qml:418
156+#: qml/Dash/ScopesOverview.qml:431
162msgid "Store"
157msgid "Store"
163msgstr ""
158msgstr ""
164
159
@@ -194,11 +189,11 @@ msgstr "Most beszéljen…"
194msgid "Speaking..."
189msgid "Speaking..."
195msgstr "Beszéd…"
190msgstr "Beszéd…"
196
191
197−#: qml/Notifications/NotificationMenuItemFactory.qml:97
192+#: qml/Notifications/NotificationMenuItemFactory.qml:100
198msgid "Show password"
193msgid "Show password"
199msgstr "Jelszó megjelenítése"
194msgstr "Jelszó megjelenítése"
200
195
201−#: qml/Notifications/NotificationMenuItemFactory.qml:112
196+#: qml/Notifications/NotificationMenuItemFactory.qml:115
202msgid "Please enter SIM PIN"
197msgid "Please enter SIM PIN"
203msgstr "Adja meg a SIM PIN kódját"
198msgstr "Adja meg a SIM PIN kódját"
204
199
@@ -210,30 +205,38 @@ msgstr "Érintse meg, hogy visszatérjen a híváshoz..."
210msgid "Conference"
205msgid "Conference"
211msgstr "Konferencia"
206msgstr "Konferencia"
212
207
213−#: qml/Panel/Indicators/MenuItemFactory.qml:577
208+#: qml/Panel/Indicators/MenuItemFactory.qml:651
214msgid "In queue…"
209msgid "In queue…"
215msgstr "Sorban…"
210msgstr "Sorban…"
216
211
217−#: qml/Panel/Indicators/MenuItemFactory.qml:581
212+#: qml/Panel/Indicators/MenuItemFactory.qml:655
218msgid "Downloading"
213msgid "Downloading"
219msgstr "Letöltés"
214msgstr "Letöltés"
220
215
221−#: qml/Panel/Indicators/MenuItemFactory.qml:583
216+#: qml/Panel/Indicators/MenuItemFactory.qml:657
222msgid "Paused, tap to resume"
217msgid "Paused, tap to resume"
223msgstr "Szüneteltetve, koppintson a folytatáshoz"
218msgstr "Szüneteltetve, koppintson a folytatáshoz"
224
219
225−#: qml/Panel/Indicators/MenuItemFactory.qml:585
220+#: qml/Panel/Indicators/MenuItemFactory.qml:659
226msgid "Canceled"
221msgid "Canceled"
227msgstr "Megszakítva"
222msgstr "Megszakítva"
228
223
229−#: qml/Panel/Indicators/MenuItemFactory.qml:587
224+#: qml/Panel/Indicators/MenuItemFactory.qml:661
230msgid "Finished"
225msgid "Finished"
231msgstr "Befejeződött"
226msgstr "Befejeződött"
232
227
233−#: qml/Panel/Indicators/MenuItemFactory.qml:589
228+#: qml/Panel/Indicators/MenuItemFactory.qml:663
234msgid "Failed, tap to retry"
229msgid "Failed, tap to retry"
235msgstr "Sikertelen, koppintson az újrapróbáláshoz"
230msgstr "Sikertelen, koppintson az újrapróbáláshoz"
236
231
232+#: qml/Panel/Indicators/ModemInfoItem.qml:105
233+msgid "Unlock SIM"
234+msgstr ""
235+
236+#: qml/Panel/Indicators/RoamingIndication.qml:27
237+msgid "Roaming"
238+msgstr ""
239+
237#: qml/Panel/SearchIndicator.qml:27
240#: qml/Panel/SearchIndicator.qml:27
238msgid "Search"
241msgid "Search"
239msgstr "Keresés"
242msgstr "Keresés"
@@ -242,6 +245,3 @@ msgstr "Keresés"
242#, qt-format
245#, qt-format
243msgid "Please enter %1"
246msgid "Please enter %1"
244msgstr "Adja meg a következőt: %1"
247msgstr "Adja meg a következőt: %1"
245−
246−#~ msgid "Recent"
247−#~ msgstr "Legutóbbi"
po/hy.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "Խոսի՛ր"
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "Խոսում եմ..."
186msgstr "Խոսում եմ..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "Որոնում"
238msgstr "Որոնում"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/id.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr ""
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr ""
186msgstr ""
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr ""
238msgstr ""
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/is.po+72−36
@@ -9,15 +9,15 @@ 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-07-11 14:59+0200\n"
12+"POT-Creation-Date: 2014-08-08 11:17+0200\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-01 07:14+0000\n"
19+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
20−"X-Generator: Launchpad (build 17141)\n"
20+"X-Generator: Launchpad (build 17156)\n"
21"Language: is\n"
21"Language: is\n"
22
22
23#: plugins/Unity/Launcher/launcheritem.cpp:43
23#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -29,48 +29,64 @@ msgstr "Pinna flýtilykil"
29msgid "Unpin shortcut"
29msgid "Unpin shortcut"
30msgstr "Losa flýtilykil"
30msgstr "Losa flýtilykil"
31
31
32+#: qml/Components/Dialogs.qml:142
33+msgid "Are you sure you would like to turn power off?"
34+msgstr ""
35+
36+#: qml/Components/Dialogs.qml:144
37+msgid "Power off"
38+msgstr ""
39+
40+#: qml/Components/Dialogs.qml:153
41+msgid "Restart"
42+msgstr ""
43+
44+#: qml/Components/Dialogs.qml:162
45+msgid "Cancel"
46+msgstr ""
47+
32#: qml/Components/EdgeDemoOverlay.qml:151
48#: qml/Components/EdgeDemoOverlay.qml:151
33msgid "Skip intro"
49msgid "Skip intro"
34msgstr "Hoppa yfir kynningu"
50msgstr "Hoppa yfir kynningu"
35
51
36−#: qml/Components/EdgeDemo.qml:113
52+#: qml/Components/EdgeDemo.qml:112
37msgid "Right edge"
53msgid "Right edge"
38msgstr "Hægri brún"
54msgstr "Hægri brún"
39
55
40−#: qml/Components/EdgeDemo.qml:114
56+#: qml/Components/EdgeDemo.qml:113
41msgid "Try swiping from the right edge to unlock the phone"
57msgid "Try swiping from the right edge to unlock the phone"
42msgstr ""
58msgstr ""
43"Prófaðu að strjúka fingrinum frá hægri brúninni til að aflæsa símanum þínum."
59"Prófaðu að strjúka fingrinum frá hægri brúninni til að aflæsa símanum þínum."
44
60
45−#: qml/Components/EdgeDemo.qml:145
61+#: qml/Components/EdgeDemo.qml:144
46msgid "Top edge"
62msgid "Top edge"
47msgstr "Efri brún"
63msgstr "Efri brún"
48
64
49−#: qml/Components/EdgeDemo.qml:146
65+#: qml/Components/EdgeDemo.qml:145
50msgid "Try swiping from the top edge to access the indicators"
66msgid "Try swiping from the top edge to access the indicators"
51msgstr "Reyndu að strjúka frá toppi til að fá aðgang að tilkynningum"
67msgstr "Reyndu að strjúka frá toppi til að fá aðgang að tilkynningum"
52
68
53−#: qml/Components/EdgeDemo.qml:171
69+#: qml/Components/EdgeDemo.qml:170
54msgid "Close"
70msgid "Close"
55msgstr "Loka"
71msgstr "Loka"
56
72
57−#: qml/Components/EdgeDemo.qml:172
73+#: qml/Components/EdgeDemo.qml:171
58msgid "Swipe up again to close the settings screen"
74msgid "Swipe up again to close the settings screen"
59msgstr "Strjúktu upp til að loka stillingum"
75msgstr "Strjúktu upp til að loka stillingum"
60
76
61−#: qml/Components/EdgeDemo.qml:199
77+#: qml/Components/EdgeDemo.qml:198
62msgid "Left edge"
78msgid "Left edge"
63msgstr "Vinstri brún"
79msgstr "Vinstri brún"
64
80
65−#: qml/Components/EdgeDemo.qml:200
81+#: qml/Components/EdgeDemo.qml:199
66msgid "Swipe from the left to reveal the launcher for quick access to apps"
82msgid "Swipe from the left to reveal the launcher for quick access to apps"
67msgstr "Strjúktu frá vinstri til að afhjúpa flýtiræsi forrita"
83msgstr "Strjúktu frá vinstri til að afhjúpa flýtiræsi forrita"
68
84
69−#: qml/Components/EdgeDemo.qml:227
85+#: qml/Components/EdgeDemo.qml:226
70msgid "Well done"
86msgid "Well done"
71msgstr "Vel gert"
87msgstr "Vel gert"
72
88
73−#: qml/Components/EdgeDemo.qml:228
89+#: qml/Components/EdgeDemo.qml:227
74msgid ""
90msgid ""
75"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 "
76"phone<br><br>Tap on the screen to start"
92"phone<br><br>Tap on the screen to start"
@@ -78,20 +94,20 @@ msgstr ""
78"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
94"Þú ert núna með æfingu í að nota skjáhreyfingar og getur því farið að nota "
79"símann<br><br>Sláðu létt á skjáinn til að byrja"
95"símann<br><br>Sláðu létt á skjáinn til að byrja"
80
96
81−#: qml/Components/Lockscreen.qml:214
97+#: qml/Components/Lockscreen.qml:220
82msgid "Emergency Call"
98msgid "Emergency Call"
83msgstr "Neyðarsímtal"
99msgstr "Neyðarsímtal"
84
100
85−#: qml/Components/Lockscreen.qml:231
101+#: qml/Components/Lockscreen.qml:243
86msgid "OK"
102msgid "OK"
87msgstr "Í lagi"
103msgstr "Í lagi"
88
104
89−#: qml/Components/PassphraseLockscreen.qml:60
105+#: qml/Components/PassphraseLockscreen.qml:62
90#, qt-format
106#, qt-format
91msgid "Hello %1"
107msgid "Hello %1"
92msgstr "Hæ %1"
108msgstr "Hæ %1"
93
109
94−#: qml/Components/PassphraseLockscreen.qml:60
110+#: qml/Components/PassphraseLockscreen.qml:62
95msgid "Hello"
111msgid "Hello"
96msgstr "Hæ"
112msgstr "Hæ"
97
113
@@ -103,19 +119,11 @@ msgstr "HÆTTA VIÐ"
103msgid "DONE"
119msgid "DONE"
104msgstr "BÚIÐ"
120msgstr "BÚIÐ"
105
121
106−#: qml/Components/SeeMore.qml:35
107−msgid "See more"
108−msgstr "Sjá meira"
109−
110−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
111msgid "See less"
123msgid "See less"
112msgstr "Sjá minna"
124msgstr "Sjá minna"
113
125
114−#: qml/Dash/DashApps.qml:37
115−msgid "Recent"
116−msgstr "Nýlegt"
117−
118−#: qml/Dash/GenericScopeView.qml:330
126+#: qml/Dash/GenericScopeView.qml:358
119msgid "See all"
127msgid "See all"
120msgstr "Sjá allt"
128msgstr "Sjá allt"
121
129
@@ -139,6 +147,26 @@ msgstr "Gefa umsögn"
139msgid "Send"
147msgid "Send"
140msgstr "Senda"
148msgstr "Senda"
141
149
150+#: qml/Dash/ScopesOverview.qml:200
151+msgid "Manage Dash"
152+msgstr ""
153+
154+#: qml/Dash/ScopesOverview.qml:405
155+msgid "Done"
156+msgstr ""
157+
158+#: qml/Dash/ScopesOverview.qml:431
159+msgid "Store"
160+msgstr ""
161+
162+#: qml/Dash/ScopesOverviewTab.qml:36
163+msgid "Favorites"
164+msgstr ""
165+
166+#: qml/Dash/ScopesOverviewTab.qml:54
167+msgid "All"
168+msgstr ""
169+
142#: qml/Greeter/Greeter.qml:157
170#: qml/Greeter/Greeter.qml:157
143msgid "Swipe to unlock"
171msgid "Swipe to unlock"
144msgstr "Strjúka til að aflæsa"
172msgstr "Strjúka til að aflæsa"
@@ -163,11 +191,11 @@ msgstr "Tala núna..."
163msgid "Speaking..."
191msgid "Speaking..."
164msgstr "Tala..."
192msgstr "Tala..."
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:91
194+#: qml/Notifications/NotificationMenuItemFactory.qml:100
167msgid "Show password"
195msgid "Show password"
168msgstr "Birta lykilorð"
196msgstr "Birta lykilorð"
169
197
170−#: qml/Notifications/NotificationMenuItemFactory.qml:103
198+#: qml/Notifications/NotificationMenuItemFactory.qml:115
171msgid "Please enter SIM PIN"
199msgid "Please enter SIM PIN"
172msgstr "Settu inn PIN fyrir SIM"
200msgstr "Settu inn PIN fyrir SIM"
173
201
@@ -179,35 +207,43 @@ msgstr "Slá til að svara símtali..."
179msgid "Conference"
207msgid "Conference"
180msgstr "Ráðstefna"
208msgstr "Ráðstefna"
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:583
210+#: qml/Panel/Indicators/MenuItemFactory.qml:651
183msgid "In queue…"
211msgid "In queue…"
184msgstr "Í biðröð..."
212msgstr "Í biðröð..."
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:587
214+#: qml/Panel/Indicators/MenuItemFactory.qml:655
187msgid "Downloading"
215msgid "Downloading"
188msgstr "Sæki"
216msgstr "Sæki"
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:589
218+#: qml/Panel/Indicators/MenuItemFactory.qml:657
191msgid "Paused, tap to resume"
219msgid "Paused, tap to resume"
192msgstr "Í bið, sláðu létt til að halda áfram"
220msgstr "Í bið, sláðu létt til að halda áfram"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:591
222+#: qml/Panel/Indicators/MenuItemFactory.qml:659
195msgid "Canceled"
223msgid "Canceled"
196msgstr "Hætt við"
224msgstr "Hætt við"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:593
226+#: qml/Panel/Indicators/MenuItemFactory.qml:661
199msgid "Finished"
227msgid "Finished"
200msgstr "Lokið"
228msgstr "Lokið"
201
229
202−#: qml/Panel/Indicators/MenuItemFactory.qml:595
230+#: qml/Panel/Indicators/MenuItemFactory.qml:663
203msgid "Failed, tap to retry"
231msgid "Failed, tap to retry"
204msgstr "Mistókst, sláðu létt til að reyna aftur"
232msgstr "Mistókst, sláðu létt til að reyna aftur"
205
233
234+#: qml/Panel/Indicators/ModemInfoItem.qml:105
235+msgid "Unlock SIM"
236+msgstr ""
237+
238+#: qml/Panel/Indicators/RoamingIndication.qml:27
239+msgid "Roaming"
240+msgstr ""
241+
206#: qml/Panel/SearchIndicator.qml:27
242#: qml/Panel/SearchIndicator.qml:27
207msgid "Search"
243msgid "Search"
208msgstr "Leita"
244msgstr "Leita"
209
245
210−#: qml/Shell.qml:359
246+#: qml/Shell.qml:256
211#, qt-format
247#, qt-format
212msgid "Please enter %1"
248msgid "Please enter %1"
213msgstr "Settu inn %1"
249msgstr "Settu inn %1"
po/it.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-25 16:09+0000\n"
11+"PO-Revision-Date: 2014-08-13 11:45+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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-14 07:37+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,52 +26,68 @@ msgstr "Blocca scorciatoia"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Sblocca scorciatoia"
27msgstr "Sblocca scorciatoia"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Spegnere veramente il dispositivo?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Spegni"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Riavvia"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Annulla"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Salta introduzione"
47msgstr "Salta introduzione"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Bordo destro"
51msgstr "Bordo destro"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Provare a far scorrere dal bordo destro per sbloccare il telefono"
55msgstr "Provare a far scorrere dal bordo destro per sbloccare il telefono"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Bordo superiore"
59msgstr "Bordo superiore"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48"Provare a far scorrere dal bordo in alto per accedere agli indicatori"
64"Provare a far scorrere dal bordo in alto per accedere agli indicatori"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "Chiudi"
68msgstr "Chiudi"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr ""
72msgstr ""
57"Far scorrere verso l'alto nuovamente per chiudere la schermata delle "
73"Far scorrere verso l'alto nuovamente per chiudere la schermata delle "
58"impostazioni"
74"impostazioni"
59
75
60−#: qml/Components/EdgeDemo.qml:199
76+#: qml/Components/EdgeDemo.qml:198
61msgid "Left edge"
77msgid "Left edge"
62msgstr "Bordo sinistro"
78msgstr "Bordo sinistro"
63
79
64−#: qml/Components/EdgeDemo.qml:200
80+#: qml/Components/EdgeDemo.qml:199
65msgid "Swipe from the left to reveal the launcher for quick access to apps"
81msgid "Swipe from the left to reveal the launcher for quick access to apps"
66msgstr ""
82msgstr ""
67"Far scorrere il bordo sinistro per mostrare il Launcher e avere un rapido "
83"Far scorrere il bordo sinistro per mostrare il Launcher e avere un rapido "
68"accesso alle applicazioni"
84"accesso alle applicazioni"
69
85
70−#: qml/Components/EdgeDemo.qml:227
86+#: qml/Components/EdgeDemo.qml:226
71msgid "Well done"
87msgid "Well done"
72msgstr "Ben fatto"
88msgstr "Ben fatto"
73
89
74−#: qml/Components/EdgeDemo.qml:228
90+#: qml/Components/EdgeDemo.qml:227
75msgid ""
91msgid ""
76"You have now mastered the edge gestures and can start using the "
92"You have now mastered the edge gestures and can start using the "
77"phone<br><br>Tap on the screen to start"
93"phone<br><br>Tap on the screen to start"
@@ -79,20 +95,20 @@ msgstr ""
79"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
95"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
80"usare il telefono.<br><br>Toccare lo schermo per iniziare"
96"usare il telefono.<br><br>Toccare lo schermo per iniziare"
81
97
82−#: qml/Components/Lockscreen.qml:214
98+#: qml/Components/Lockscreen.qml:220
83msgid "Emergency Call"
99msgid "Emergency Call"
84msgstr "Chiamata di emergenza"
100msgstr "Chiamata di emergenza"
85
101
86−#: qml/Components/Lockscreen.qml:231
102+#: qml/Components/Lockscreen.qml:243
87msgid "OK"
103msgid "OK"
88msgstr "OK"
104msgstr "OK"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91#, qt-format
107#, qt-format
92msgid "Hello %1"
108msgid "Hello %1"
93msgstr "Ciao %1"
109msgstr "Ciao %1"
94
110
95−#: qml/Components/PassphraseLockscreen.qml:60
111+#: qml/Components/PassphraseLockscreen.qml:62
96msgid "Hello"
112msgid "Hello"
97msgstr "Ciao"
113msgstr "Ciao"
98
114
@@ -104,19 +120,11 @@ msgstr "Annulla"
104msgid "DONE"
120msgid "DONE"
105msgstr "Fatto"
121msgstr "Fatto"
106
122
107−#: qml/Components/SeeMore.qml:35
108−msgid "See more"
109−msgstr "Mostra di più"
110−
111−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
112msgid "See less"
124msgid "See less"
113msgstr "Mostra meno"
125msgstr "Mostra meno"
114
126
115−#: qml/Dash/DashApps.qml:37
116−msgid "Recent"
117−msgstr "Recenti"
118−
119−#: qml/Dash/GenericScopeView.qml:330
127+#: qml/Dash/GenericScopeView.qml:358
120msgid "See all"
128msgid "See all"
121msgstr "Mostra tutto"
129msgstr "Mostra tutto"
122
130
@@ -140,6 +148,26 @@ msgstr "Aggiungi una recensione"
140msgid "Send"
148msgid "Send"
141msgstr "Invia"
149msgstr "Invia"
142
150
151+#: qml/Dash/ScopesOverview.qml:200
152+msgid "Manage Dash"
153+msgstr "Gestione della Dash"
154+
155+#: qml/Dash/ScopesOverview.qml:405
156+msgid "Done"
157+msgstr "Fatto"
158+
159+#: qml/Dash/ScopesOverview.qml:431
160+msgid "Store"
161+msgstr "Store"
162+
163+#: qml/Dash/ScopesOverviewTab.qml:36
164+msgid "Favorites"
165+msgstr "Preferiti"
166+
167+#: qml/Dash/ScopesOverviewTab.qml:54
168+msgid "All"
169+msgstr "Tutto"
170+
143#: qml/Greeter/Greeter.qml:157
171#: qml/Greeter/Greeter.qml:157
144msgid "Swipe to unlock"
172msgid "Swipe to unlock"
145msgstr "Scorrere per sbloccare"
173msgstr "Scorrere per sbloccare"
@@ -164,11 +192,11 @@ msgstr "Parla ora..."
164msgid "Speaking..."
192msgid "Speaking..."
165msgstr "Sto parlando..."
193msgstr "Sto parlando..."
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:91
195+#: qml/Notifications/NotificationMenuItemFactory.qml:100
168msgid "Show password"
196msgid "Show password"
169msgstr "Mostra password"
197msgstr "Mostra password"
170
198
171−#: qml/Notifications/NotificationMenuItemFactory.qml:103
199+#: qml/Notifications/NotificationMenuItemFactory.qml:115
172msgid "Please enter SIM PIN"
200msgid "Please enter SIM PIN"
173msgstr "Inserire il codice PIN"
201msgstr "Inserire il codice PIN"
174
202
@@ -180,35 +208,43 @@ msgstr "Tocca per tornare alla chiamata..."
180msgid "Conference"
208msgid "Conference"
181msgstr "Conferenza"
209msgstr "Conferenza"
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:583
211+#: qml/Panel/Indicators/MenuItemFactory.qml:651
184msgid "In queue…"
212msgid "In queue…"
185msgstr "In coda..."
213msgstr "In coda..."
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:587
215+#: qml/Panel/Indicators/MenuItemFactory.qml:655
188msgid "Downloading"
216msgid "Downloading"
189msgstr "Scaricamento in corso"
217msgstr "Scaricamento in corso"
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:589
219+#: qml/Panel/Indicators/MenuItemFactory.qml:657
192msgid "Paused, tap to resume"
220msgid "Paused, tap to resume"
193msgstr "In pausa. Tocca per riprendere"
221msgstr "In pausa. Tocca per riprendere"
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:591
223+#: qml/Panel/Indicators/MenuItemFactory.qml:659
196msgid "Canceled"
224msgid "Canceled"
197msgstr "Annullato"
225msgstr "Annullato"
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:593
227+#: qml/Panel/Indicators/MenuItemFactory.qml:661
200msgid "Finished"
228msgid "Finished"
201msgstr "Completato"
229msgstr "Completato"
202
230
203−#: qml/Panel/Indicators/MenuItemFactory.qml:595
231+#: qml/Panel/Indicators/MenuItemFactory.qml:663
204msgid "Failed, tap to retry"
232msgid "Failed, tap to retry"
205msgstr "Non riuscito. Tocca per riprovare"
233msgstr "Non riuscito. Tocca per riprovare"
206
234
235+#: qml/Panel/Indicators/ModemInfoItem.qml:105
236+msgid "Unlock SIM"
237+msgstr "Sblocca SIM"
238+
239+#: qml/Panel/Indicators/RoamingIndication.qml:27
240+msgid "Roaming"
241+msgstr "Roaming"
242+
207#: qml/Panel/SearchIndicator.qml:27
243#: qml/Panel/SearchIndicator.qml:27
208msgid "Search"
244msgid "Search"
209msgstr "Cerca"
245msgstr "Cerca"
210
246
211−#: qml/Shell.qml:359
247+#: qml/Shell.qml:256
212#, qt-format
248#, qt-format
213msgid "Please enter %1"
249msgid "Please enter %1"
214msgstr "Inserire %1"
250msgstr "Inserire %1"
po/ja.po+76−40
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-08-06 15:19+0000\n"
11+"PO-Revision-Date: 2014-08-12 07:14+0000\n"
12"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\n"
12"Last-Translator: Shushi Kurose <md81bird@hitaki.net>\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-07 06:27+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "導入ガイドをスキップ"
47msgstr "導入ガイドをスキップ"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "右端"
51msgstr "右端"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "上端"
59msgstr "上端"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "インジケーターにアクセスするには上端からスワイプしてみてください"
63msgstr "インジケーターにアクセスするには上端からスワイプしてみてください"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "閉じる"
67msgstr "閉じる"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "設定画面を閉じるにはもう一度上にスワイプしてください"
71msgstr "設定画面を閉じるにはもう一度上にスワイプしてください"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "左端"
75msgstr "左端"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "アプリに素早くアクセスできるLauncherを表示するには左からスワイプしてください"
79msgstr "アプリに素早くアクセスできるLauncherを表示するには左からスワイプしてください"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "よくできました！"
83msgstr "よくできました！"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "緊急通報"
93msgstr "緊急通報"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81−msgstr ""
97+msgstr "OK"
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "こんにちは %1 さん"
102msgstr "こんにちは %1 さん"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "こんにちは"
106msgstr "こんにちは"
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr "レビューを追加"
133msgid "Send"
141msgid "Send"
134msgstr "送信"
142msgstr "送信"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr "すべて"
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -155,13 +183,13 @@ msgstr "音声入力を開始..."
155
183
156#: qml/Hud/Hud.qml:94
184#: qml/Hud/Hud.qml:94
157msgid "Speaking..."
185msgid "Speaking..."
158−msgstr ""
186+msgstr "入力中..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "パスワードを表示"
190msgstr "パスワードを表示"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "検索"
238msgstr "検索"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207−msgstr ""
243+msgstr "%1を入力してください"
po/km.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-02 06:39+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-14 07:38+0000\n"
18−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,49 +26,65 @@ msgstr "ភ្ជាប់​ផ្លូវកាត់"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "មិន​ភ្ជាប់ផ្លូវកាត់"
27msgstr "មិន​ភ្ជាប់ផ្លូវកាត់"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "តើ​អ្នក​ពិតជា​ចង់​បិទ​មែន​ឬ?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "បិទ"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "ចាប់ផ្ដើម​ឡើងវិញ"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "បោះបង់"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "រំលង​ការ​ណែនាំ"
47msgstr "រំលង​ការ​ណែនាំ"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "គែម​ស្ដាំ"
51msgstr "គែម​ស្ដាំ"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "សាកល្បង​​អូស​ពី​គែម​ស្ដាំ​ ដើម្បី​ដោះ​សោ​ទូរស័ព្ទ"
55msgstr "សាកល្បង​​អូស​ពី​គែម​ស្ដាំ​ ដើម្បី​ដោះ​សោ​ទូរស័ព្ទ"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "គែម​ខាង​លើ"
59msgstr "គែម​ខាង​លើ"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "សាកល្បង​អូស​ពី​គែម​ខាង​លើ ដើម្បី​ចូល​ដំណើរការ​សញ្ញា"
63msgstr "សាកល្បង​អូស​ពី​គែម​ខាង​លើ ដើម្បី​ចូល​ដំណើរការ​សញ្ញា"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "បិទ"
67msgstr "បិទ"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "អូស​ឡើង​លើ​ម្ដងទៀត ដើម្បី​បិទ​ការ​កំណត់​អេក្រង់"
71msgstr "អូស​ឡើង​លើ​ម្ដងទៀត ដើម្បី​បិទ​ការ​កំណត់​អេក្រង់"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "គែមឆ្វេង"
75msgstr "គែមឆ្វេង"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"អូស​ពី​គែម​ឆ្វេង "
80"អូស​ពី​គែម​ឆ្វេង "
65"ដើម្បី​បង្ហាញ​កម្មវិធី​ចាប់ផ្ដើម​សម្រាប់​ចូល​ដំណើរ​ការ​កម្មវិធី​រហ័ស"
81"ដើម្បី​បង្ហាញ​កម្មវិធី​ចាប់ផ្ដើម​សម្រាប់​ចូល​ដំណើរ​ការ​កម្មវិធី​រហ័ស"
66
82
67−#: qml/Components/EdgeDemo.qml:227
83+#: qml/Components/EdgeDemo.qml:226
68msgid "Well done"
84msgid "Well done"
69msgstr "ធ្វើ​បាន​ល្អ"
85msgstr "ធ្វើ​បាន​ល្អ"
70
86
71−#: qml/Components/EdgeDemo.qml:228
87+#: qml/Components/EdgeDemo.qml:227
72msgid ""
88msgid ""
73"You have now mastered the edge gestures and can start using the "
89"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
90"phone<br><br>Tap on the screen to start"
@@ -76,20 +92,20 @@ msgstr ""
76"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "
92"ឥឡូវ​អ្នក​បាន​ពិនិត្យ​កាយវិការ​គែម​ "
77"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"
93"និង​អាច​ចាប់ផ្ដើម​ប្រើ​ទូរស័ព្ទ<br><br>ប៉ះ លើ​អេក្រង់​ដើម្បី​ចាប់ផ្ដើម"
78
94
79−#: qml/Components/Lockscreen.qml:214
95+#: qml/Components/Lockscreen.qml:220
80msgid "Emergency Call"
96msgid "Emergency Call"
81msgstr "ការ​ហៅ​ពេល​អាសន្ន"
97msgstr "ការ​ហៅ​ពេល​អាសន្ន"
82
98
83−#: qml/Components/Lockscreen.qml:231
99+#: qml/Components/Lockscreen.qml:243
84msgid "OK"
100msgid "OK"
85msgstr "យល់ព្រម"
101msgstr "យល់ព្រម"
86
102
87−#: qml/Components/PassphraseLockscreen.qml:60
103+#: qml/Components/PassphraseLockscreen.qml:62
88#, qt-format
104#, qt-format
89msgid "Hello %1"
105msgid "Hello %1"
90msgstr "សួស្ដី %1"
106msgstr "សួស្ដី %1"
91
107
92−#: qml/Components/PassphraseLockscreen.qml:60
108+#: qml/Components/PassphraseLockscreen.qml:62
93msgid "Hello"
109msgid "Hello"
94msgstr "សួស្តី"
110msgstr "សួស្តី"
95
111
@@ -101,19 +117,11 @@ msgstr "បោះបង់"
101msgid "DONE"
117msgid "DONE"
102msgstr "រួចរាល់"
118msgstr "រួចរាល់"
103
119
104−#: qml/Components/SeeMore.qml:35
105−msgid "See more"
106−msgstr "មើល​ច្រើន​ទៀត"
107−
108−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
109msgid "See less"
121msgid "See less"
110msgstr "មើល​តិច​ជាង"
122msgstr "មើល​តិច​ជាង"
111
123
112−#: qml/Dash/DashApps.qml:37
113−msgid "Recent"
114−msgstr "បច្ចុប្បន្ន"
115−
116−#: qml/Dash/GenericScopeView.qml:330
124+#: qml/Dash/GenericScopeView.qml:358
117msgid "See all"
125msgid "See all"
118msgstr "មើល​ទាំងអស់"
126msgstr "មើល​ទាំងអស់"
119
127
@@ -137,6 +145,26 @@ msgstr "បន្ថែម​ការ​ពិនិត្យ"
137msgid "Send"
145msgid "Send"
138msgstr "ផ្ញើ"
146msgstr "ផ្ញើ"
139
147
148+#: qml/Dash/ScopesOverview.qml:200
149+msgid "Manage Dash"
150+msgstr "គ្រប់គ្រង​ផ្ទាំង"
151+
152+#: qml/Dash/ScopesOverview.qml:405
153+msgid "Done"
154+msgstr "ធ្វើរួច"
155+
156+#: qml/Dash/ScopesOverview.qml:431
157+msgid "Store"
158+msgstr "រក្សាទុក"
159+
160+#: qml/Dash/ScopesOverviewTab.qml:36
161+msgid "Favorites"
162+msgstr "និយម"
163+
164+#: qml/Dash/ScopesOverviewTab.qml:54
165+msgid "All"
166+msgstr "ទាំងអស់"
167+
140#: qml/Greeter/Greeter.qml:157
168#: qml/Greeter/Greeter.qml:157
141msgid "Swipe to unlock"
169msgid "Swipe to unlock"
142msgstr "អូស​ដើម្បី​ដោះសោ"
170msgstr "អូស​ដើម្បី​ដោះសោ"
@@ -161,11 +189,11 @@ msgstr "និយាយ​ឥឡូវ..."
161msgid "Speaking..."
189msgid "Speaking..."
162msgstr "កំពុង​និយាយ..."
190msgstr "កំពុង​និយាយ..."
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:91
192+#: qml/Notifications/NotificationMenuItemFactory.qml:100
165msgid "Show password"
193msgid "Show password"
166msgstr "បង្ហាញ​ពាក្យ​សម្ងាត់"
194msgstr "បង្ហាញ​ពាក្យ​សម្ងាត់"
167
195
168−#: qml/Notifications/NotificationMenuItemFactory.qml:103
196+#: qml/Notifications/NotificationMenuItemFactory.qml:115
169msgid "Please enter SIM PIN"
197msgid "Please enter SIM PIN"
170msgstr "បញ្ចូល​កូដ PIN របស់​ស៊ីមកាត"
198msgstr "បញ្ចូល​កូដ PIN របស់​ស៊ីមកាត"
171
199
@@ -177,35 +205,43 @@ msgstr "ប៉ះ​ដើម្បី​ត្រឡប់​ទៅ​ការ
177msgid "Conference"
205msgid "Conference"
178msgstr "សន្និសីទ"
206msgstr "សន្និសីទ"
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:583
208+#: qml/Panel/Indicators/MenuItemFactory.qml:651
181msgid "In queue…"
209msgid "In queue…"
182msgstr "ក្នុងជួរ…"
210msgstr "ក្នុងជួរ…"
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:587
212+#: qml/Panel/Indicators/MenuItemFactory.qml:655
185msgid "Downloading"
213msgid "Downloading"
186msgstr "ទាញយក"
214msgstr "ទាញយក"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:589
216+#: qml/Panel/Indicators/MenuItemFactory.qml:657
189msgid "Paused, tap to resume"
217msgid "Paused, tap to resume"
190msgstr "បាន​ផ្អាក, ប៉ះ ដើម្បីបន្ត"
218msgstr "បាន​ផ្អាក, ប៉ះ ដើម្បីបន្ត"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:591
220+#: qml/Panel/Indicators/MenuItemFactory.qml:659
193msgid "Canceled"
221msgid "Canceled"
194msgstr "បាន​បោះបង់"
222msgstr "បាន​បោះបង់"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:593
224+#: qml/Panel/Indicators/MenuItemFactory.qml:661
197msgid "Finished"
225msgid "Finished"
198msgstr "បាន​បញ្ចប់"
226msgstr "បាន​បញ្ចប់"
199
227
200−#: qml/Panel/Indicators/MenuItemFactory.qml:595
228+#: qml/Panel/Indicators/MenuItemFactory.qml:663
201msgid "Failed, tap to retry"
229msgid "Failed, tap to retry"
202msgstr "បាន​បរាជ័យ ប៉ះ​ ដើម្បី​ព្យាយាម​ម្ដង​ទៀត"
230msgstr "បាន​បរាជ័យ ប៉ះ​ ដើម្បី​ព្យាយាម​ម្ដង​ទៀត"
203
231
232+#: qml/Panel/Indicators/ModemInfoItem.qml:105
233+msgid "Unlock SIM"
234+msgstr "ដោះ​សោ​ស៊ីម"
235+
236+#: qml/Panel/Indicators/RoamingIndication.qml:27
237+msgid "Roaming"
238+msgstr "រ៉ូមីង"
239+
204#: qml/Panel/SearchIndicator.qml:27
240#: qml/Panel/SearchIndicator.qml:27
205msgid "Search"
241msgid "Search"
206msgstr "ស្វែង​រក"
242msgstr "ស្វែង​រក"
207
243
208−#: qml/Shell.qml:359
244+#: qml/Shell.qml:256
209#, qt-format
245#, qt-format
210msgid "Please enter %1"
246msgid "Please enter %1"
211msgstr "សូម​បញ្ចូល %1"
247msgstr "សូម​បញ្ចូល %1"
po/kn.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "ಈಗ ಮಾತನಾಡಿ ..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"
186msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "ಹುಡುಕು"
238msgstr "ಹುಡುಕು"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/ko.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11"PO-Revision-Date: 2014-07-17 03:56+0000\n"
11"PO-Revision-Date: 2014-07-17 03:56+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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,47 +26,63 @@ msgstr "바로가기를 고정하기"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "바로가기를 고정 해제하기"
27msgstr "바로가기를 고정 해제하기"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "도입부 건너뛰기"
47msgstr "도입부 건너뛰기"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "오른쪽 끝"
51msgstr "오른쪽 끝"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "휴대 전화를 잠금 해제하려면 오른쪽에서부터 끌어보세요."
55msgstr "휴대 전화를 잠금 해제하려면 오른쪽에서부터 끌어보세요."
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "윗쪽 끝"
59msgstr "윗쪽 끝"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "알림을 보려면 위쪽에서 끌어보세요."
63msgstr "알림을 보려면 위쪽에서 끌어보세요."
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "닫기"
67msgstr "닫기"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "환경설정 창을 닫으려면 위로 다시 끌어보세요."
71msgstr "환경설정 창을 닫으려면 위로 다시 끌어보세요."
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "왼쪽 끝"
75msgstr "왼쪽 끝"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "애플리케이션을 빠르게 열기 위해 런처를 보려면 왼쪽에서 끌어보세요."
79msgstr "애플리케이션을 빠르게 열기 위해 런처를 보려면 왼쪽에서 끌어보세요."
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "잘하셨습니다."
83msgstr "잘하셨습니다."
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
@@ -74,20 +90,20 @@ msgstr ""
74"여러분은 끝에서 끌어오기 제스쳐를 완벽히 익히셨기 때문에 휴대 전화를 사용하기 시작할 수 있습니다. <br><br> 스크린을 터치해서 "
90"여러분은 끝에서 끌어오기 제스쳐를 완벽히 익히셨기 때문에 휴대 전화를 사용하기 시작할 수 있습니다. <br><br> 스크린을 터치해서 "
75"시작하세요."
91"시작하세요."
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "긴급 통화"
95msgstr "긴급 통화"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr "확인"
99msgstr "확인"
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "안녕하세요 %1"
104msgstr "안녕하세요 %1"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "안녕하세요"
108msgstr "안녕하세요"
93
109
@@ -99,19 +115,11 @@ msgstr "취소"
99msgid "DONE"
115msgid "DONE"
100msgstr "완료"
116msgstr "완료"
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr "더 보기"
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr "간단히 표시하기"
120msgstr "간단히 표시하기"
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr "최근"
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr ""
124msgstr ""
117
125
@@ -135,6 +143,26 @@ msgstr "평가 제출하기"
135msgid "Send"
143msgid "Send"
136msgstr "보내기"
144msgstr "보내기"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr ""
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr ""
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr ""
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr ""
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr ""
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr "휴대전화를 잠금 해제하려면 움직이세요."
168msgstr "휴대전화를 잠금 해제하려면 움직이세요."
@@ -159,11 +187,11 @@ msgstr "지금 말하세요..."
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "말하는 중..."
188msgstr "말하는 중..."
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "비밀 번호 보기"
192msgstr "비밀 번호 보기"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr "심카드의 PIN 번호를 입력하세요."
196msgstr "심카드의 PIN 번호를 입력하세요."
169
197
@@ -175,35 +203,43 @@ msgstr ""
175msgid "Conference"
203msgid "Conference"
176msgstr ""
204msgstr ""
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr "재생 중..."
208msgstr "재생 중..."
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr "다운로드 중"
212msgstr "다운로드 중"
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr "일시 중지 되었습니다. 계속하려면 누르세요."
216msgstr "일시 중지 되었습니다. 계속하려면 누르세요."
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr "취소됨"
220msgstr "취소됨"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr "완료됨"
224msgstr "완료됨"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr "실패하였습니다. 재시도하려면 누르세요."
228msgstr "실패하였습니다. 재시도하려면 누르세요."
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr ""
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr ""
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "검색"
240msgstr "검색"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "%1 를 입력해주세요."
245msgstr "%1 를 입력해주세요."
po/ky.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "Азыр сүйлөңүз..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "Сүйлөнүүдө..."
186msgstr "Сүйлөнүүдө..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "Издөө"
238msgstr "Издөө"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/lo.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "ປິດ"
67msgstr "ປິດ"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "ດີຫຼາຍ"
83msgstr "ດີຫຼາຍ"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "ສະບາຍດີ %1"
102msgstr "ສະບາຍດີ %1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "ສະບາຍດີ"
106msgstr "ສະບາຍດີ"
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr "ສົ່ງ"
142msgstr "ສົ່ງ"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "ເວົ້າໂລດ"
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "ກໍາລັງເວົ້າ"
186msgstr "ກໍາລັງເວົ້າ"
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "ຊອກຫາ"
238msgstr "ຊອກຫາ"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "ກະລູນາປ້ອນ %1"
243msgstr "ກະລູນາປ້ອນ %1"
po/lt.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,69 +26,85 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Praleisti įžangą"
47msgstr "Praleisti įžangą"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Dešinysis kraštas"
51msgstr "Dešinysis kraštas"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Pabandykite braukti nuo dešiniojo krašto, kad atrakintumėte telefoną"
55msgstr "Pabandykite braukti nuo dešiniojo krašto, kad atrakintumėte telefoną"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Viršutinis kraštas"
59msgstr "Viršutinis kraštas"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48"Pabandykite braukti nuo dešiniojo krašto, kad pasiektumėte indikatorius"
64"Pabandykite braukti nuo dešiniojo krašto, kad pasiektumėte indikatorius"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "Užverti"
68msgstr "Užverti"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr "Braukite aukštyn, kad užvertumėte nustatymų langą"
72msgstr "Braukite aukštyn, kad užvertumėte nustatymų langą"
57
73
58−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
59msgid "Left edge"
75msgid "Left edge"
60msgstr "Kairysis kraštas"
76msgstr "Kairysis kraštas"
61
77
62−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
64msgstr ""
80msgstr ""
65"Braukite nuo kairiojo krašto, kad pamatytumėte skydelį greitam programų "
81"Braukite nuo kairiojo krašto, kad pamatytumėte skydelį greitam programų "
66"paleidimui"
82"paleidimui"
67
83
68−#: qml/Components/EdgeDemo.qml:227
84+#: qml/Components/EdgeDemo.qml:226
69msgid "Well done"
85msgid "Well done"
70msgstr "Šaunu"
86msgstr "Šaunu"
71
87
72−#: qml/Components/EdgeDemo.qml:228
88+#: qml/Components/EdgeDemo.qml:227
73msgid ""
89msgid ""
74"You have now mastered the edge gestures and can start using the "
90"You have now mastered the edge gestures and can start using the "
75"phone<br><br>Tap on the screen to start"
91"phone<br><br>Tap on the screen to start"
76msgstr ""
92msgstr ""
77
93
78−#: qml/Components/Lockscreen.qml:214
94+#: qml/Components/Lockscreen.qml:220
79msgid "Emergency Call"
95msgid "Emergency Call"
80msgstr "Pagalbos skambutis"
96msgstr "Pagalbos skambutis"
81
97
82−#: qml/Components/Lockscreen.qml:231
98+#: qml/Components/Lockscreen.qml:243
83msgid "OK"
99msgid "OK"
84msgstr ""
100msgstr ""
85
101
86−#: qml/Components/PassphraseLockscreen.qml:60
102+#: qml/Components/PassphraseLockscreen.qml:62
87#, qt-format
103#, qt-format
88msgid "Hello %1"
104msgid "Hello %1"
89msgstr "Laba diena, %1"
105msgstr "Laba diena, %1"
90
106
91−#: qml/Components/PassphraseLockscreen.qml:60
107+#: qml/Components/PassphraseLockscreen.qml:62
92msgid "Hello"
108msgid "Hello"
93msgstr "Sveiki"
109msgstr "Sveiki"
94
110
@@ -100,19 +116,11 @@ msgstr ""
100msgid "DONE"
116msgid "DONE"
101msgstr ""
117msgstr ""
102
118
103−#: qml/Components/SeeMore.qml:35
104−msgid "See more"
105−msgstr ""
106−
107−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
119+#: qml/Dash/GenericScopeView.qml:358
108msgid "See less"
120msgid "See less"
109msgstr ""
121msgstr ""
110
122
111−#: qml/Dash/DashApps.qml:37
112−msgid "Recent"
113−msgstr "Paskiausieji"
114−
115−#: qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
116msgid "See all"
124msgid "See all"
117msgstr ""
125msgstr ""
118
126
@@ -136,6 +144,26 @@ msgstr "Pridėkite apžvalgą"
136msgid "Send"
144msgid "Send"
137msgstr "Siųsti"
145msgstr "Siųsti"
138
146
147+#: qml/Dash/ScopesOverview.qml:200
148+msgid "Manage Dash"
149+msgstr ""
150+
151+#: qml/Dash/ScopesOverview.qml:405
152+msgid "Done"
153+msgstr ""
154+
155+#: qml/Dash/ScopesOverview.qml:431
156+msgid "Store"
157+msgstr ""
158+
159+#: qml/Dash/ScopesOverviewTab.qml:36
160+msgid "Favorites"
161+msgstr ""
162+
163+#: qml/Dash/ScopesOverviewTab.qml:54
164+msgid "All"
165+msgstr ""
166+
139#: qml/Greeter/Greeter.qml:157
167#: qml/Greeter/Greeter.qml:157
140msgid "Swipe to unlock"
168msgid "Swipe to unlock"
141msgstr "Braukite ir atrakinsite"
169msgstr "Braukite ir atrakinsite"
@@ -160,11 +188,11 @@ msgstr "Kalbėkite..."
160msgid "Speaking..."
188msgid "Speaking..."
161msgstr "Kalbama..."
189msgstr "Kalbama..."
162
190
163−#: qml/Notifications/NotificationMenuItemFactory.qml:91
191+#: qml/Notifications/NotificationMenuItemFactory.qml:100
164msgid "Show password"
192msgid "Show password"
165msgstr "Rodyti slaptažodį"
193msgstr "Rodyti slaptažodį"
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:103
195+#: qml/Notifications/NotificationMenuItemFactory.qml:115
168msgid "Please enter SIM PIN"
196msgid "Please enter SIM PIN"
169msgstr "Įveskite SIM kortelės PIN kodą"
197msgstr "Įveskite SIM kortelės PIN kodą"
170
198
@@ -176,35 +204,43 @@ msgstr ""
176msgid "Conference"
204msgid "Conference"
177msgstr ""
205msgstr ""
178
206
179−#: qml/Panel/Indicators/MenuItemFactory.qml:583
207+#: qml/Panel/Indicators/MenuItemFactory.qml:651
180msgid "In queue…"
208msgid "In queue…"
181msgstr ""
209msgstr ""
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:587
211+#: qml/Panel/Indicators/MenuItemFactory.qml:655
184msgid "Downloading"
212msgid "Downloading"
185msgstr ""
213msgstr ""
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:589
215+#: qml/Panel/Indicators/MenuItemFactory.qml:657
188msgid "Paused, tap to resume"
216msgid "Paused, tap to resume"
189msgstr ""
217msgstr ""
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:591
219+#: qml/Panel/Indicators/MenuItemFactory.qml:659
192msgid "Canceled"
220msgid "Canceled"
193msgstr ""
221msgstr ""
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:593
223+#: qml/Panel/Indicators/MenuItemFactory.qml:661
196msgid "Finished"
224msgid "Finished"
197msgstr ""
225msgstr ""
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:595
227+#: qml/Panel/Indicators/MenuItemFactory.qml:663
200msgid "Failed, tap to retry"
228msgid "Failed, tap to retry"
201msgstr ""
229msgstr ""
202
230
231+#: qml/Panel/Indicators/ModemInfoItem.qml:105
232+msgid "Unlock SIM"
233+msgstr ""
234+
235+#: qml/Panel/Indicators/RoamingIndication.qml:27
236+msgid "Roaming"
237+msgstr ""
238+
203#: qml/Panel/SearchIndicator.qml:27
239#: qml/Panel/SearchIndicator.qml:27
204msgid "Search"
240msgid "Search"
205msgstr "Paieška"
241msgstr "Paieška"
206
242
207−#: qml/Shell.qml:359
243+#: qml/Shell.qml:256
208#, qt-format
244#, qt-format
209msgid "Please enter %1"
245msgid "Please enter %1"
210msgstr "Prašom įvesti %1"
246msgstr "Prašom įvesti %1"
po/lv.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-27 06:35+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Izslēgt"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Pārstartēt"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Atcelt"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Izlaist Intro"
47msgstr "Izlaist Intro"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Labā mala"
51msgstr "Labā mala"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Mēģiniet iesvelt no labās malas, lai atbloķētu tālruni"
55msgstr "Mēģiniet iesvelt no labās malas, lai atbloķētu tālruni"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Augšējā mala"
59msgstr "Augšējā mala"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Mēģiniet iesvelt no augšējās malas, lai piekļūt pie indikatoriem"
63msgstr "Mēģiniet iesvelt no augšējās malas, lai piekļūt pie indikatoriem"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Aizvērt"
67msgstr "Aizvērt"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Kreisā mala"
75msgstr "Kreisā mala"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "Ļoti labi!"
83msgstr "Ļoti labi!"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "Neatliekamās Palīdzības zvans"
93msgstr "Neatliekamās Palīdzības zvans"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr "LABI"
97msgstr "LABI"
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "Sveiki, %1"
102msgstr "Sveiki, %1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "Sveiki"
106msgstr "Sveiki"
91
107
@@ -97,19 +113,11 @@ msgstr "ATCELT"
97msgid "DONE"
113msgid "DONE"
98msgstr "IZDARĪTS"
114msgstr "IZDARĪTS"
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr "Redzēt vairāk"
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr "Redzēt mazāk"
118msgstr "Redzēt mazāk"
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr "Nesens"
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr "Skatīt visus"
122msgstr "Skatīt visus"
115
123
@@ -133,6 +141,26 @@ msgstr "Komentēt"
133msgid "Send"
141msgid "Send"
134msgstr "Sūtīt"
142msgstr "Sūtīt"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr "Pabeigts"
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr "Iecienītās"
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr "Visi"
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "Runajiet Tagad"
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "Runa..."
186msgstr "Runa..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "Rādīt paroli"
190msgstr "Rādīt paroli"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr "Lūdzu ievadiet SIM PIN"
194msgstr "Lūdzu ievadiet SIM PIN"
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr "Konference"
202msgstr "Konference"
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr "Lejupielādē"
210msgstr "Lejupielādē"
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr "Atcelts"
218msgstr "Atcelts"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr "Pabeigts"
222msgstr "Pabeigts"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr "Atbloķēt SIM"
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "Meklēt"
238msgstr "Meklēt"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "Lūdzu ievadiet %1"
243msgstr "Lūdzu ievadiet %1"
po/ml.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,68 +26,84 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "ആമുഖം ഒഴിവാക്കുക"
47msgstr "ആമുഖം ഒഴിവാക്കുക"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "വലത് മൂല"
51msgstr "വലത് മൂല"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "ഫോണ്‍ അണ്‍ലോക്ക് ചെയ്യാന്‍ വലതു വശത്തുനിന്ന് സ്വൈപ് ചെയ്ത് നോക്കുക"
55msgstr "ഫോണ്‍ അണ്‍ലോക്ക് ചെയ്യാന്‍ വലതു വശത്തുനിന്ന് സ്വൈപ് ചെയ്ത് നോക്കുക"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "മുകള്‍ വശം"
59msgstr "മുകള്‍ വശം"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "സൂചകങ്ങള്‍ ലഭ്യമാക്കാന്‍ മുകള്‍ വശത്തുനിന്നും സ്വൈപ് ചെയ്യുക"
63msgstr "സൂചകങ്ങള്‍ ലഭ്യമാക്കാന്‍ മുകള്‍ വശത്തുനിന്നും സ്വൈപ് ചെയ്യുക"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "അടക്കുക"
67msgstr "അടക്കുക"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "ക്രമീകരണങ്ങളുടെ സ്ക്രീന്‍ അടക്കാന്‍ മുകളിലേക്ക് സ്വൈപ് ചെയ്യുക"
71msgstr "ക്രമീകരണങ്ങളുടെ സ്ക്രീന്‍ അടക്കാന്‍ മുകളിലേക്ക് സ്വൈപ് ചെയ്യുക"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "ഇടത് വശം"
75msgstr "ഇടത് വശം"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"പ്രയോഗങ്ങള്‍ പെട്ടെന്ന് ലഭ്യമാക്കുന്ന വിക്ഷേപിക ലഭ്യമാക്കാന്‍ ഇടതു വശത്ത് "
80"പ്രയോഗങ്ങള്‍ പെട്ടെന്ന് ലഭ്യമാക്കുന്ന വിക്ഷേപിക ലഭ്യമാക്കാന്‍ ഇടതു വശത്ത് "
65"നിന്നും സ്വൈപ് ചെയ്യുക"
81"നിന്നും സ്വൈപ് ചെയ്യുക"
66
82
67−#: qml/Components/EdgeDemo.qml:227
83+#: qml/Components/EdgeDemo.qml:226
68msgid "Well done"
84msgid "Well done"
69msgstr "നന്നായി ചെയ്തിരിക്കുന്നു"
85msgstr "നന്നായി ചെയ്തിരിക്കുന്നു"
70
86
71−#: qml/Components/EdgeDemo.qml:228
87+#: qml/Components/EdgeDemo.qml:227
72msgid ""
88msgid ""
73"You have now mastered the edge gestures and can start using the "
89"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
90"phone<br><br>Tap on the screen to start"
75msgstr ""
91msgstr ""
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "അടിയന്തിര വിളി"
95msgstr "അടിയന്തിര വിളി"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr ""
99msgstr ""
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "ഹലോ %1"
104msgstr "ഹലോ %1"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "ഹലോ"
108msgstr "ഹലോ"
93
109
@@ -99,19 +115,11 @@ msgstr ""
99msgid "DONE"
115msgid "DONE"
100msgstr ""
116msgstr ""
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr ""
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr ""
120msgstr ""
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr ""
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr ""
124msgstr ""
117
125
@@ -135,6 +143,26 @@ msgstr "ഒരു അവലോകനം ചേര്‍ക്കുക"
135msgid "Send"
143msgid "Send"
136msgstr "അയയ്‌ക്കുക"
144msgstr "അയയ്‌ക്കുക"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr ""
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr ""
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr ""
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr ""
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr ""
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr ""
168msgstr ""
@@ -159,11 +187,11 @@ msgstr "ഇപ്പോള്‍ സംസാരിക്കുക..."
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "സംസാരിക്കുന്നു..."
188msgstr "സംസാരിക്കുന്നു..."
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "രഹസ്യവാക്ക് കാണിക്കുക"
192msgstr "രഹസ്യവാക്ക് കാണിക്കുക"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr ""
196msgstr ""
169
197
@@ -175,35 +203,43 @@ msgstr ""
175msgid "Conference"
203msgid "Conference"
176msgstr ""
204msgstr ""
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr ""
208msgstr ""
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr ""
212msgstr ""
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr ""
216msgstr ""
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr ""
220msgstr ""
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr ""
224msgstr ""
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr ""
228msgstr ""
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr ""
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr ""
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "തിരയുക"
240msgstr "തിരയുക"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "ദയവായി %1 നല്‍കുക"
245msgstr "ദയവായി %1 നല്‍കുക"
po/mr.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "परिचय वगळा"
47msgstr "परिचय वगळा"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "उजवा काठ"
51msgstr "उजवा काठ"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "फोन अनलॉक करण्यासाठी उजव्या काठावरुन स्वाइप करण्याचा प्रयत्न करा"
55msgstr "फोन अनलॉक करण्यासाठी उजव्या काठावरुन स्वाइप करण्याचा प्रयत्न करा"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "वरचा काठ"
59msgstr "वरचा काठ"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "इंडिकेटर वापरण्याकरिता वरचा काठावरून स्वाइप करण्याचा प्रयत्न करा"
63msgstr "इंडिकेटर वापरण्याकरिता वरचा काठावरून स्वाइप करण्याचा प्रयत्न करा"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "बंद करा"
67msgstr "बंद करा"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "सेटिंग्ज स्क्रीन बंद करण्यासाठी पुन्हा एकदा स्वाइप करा"
71msgstr "सेटिंग्ज स्क्रीन बंद करण्यासाठी पुन्हा एकदा स्वाइप करा"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "डावा काठ"
75msgstr "डावा काठ"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "लाँचर वरील अॕप्प्स त्वरित वापरण्याकरिता डाव्या बाजूने स्वाइप करा"
79msgstr "लाँचर वरील अॕप्प्स त्वरित वापरण्याकरिता डाव्या बाजूने स्वाइप करा"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "कौशल्यपूर्वक केले"
83msgstr "कौशल्यपूर्वक केले"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr ""
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr ""
186msgstr ""
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr ""
238msgstr ""
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/ms.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Langkau pengenalan"
47msgstr "Langkau pengenalan"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Pinggir kanan"
51msgstr "Pinggir kanan"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Cuba meleret dari pinggir kanan untuk buka aktifkan telefon"
55msgstr "Cuba meleret dari pinggir kanan untuk buka aktifkan telefon"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Pinggir atas"
59msgstr "Pinggir atas"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Cuba meleret dari pinggir atas untuk buka aktifkan telefon"
63msgstr "Cuba meleret dari pinggir atas untuk buka aktifkan telefon"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Tutup"
67msgstr "Tutup"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Leret ke atas sekali lagi untuk menutup skrin tetapan"
71msgstr "Leret ke atas sekali lagi untuk menutup skrin tetapan"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Pinggir kiri"
75msgstr "Pinggir kiri"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "Leret dari kiri untuk munculkan pelancar untuk capaian pantas ke apl"
79msgstr "Leret dari kiri untuk munculkan pelancar untuk capaian pantas ke apl"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "Bagus"
83msgstr "Bagus"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "panggilan Kecemasan"
93msgstr "panggilan Kecemasan"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "Hai %1"
102msgstr "Hai %1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "Hello"
106msgstr "Hello"
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr "Tambah ulasan"
133msgid "Send"
141msgid "Send"
134msgstr "Hantar"
142msgstr "Hantar"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "Cakap Sekarang..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "Bercakap..."
186msgstr "Bercakap..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "Tunjuk kata laluan"
190msgstr "Tunjuk kata laluan"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "Gelintar"
238msgstr "Gelintar"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "Sila masukkan %1"
243msgstr "Sila masukkan %1"
po/my.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "မိတ်ဆက်ကိုကျော်မည်"
47msgstr "မိတ်ဆက်ကိုကျော်မည်"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "ညာဖက် အစွန်း"
51msgstr "ညာဖက် အစွန်း"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "ထိပ် အစွန်း"
59msgstr "ထိပ် အစွန်း"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "ပိတ်"
67msgstr "ပိတ်"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "ဘယ်​ဖက် အစွန်း"
75msgstr "ဘယ်​ဖက် အစွန်း"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "ကောင်းအောင်ပြုလုပ်ခဲ့သည်"
83msgstr "ကောင်းအောင်ပြုလုပ်ခဲ့သည်"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "အရေးပေါ်ခေါ်မည်"
93msgstr "အရေးပေါ်ခေါ်မည်"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "ဟဲလို %1"
102msgstr "ဟဲလို %1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "ဟဲလို"
106msgstr "ဟဲလို"
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr "ပို့မည်"
142msgstr "ပို့မည်"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "ယခုပြောပါ"
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "ပြောနေသည်"
186msgstr "ပြောနေသည်"
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "စကားဝှက်ကိုပြ"
190msgstr "စကားဝှက်ကိုပြ"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "ရှာဖွေ"
238msgstr "ရှာဖွေ"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "%1ကိုရိုက်ထည့်ပါ"
243msgstr "%1ကိုရိုက်ထည့်ပါ"
po/nb.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-26 12:05+0000\n"
11+"PO-Revision-Date: 2014-08-13 06:16+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-07-27 06:35+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-14 07:38+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,47 +26,63 @@ msgstr "Fest snarvei"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Fjern snarvei"
27msgstr "Fjern snarvei"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Er du sikker på at du vil slå av?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Slå av"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Start på nytt"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Avbryt"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Hopp over introduksjon"
47msgstr "Hopp over introduksjon"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Høyre kant"
51msgstr "Høyre kant"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Prøv å sveipe fra høyre side for å låse opp telefonen"
55msgstr "Prøv å sveipe fra høyre side for å låse opp telefonen"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Øvre kant"
59msgstr "Øvre kant"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Prøv å sveipe fra toppen for å få tilgang til innstillingene"
63msgstr "Prøv å sveipe fra toppen for å få tilgang til innstillingene"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Lukk"
67msgstr "Lukk"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Sveip opp igjen for å lukke innstillingsmenyen"
71msgstr "Sveip opp igjen for å lukke innstillingsmenyen"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Venstre kant"
75msgstr "Venstre kant"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "Sveip fra venstre for å få tilgang til programoppstarteren"
79msgstr "Sveip fra venstre for å få tilgang til programoppstarteren"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "Bra jobba"
83msgstr "Bra jobba"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
@@ -74,20 +90,20 @@ msgstr ""
74"Du har nå mestret kantbevegelsene, og er klar til å bruke "
90"Du har nå mestret kantbevegelsene, og er klar til å bruke "
75"telefonen<br><br>Trykk på skjermen for å begynne"
91"telefonen<br><br>Trykk på skjermen for å begynne"
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "Nødanrop"
95msgstr "Nødanrop"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr "OK"
99msgstr "OK"
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "Hei, %1"
104msgstr "Hei, %1"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "Hei"
108msgstr "Hei"
93
109
@@ -99,19 +115,11 @@ msgstr "AVBRYT"
99msgid "DONE"
115msgid "DONE"
100msgstr "FERDIG"
116msgstr "FERDIG"
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr "Vis mer"
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr "Vis mindre"
120msgstr "Vis mindre"
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr "Nylig"
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr "Vis alt"
124msgstr "Vis alt"
117
125
@@ -135,6 +143,26 @@ msgstr "Skriv en anmeldelse"
135msgid "Send"
143msgid "Send"
136msgstr "Send"
144msgstr "Send"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr "Håndter dashbord"
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr "Ferdig"
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr "Butikk"
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr "Favoritter"
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr "Alt"
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr "Sveip for å låse opp"
168msgstr "Sveip for å låse opp"
@@ -159,11 +187,11 @@ msgstr "Snakk nå …"
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "Snakker …"
188msgstr "Snakker …"
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "Vis passord"
192msgstr "Vis passord"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr "Skriv inn PIN-koden til SIM-kortet"
196msgstr "Skriv inn PIN-koden til SIM-kortet"
169
197
@@ -175,35 +203,43 @@ msgstr "Trykk for å gå tilbake til anrop …"
175msgid "Conference"
203msgid "Conference"
176msgstr "Konferanse"
204msgstr "Konferanse"
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr "I kø …"
208msgstr "I kø …"
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr "Laster ned"
212msgstr "Laster ned"
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr "Satt på pause (trykk for å fortsette)"
216msgstr "Satt på pause (trykk for å fortsette)"
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr "Avbrutt"
220msgstr "Avbrutt"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr "Ferdig"
224msgstr "Ferdig"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr "Feilet. Trykk for å prøve på nytt"
228msgstr "Feilet. Trykk for å prøve på nytt"
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr "Lås opp SIM"
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr "Fremmednett"
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "Søk"
240msgstr "Søk"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "Skriv inn %1"
245msgstr "Skriv inn %1"
po/nl.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-27 19:12+0000\n"
11+"PO-Revision-Date: 2014-08-13 09:06+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-07-28 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-14 07:37+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,47 +26,63 @@ msgstr "Snelkoppeling vastzetten"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Snelkoppeling losmaken"
27msgstr "Snelkoppeling losmaken"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Weet u zeker dat u het apparaat wilt uitschakelen?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Uitschakelen"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Herstarten"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Annuleren"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Intro overslaan"
47msgstr "Intro overslaan"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Rechterrand"
51msgstr "Rechterrand"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Veeg vanuit de rechterrand om het scherm te ontgrendelen"
55msgstr "Veeg vanuit de rechterrand om het scherm te ontgrendelen"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Bovenrand"
59msgstr "Bovenrand"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Veeg vanuit de bovenrand om de indicatoren te bekijken"
63msgstr "Veeg vanuit de bovenrand om de indicatoren te bekijken"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Sluiten"
67msgstr "Sluiten"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Veeg nogmaals omhoog om het instellingenscherm te sluiten"
71msgstr "Veeg nogmaals omhoog om het instellingenscherm te sluiten"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Linkerrand"
75msgstr "Linkerrand"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "Veeg vanaf links om de Starter te tonen voor snelle toegang tot apps"
79msgstr "Veeg vanaf links om de Starter te tonen voor snelle toegang tot apps"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "Goed gedaan"
83msgstr "Goed gedaan"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
@@ -74,20 +90,20 @@ msgstr ""
74"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
90"Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "
75"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
91"het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "Noodoproep"
95msgstr "Noodoproep"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr "Ok"
99msgstr "Ok"
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "Hallo %1"
104msgstr "Hallo %1"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "Hallo"
108msgstr "Hallo"
93
109
@@ -99,19 +115,11 @@ msgstr "ANNULEREN"
99msgid "DONE"
115msgid "DONE"
100msgstr "KLAAR"
116msgstr "KLAAR"
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr "Meer zien"
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr "Minder zien"
120msgstr "Minder zien"
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr "Recent"
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr "Alles zien"
124msgstr "Alles zien"
117
125
@@ -135,6 +143,26 @@ msgstr "Voeg recensie toe"
135msgid "Send"
143msgid "Send"
136msgstr "Versturen"
144msgstr "Versturen"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr "Snelzoeker-beheer"
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr "Klaar"
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr "Winkel"
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr "Favorieten"
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr "Alles"
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr "Veeg om te ontgrendelen"
168msgstr "Veeg om te ontgrendelen"
@@ -159,11 +187,11 @@ msgstr "Nu inspreken…"
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "Inspreken…"
188msgstr "Inspreken…"
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "Wachtwoord tonen"
192msgstr "Wachtwoord tonen"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr "Voer SIM-pincode in"
196msgstr "Voer SIM-pincode in"
169
197
@@ -175,35 +203,43 @@ msgstr "Tik om terug te keren naar gesprek…"
175msgid "Conference"
203msgid "Conference"
176msgstr "Groepsgesprek"
204msgstr "Groepsgesprek"
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr "In wachtrij…"
208msgstr "In wachtrij…"
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr "Aan het downloaden"
212msgstr "Aan het downloaden"
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr "Gepauzeerd, tik om te hervatten"
216msgstr "Gepauzeerd, tik om te hervatten"
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr "Geannuleerd"
220msgstr "Geannuleerd"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr "Klaar"
224msgstr "Klaar"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr "Mislukt, tik om het opnieuw te proberen"
228msgstr "Mislukt, tik om het opnieuw te proberen"
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr "SIM-kaart deblokkeren"
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr "Roaming"
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "Zoeken"
240msgstr "Zoeken"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "Voer %1 in"
245msgstr "Voer %1 in"
po/pl.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11"PO-Revision-Date: 2014-07-31 13:51+0000\n"
11"PO-Revision-Date: 2014-07-31 13:51+0000\n"
12"Last-Translator: Michał Radwański <radwanski.michal@outlook.com>\n"
12"Last-Translator: Michał Radwański <radwanski.michal@outlook.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-01 07:14+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17141)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,49 +26,65 @@ msgstr "Przypnij skrót"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Odepnij skrót"
27msgstr "Odepnij skrót"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Pomiń intro"
47msgstr "Pomiń intro"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Prawa krawędź"
51msgstr "Prawa krawędź"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Aby odblokować telefon, przeciagnij w stronę prawej krawędzi"
55msgstr "Aby odblokować telefon, przeciagnij w stronę prawej krawędzi"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Górna krawędź"
59msgstr "Górna krawędź"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Przeciągnij od górnej krawędzi aby uzyskać wskazówki"
63msgstr "Przeciągnij od górnej krawędzi aby uzyskać wskazówki"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Zamknij"
67msgstr "Zamknij"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Przeciągnij ponownie w górę, by zamknąć okno ustawień"
71msgstr "Przeciągnij ponownie w górę, by zamknąć okno ustawień"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Lewa krawędź"
75msgstr "Lewa krawędź"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"Przeciągnięcie od lewej krawędzi, uruchamia aktywator szybkiego dostępu do "
80"Przeciągnięcie od lewej krawędzi, uruchamia aktywator szybkiego dostępu do "
65"aplikacji"
81"aplikacji"
66
82
67−#: qml/Components/EdgeDemo.qml:227
83+#: qml/Components/EdgeDemo.qml:226
68msgid "Well done"
84msgid "Well done"
69msgstr "Udało się!"
85msgstr "Udało się!"
70
86
71−#: qml/Components/EdgeDemo.qml:228
87+#: qml/Components/EdgeDemo.qml:227
72msgid ""
88msgid ""
73"You have now mastered the edge gestures and can start using the "
89"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
90"phone<br><br>Tap on the screen to start"
@@ -76,20 +92,20 @@ msgstr ""
76"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "
92"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "
77"pracy.<br><br>Dotknij ekranu by rozpocząć"
93"pracy.<br><br>Dotknij ekranu by rozpocząć"
78
94
79−#: qml/Components/Lockscreen.qml:214
95+#: qml/Components/Lockscreen.qml:220
80msgid "Emergency Call"
96msgid "Emergency Call"
81msgstr "Telefon ratunkowy"
97msgstr "Telefon ratunkowy"
82
98
83−#: qml/Components/Lockscreen.qml:231
99+#: qml/Components/Lockscreen.qml:243
84msgid "OK"
100msgid "OK"
85msgstr "OK"
101msgstr "OK"
86
102
87−#: qml/Components/PassphraseLockscreen.qml:60
103+#: qml/Components/PassphraseLockscreen.qml:62
88#, qt-format
104#, qt-format
89msgid "Hello %1"
105msgid "Hello %1"
90msgstr "Witaj %1"
106msgstr "Witaj %1"
91
107
92−#: qml/Components/PassphraseLockscreen.qml:60
108+#: qml/Components/PassphraseLockscreen.qml:62
93msgid "Hello"
109msgid "Hello"
94msgstr "Witaj"
110msgstr "Witaj"
95
111
@@ -101,19 +117,11 @@ msgstr "ANULUJ"
101msgid "DONE"
117msgid "DONE"
102msgstr "ZROBIONE"
118msgstr "ZROBIONE"
103
119
104−#: qml/Components/SeeMore.qml:35
105−msgid "See more"
106−msgstr "Zobacz więcej"
107−
108−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
109msgid "See less"
121msgid "See less"
110msgstr "Zobacz mniej"
122msgstr "Zobacz mniej"
111
123
112−#: qml/Dash/DashApps.qml:37
113−msgid "Recent"
114−msgstr "Ostatnio używane"
115−
116−#: qml/Dash/GenericScopeView.qml:330
124+#: qml/Dash/GenericScopeView.qml:358
117msgid "See all"
125msgid "See all"
118msgstr "Zobacz wszystko"
126msgstr "Zobacz wszystko"
119
127
@@ -137,6 +145,26 @@ msgstr "Dodaj recenzję"
137msgid "Send"
145msgid "Send"
138msgstr "Wyślij"
146msgstr "Wyślij"
139
147
148+#: qml/Dash/ScopesOverview.qml:200
149+msgid "Manage Dash"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:405
153+msgid "Done"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverview.qml:431
157+msgid "Store"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:36
161+msgid "Favorites"
162+msgstr ""
163+
164+#: qml/Dash/ScopesOverviewTab.qml:54
165+msgid "All"
166+msgstr ""
167+
140#: qml/Greeter/Greeter.qml:157
168#: qml/Greeter/Greeter.qml:157
141msgid "Swipe to unlock"
169msgid "Swipe to unlock"
142msgstr "Przeciągnij aby odblokować"
170msgstr "Przeciągnij aby odblokować"
@@ -161,11 +189,11 @@ msgstr "Mów teraz..."
161msgid "Speaking..."
189msgid "Speaking..."
162msgstr "Rozpoznanie..."
190msgstr "Rozpoznanie..."
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:91
192+#: qml/Notifications/NotificationMenuItemFactory.qml:100
165msgid "Show password"
193msgid "Show password"
166msgstr "Wyświetl hasło"
194msgstr "Wyświetl hasło"
167
195
168−#: qml/Notifications/NotificationMenuItemFactory.qml:103
196+#: qml/Notifications/NotificationMenuItemFactory.qml:115
169msgid "Please enter SIM PIN"
197msgid "Please enter SIM PIN"
170msgstr "Wprowadź kod PIN karty SIM"
198msgstr "Wprowadź kod PIN karty SIM"
171
199
@@ -177,35 +205,43 @@ msgstr "Dotknij aby powrócić do połączenia..."
177msgid "Conference"
205msgid "Conference"
178msgstr "Konferencja"
206msgstr "Konferencja"
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:583
208+#: qml/Panel/Indicators/MenuItemFactory.qml:651
181msgid "In queue…"
209msgid "In queue…"
182msgstr "W kolejce..."
210msgstr "W kolejce..."
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:587
212+#: qml/Panel/Indicators/MenuItemFactory.qml:655
185msgid "Downloading"
213msgid "Downloading"
186msgstr "Pobieranie"
214msgstr "Pobieranie"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:589
216+#: qml/Panel/Indicators/MenuItemFactory.qml:657
189msgid "Paused, tap to resume"
217msgid "Paused, tap to resume"
190msgstr "Wstrzymano, kliknij by wznowić"
218msgstr "Wstrzymano, kliknij by wznowić"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:591
220+#: qml/Panel/Indicators/MenuItemFactory.qml:659
193msgid "Canceled"
221msgid "Canceled"
194msgstr "Anulowano"
222msgstr "Anulowano"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:593
224+#: qml/Panel/Indicators/MenuItemFactory.qml:661
197msgid "Finished"
225msgid "Finished"
198msgstr "Zakończono"
226msgstr "Zakończono"
199
227
200−#: qml/Panel/Indicators/MenuItemFactory.qml:595
228+#: qml/Panel/Indicators/MenuItemFactory.qml:663
201msgid "Failed, tap to retry"
229msgid "Failed, tap to retry"
202msgstr "Błąd, kliknij aby powtórzyć"
230msgstr "Błąd, kliknij aby powtórzyć"
203
231
232+#: qml/Panel/Indicators/ModemInfoItem.qml:105
233+msgid "Unlock SIM"
234+msgstr ""
235+
236+#: qml/Panel/Indicators/RoamingIndication.qml:27
237+msgid "Roaming"
238+msgstr ""
239+
204#: qml/Panel/SearchIndicator.qml:27
240#: qml/Panel/SearchIndicator.qml:27
205msgid "Search"
241msgid "Search"
206msgstr "Szukaj"
242msgstr "Szukaj"
207
243
208−#: qml/Shell.qml:359
244+#: qml/Shell.qml:256
209#, qt-format
245#, qt-format
210msgid "Please enter %1"
246msgid "Please enter %1"
211msgstr "Wprowadź %1"
247msgstr "Wprowadź %1"
po/pt.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-25 12:04+0000\n"
11+"PO-Revision-Date: 2014-08-12 23:56+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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,48 +26,64 @@ msgstr "Afixar atalho"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Remover atalho"
27msgstr "Remover atalho"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Tem a certeza de que quer desligar?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Desligar"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Reiniciar"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Cancelar"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Saltar introdução"
47msgstr "Saltar introdução"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Limite direito"
51msgstr "Limite direito"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Tente deslizar do limite direito para desbloquear o telefone"
55msgstr "Tente deslizar do limite direito para desbloquear o telefone"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Limite superior"
59msgstr "Limite superior"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Tente deslizar do topo para aceder aos indicadores"
63msgstr "Tente deslizar do topo para aceder aos indicadores"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Fechar"
67msgstr "Fechar"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Deslize de novo para cima para fechar o ecrã de definições"
71msgstr "Deslize de novo para cima para fechar o ecrã de definições"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Limite esquerdo"
75msgstr "Limite esquerdo"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"Deslize da esquerda para mostrar o lançador para acesso rápido às aplicações"
80"Deslize da esquerda para mostrar o lançador para acesso rápido às aplicações"
65
81
66−#: qml/Components/EdgeDemo.qml:227
82+#: qml/Components/EdgeDemo.qml:226
67msgid "Well done"
83msgid "Well done"
68msgstr "Muito bem"
84msgstr "Muito bem"
69
85
70−#: qml/Components/EdgeDemo.qml:228
86+#: qml/Components/EdgeDemo.qml:227
71msgid ""
87msgid ""
72"You have now mastered the edge gestures and can start using the "
88"You have now mastered the edge gestures and can start using the "
73"phone<br><br>Tap on the screen to start"
89"phone<br><br>Tap on the screen to start"
@@ -75,20 +91,20 @@ msgstr ""
75"Já domina os gestos dos limites e pode começar a usar o "
91"Já domina os gestos dos limites e pode começar a usar o "
76"telefone<br><br>Toque no ecrã para começar"
92"telefone<br><br>Toque no ecrã para começar"
77
93
78−#: qml/Components/Lockscreen.qml:214
94+#: qml/Components/Lockscreen.qml:220
79msgid "Emergency Call"
95msgid "Emergency Call"
80msgstr "Chamada de emergência"
96msgstr "Chamada de emergência"
81
97
82−#: qml/Components/Lockscreen.qml:231
98+#: qml/Components/Lockscreen.qml:243
83msgid "OK"
99msgid "OK"
84msgstr "OK"
100msgstr "OK"
85
101
86−#: qml/Components/PassphraseLockscreen.qml:60
102+#: qml/Components/PassphraseLockscreen.qml:62
87#, qt-format
103#, qt-format
88msgid "Hello %1"
104msgid "Hello %1"
89msgstr "Olá %1"
105msgstr "Olá %1"
90
106
91−#: qml/Components/PassphraseLockscreen.qml:60
107+#: qml/Components/PassphraseLockscreen.qml:62
92msgid "Hello"
108msgid "Hello"
93msgstr "Olá"
109msgstr "Olá"
94
110
@@ -100,19 +116,11 @@ msgstr "CANCELAR"
100msgid "DONE"
116msgid "DONE"
101msgstr "FEITO"
117msgstr "FEITO"
102
118
103−#: qml/Components/SeeMore.qml:35
104−msgid "See more"
105−msgstr "Ver mais"
106−
107−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
119+#: qml/Dash/GenericScopeView.qml:358
108msgid "See less"
120msgid "See less"
109msgstr "Ver menos"
121msgstr "Ver menos"
110
122
111−#: qml/Dash/DashApps.qml:37
112−msgid "Recent"
113−msgstr "Recentes"
114−
115−#: qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
116msgid "See all"
124msgid "See all"
117msgstr "Ver todos"
125msgstr "Ver todos"
118
126
@@ -136,6 +144,26 @@ msgstr "Adicione uma crítica"
136msgid "Send"
144msgid "Send"
137msgstr "Enviar"
145msgstr "Enviar"
138
146
147+#: qml/Dash/ScopesOverview.qml:200
148+msgid "Manage Dash"
149+msgstr "Gerir o Dash"
150+
151+#: qml/Dash/ScopesOverview.qml:405
152+msgid "Done"
153+msgstr "Concluído"
154+
155+#: qml/Dash/ScopesOverview.qml:431
156+msgid "Store"
157+msgstr "Loja"
158+
159+#: qml/Dash/ScopesOverviewTab.qml:36
160+msgid "Favorites"
161+msgstr "Favoritos"
162+
163+#: qml/Dash/ScopesOverviewTab.qml:54
164+msgid "All"
165+msgstr "Todos"
166+
139#: qml/Greeter/Greeter.qml:157
167#: qml/Greeter/Greeter.qml:157
140msgid "Swipe to unlock"
168msgid "Swipe to unlock"
141msgstr "Deslize para desbloquear"
169msgstr "Deslize para desbloquear"
@@ -160,11 +188,11 @@ msgstr "Fale agora..."
160msgid "Speaking..."
188msgid "Speaking..."
161msgstr "A falar..."
189msgstr "A falar..."
162
190
163−#: qml/Notifications/NotificationMenuItemFactory.qml:91
191+#: qml/Notifications/NotificationMenuItemFactory.qml:100
164msgid "Show password"
192msgid "Show password"
165msgstr "Mostrar palavra-passe"
193msgstr "Mostrar palavra-passe"
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:103
195+#: qml/Notifications/NotificationMenuItemFactory.qml:115
168msgid "Please enter SIM PIN"
196msgid "Please enter SIM PIN"
169msgstr "Por favor insira o PIN"
197msgstr "Por favor insira o PIN"
170
198
@@ -176,35 +204,43 @@ msgstr "Tocar para ligar de volta..."
176msgid "Conference"
204msgid "Conference"
177msgstr "Conferência"
205msgstr "Conferência"
178
206
179−#: qml/Panel/Indicators/MenuItemFactory.qml:583
207+#: qml/Panel/Indicators/MenuItemFactory.qml:651
180msgid "In queue…"
208msgid "In queue…"
181msgstr "Em fila..."
209msgstr "Em fila..."
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:587
211+#: qml/Panel/Indicators/MenuItemFactory.qml:655
184msgid "Downloading"
212msgid "Downloading"
185msgstr "A transferir"
213msgstr "A transferir"
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:589
215+#: qml/Panel/Indicators/MenuItemFactory.qml:657
188msgid "Paused, tap to resume"
216msgid "Paused, tap to resume"
189msgstr "Parado, toque para continuar"
217msgstr "Parado, toque para continuar"
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:591
219+#: qml/Panel/Indicators/MenuItemFactory.qml:659
192msgid "Canceled"
220msgid "Canceled"
193msgstr "Cancelado"
221msgstr "Cancelado"
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:593
223+#: qml/Panel/Indicators/MenuItemFactory.qml:661
196msgid "Finished"
224msgid "Finished"
197msgstr "Concluído"
225msgstr "Concluído"
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:595
227+#: qml/Panel/Indicators/MenuItemFactory.qml:663
200msgid "Failed, tap to retry"
228msgid "Failed, tap to retry"
201msgstr "Falhou, toque para repetir"
229msgstr "Falhou, toque para repetir"
202
230
231+#: qml/Panel/Indicators/ModemInfoItem.qml:105
232+msgid "Unlock SIM"
233+msgstr "Desbloquear SIM"
234+
235+#: qml/Panel/Indicators/RoamingIndication.qml:27
236+msgid "Roaming"
237+msgstr "Roaming"
238+
203#: qml/Panel/SearchIndicator.qml:27
239#: qml/Panel/SearchIndicator.qml:27
204msgid "Search"
240msgid "Search"
205msgstr "Procurar"
241msgstr "Procurar"
206
242
207−#: qml/Shell.qml:359
243+#: qml/Shell.qml:256
208#, qt-format
244#, qt-format
209msgid "Please enter %1"
245msgid "Please enter %1"
210msgstr "Por favor, introduza %1"
246msgstr "Por favor, introduza %1"
po/pt_BR.po+77−41
@@ -7,68 +7,84 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-08-04 18:33+0000\n"
11+"PO-Revision-Date: 2014-08-13 04:53+0000\n"
12−"Last-Translator: Rafael Neri <Unknown>\n"
12+"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\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-05 06:45+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-14 07:38+0000\n"
18−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
22msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Fixar atalho"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Desafixar atalho"
28+
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Você tem certeza de que deseja desligar?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Desligar"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Reiniciar"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Cancelar"
28
44
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Pular introdução"
47msgstr "Pular introdução"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Borda direita"
51msgstr "Borda direita"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Tente deslizar da borda direita para desbloquear o telefone"
55msgstr "Tente deslizar da borda direita para desbloquear o telefone"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Borda superior"
59msgstr "Borda superior"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Tente deslizar da borda superior para acessar os indicadores"
63msgstr "Tente deslizar da borda superior para acessar os indicadores"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Fechar"
67msgstr "Fechar"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Deslize novamente para cima para fechar a tela de configurações"
71msgstr "Deslize novamente para cima para fechar a tela de configurações"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Borda esquerda"
75msgstr "Borda esquerda"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"Deslize da esquerda para revelar o lançador para acesso rápido aos "
80"Deslize da esquerda para revelar o lançador para acesso rápido aos "
65"aplicativos"
81"aplicativos"
66
82
67−#: qml/Components/EdgeDemo.qml:227
83+#: qml/Components/EdgeDemo.qml:226
68msgid "Well done"
84msgid "Well done"
69msgstr "Bem feito"
85msgstr "Bem feito"
70
86
71−#: qml/Components/EdgeDemo.qml:228
87+#: qml/Components/EdgeDemo.qml:227
72msgid ""
88msgid ""
73"You have now mastered the edge gestures and can start using the "
89"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
90"phone<br><br>Tap on the screen to start"
@@ -76,20 +92,20 @@ msgstr ""
76"Agora você já domina os gestos das bordas e pode começar a usar o "
92"Agora você já domina os gestos das bordas e pode começar a usar o "
77"telefone<br><br>Toque na tela para iniciar"
93"telefone<br><br>Toque na tela para iniciar"
78
94
79−#: qml/Components/Lockscreen.qml:214
95+#: qml/Components/Lockscreen.qml:220
80msgid "Emergency Call"
96msgid "Emergency Call"
81msgstr "Chamada de emergência"
97msgstr "Chamada de emergência"
82
98
83−#: qml/Components/Lockscreen.qml:231
99+#: qml/Components/Lockscreen.qml:243
84msgid "OK"
100msgid "OK"
85msgstr "OK"
101msgstr "OK"
86
102
87−#: qml/Components/PassphraseLockscreen.qml:60
103+#: qml/Components/PassphraseLockscreen.qml:62
88#, qt-format
104#, qt-format
89msgid "Hello %1"
105msgid "Hello %1"
90msgstr "Olá %1"
106msgstr "Olá %1"
91
107
92−#: qml/Components/PassphraseLockscreen.qml:60
108+#: qml/Components/PassphraseLockscreen.qml:62
93msgid "Hello"
109msgid "Hello"
94msgstr "Olá"
110msgstr "Olá"
95
111
@@ -101,19 +117,11 @@ msgstr "CANCELAR"
101msgid "DONE"
117msgid "DONE"
102msgstr "FEITO"
118msgstr "FEITO"
103
119
104−#: qml/Components/SeeMore.qml:35
105−msgid "See more"
106−msgstr "Ver mais"
107−
108−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
109msgid "See less"
121msgid "See less"
110msgstr "Ver menos"
122msgstr "Ver menos"
111
123
112−#: qml/Dash/DashApps.qml:37
113−msgid "Recent"
114−msgstr "Recentes"
115−
116−#: qml/Dash/GenericScopeView.qml:330
124+#: qml/Dash/GenericScopeView.qml:358
117msgid "See all"
125msgid "See all"
118msgstr "Ver todos"
126msgstr "Ver todos"
119
127
@@ -137,6 +145,26 @@ msgstr "Adicionar uma análise"
137msgid "Send"
145msgid "Send"
138msgstr "Enviar"
146msgstr "Enviar"
139
147
148+#: qml/Dash/ScopesOverview.qml:200
149+msgid "Manage Dash"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:405
153+msgid "Done"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverview.qml:431
157+msgid "Store"
158+msgstr "Loja"
159+
160+#: qml/Dash/ScopesOverviewTab.qml:36
161+msgid "Favorites"
162+msgstr "Favoritos"
163+
164+#: qml/Dash/ScopesOverviewTab.qml:54
165+msgid "All"
166+msgstr ""
167+
140#: qml/Greeter/Greeter.qml:157
168#: qml/Greeter/Greeter.qml:157
141msgid "Swipe to unlock"
169msgid "Swipe to unlock"
142msgstr "Deslizar para desbloquear"
170msgstr "Deslizar para desbloquear"
@@ -161,11 +189,11 @@ msgstr "Fale agora..."
161msgid "Speaking..."
189msgid "Speaking..."
162msgstr "Falando..."
190msgstr "Falando..."
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:91
192+#: qml/Notifications/NotificationMenuItemFactory.qml:100
165msgid "Show password"
193msgid "Show password"
166msgstr "Exibir senha"
194msgstr "Exibir senha"
167
195
168−#: qml/Notifications/NotificationMenuItemFactory.qml:103
196+#: qml/Notifications/NotificationMenuItemFactory.qml:115
169msgid "Please enter SIM PIN"
197msgid "Please enter SIM PIN"
170msgstr "Por favor, digite o PIN do cartão SIM"
198msgstr "Por favor, digite o PIN do cartão SIM"
171
199
@@ -177,35 +205,43 @@ msgstr "Toque para retornar para a chamada..."
177msgid "Conference"
205msgid "Conference"
178msgstr "Conferência"
206msgstr "Conferência"
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:583
208+#: qml/Panel/Indicators/MenuItemFactory.qml:651
181msgid "In queue…"
209msgid "In queue…"
182−msgstr ""
210+msgstr "Em fila..."
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:587
212+#: qml/Panel/Indicators/MenuItemFactory.qml:655
185msgid "Downloading"
213msgid "Downloading"
186msgstr "Baixando"
214msgstr "Baixando"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:589
216+#: qml/Panel/Indicators/MenuItemFactory.qml:657
189msgid "Paused, tap to resume"
217msgid "Paused, tap to resume"
190msgstr "Em pausa, toque para continuar"
218msgstr "Em pausa, toque para continuar"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:591
220+#: qml/Panel/Indicators/MenuItemFactory.qml:659
193msgid "Canceled"
221msgid "Canceled"
194msgstr "Cancelado"
222msgstr "Cancelado"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:593
224+#: qml/Panel/Indicators/MenuItemFactory.qml:661
197msgid "Finished"
225msgid "Finished"
198msgstr "Finalizado"
226msgstr "Finalizado"
199
227
200−#: qml/Panel/Indicators/MenuItemFactory.qml:595
228+#: qml/Panel/Indicators/MenuItemFactory.qml:663
201msgid "Failed, tap to retry"
229msgid "Failed, tap to retry"
202msgstr "Falhou, toque para tentar novamente"
230msgstr "Falhou, toque para tentar novamente"
203
231
232+#: qml/Panel/Indicators/ModemInfoItem.qml:105
233+msgid "Unlock SIM"
234+msgstr "Desbloquear SIM"
235+
236+#: qml/Panel/Indicators/RoamingIndication.qml:27
237+msgid "Roaming"
238+msgstr "Roaming"
239+
204#: qml/Panel/SearchIndicator.qml:27
240#: qml/Panel/SearchIndicator.qml:27
205msgid "Search"
241msgid "Search"
206msgstr "Pesquisar"
242msgstr "Pesquisar"
207
243
208−#: qml/Shell.qml:359
244+#: qml/Shell.qml:256
209#, qt-format
245#, qt-format
210msgid "Please enter %1"
246msgid "Please enter %1"
211msgstr "Por favor, digite %1"
247msgstr "Por favor, digite %1"
po/ro.po+114−73
@@ -7,135 +7,168 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2013-06-27 07:53+0000\n"
11+"PO-Revision-Date: 2014-08-12 06:27+0000\n"
12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
22msgid "Pin shortcut"
23−msgstr ""
23+msgstr "Fixează scurtătura"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "Eliberează scurtătura"
28+
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Sigur doriți să opriți dispozitivul?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Oprire"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Repornire"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Anulează"
28
44
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31−msgstr ""
47+msgstr "Sari peste introducere"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35−msgstr ""
51+msgstr "Marginea din dreapta"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39−msgstr ""
55+msgstr "Glisați de la dreapta spre stânga pentru a debloca telefonul"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43−msgstr ""
59+msgstr "Marginea de sus"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
64+"Glisați de la marginea de sus a ecranului pentru a accesa indicatorii"
48
65
49−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
67msgid "Close"
51−msgstr ""
68+msgstr "Închide"
52
69
53−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
55−msgstr ""
72+msgstr "Glisați în sus din nou pentru a închide ecranul configurărilor"
56
73
57−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
75msgid "Left edge"
59−msgstr ""
76+msgstr "Marginea din stânga"
60
77
61−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
80msgstr ""
81+"Glisați din stânga ecranului pentru a afișa lansatorul care oferă acces "
82+"rapid la aplicații"
64
83
65−#: qml/Components/EdgeDemo.qml:227
84+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
85msgid "Well done"
67−msgstr ""
86+msgstr "Felicitări"
68
87
69−#: qml/Components/EdgeDemo.qml:228
88+#: qml/Components/EdgeDemo.qml:227
70msgid ""
89msgid ""
71"You have now mastered the edge gestures and can start using the "
90"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
91"phone<br><br>Tap on the screen to start"
73msgstr ""
92msgstr ""
93+"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"
74
95
75−#: qml/Components/Lockscreen.qml:214
96+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
97msgid "Emergency Call"
77−msgstr ""
98+msgstr "Apel de urgență"
78
99
79−#: qml/Components/Lockscreen.qml:231
100+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
101msgid "OK"
81−msgstr ""
102+msgstr "În regulă"
82
103
83−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
105#, qt-format
85msgid "Hello %1"
106msgid "Hello %1"
86−msgstr ""
107+msgstr "Salutări %1"
87
108
88−#: qml/Components/PassphraseLockscreen.qml:60
109+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
110msgid "Hello"
90−msgstr ""
111+msgstr "Salutări"
91
112
92#: qml/Components/PinLockscreen.qml:198
113#: qml/Components/PinLockscreen.qml:198
93msgid "CANCEL"
114msgid "CANCEL"
94−msgstr ""
115+msgstr "ANULEAZĂ"
95
116
96#: qml/Components/PinLockscreen.qml:216
117#: qml/Components/PinLockscreen.qml:216
97msgid "DONE"
118msgid "DONE"
98−msgstr ""
119+msgstr "EFECTUAT"
99
120
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
121+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
122msgid "See less"
106−msgstr ""
123+msgstr "Afișează mai puține"
107−
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111
124
112−#: qml/Dash/GenericScopeView.qml:330
125+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
126msgid "See all"
114−msgstr ""
127+msgstr "Afișează tot"
115
128
116#: qml/Dash/Previews/PreviewActionCombo.qml:34
129#: qml/Dash/Previews/PreviewActionCombo.qml:34
117msgid "More..."
130msgid "More..."
118−msgstr ""
131+msgstr "Mai mult ..."
119
132
120#: qml/Dash/Previews/PreviewActionCombo.qml:34
133#: qml/Dash/Previews/PreviewActionCombo.qml:34
121msgid "Less..."
134msgid "Less..."
122−msgstr ""
135+msgstr "Mai puțin..."
123
136
124#: qml/Dash/Previews/PreviewRatingInput.qml:81
137#: qml/Dash/Previews/PreviewRatingInput.qml:81
125msgid "Rate this"
138msgid "Rate this"
126−msgstr ""
139+msgstr "Evaluați"
127
140
128#: qml/Dash/Previews/PreviewRatingInput.qml:126
141#: qml/Dash/Previews/PreviewRatingInput.qml:126
129msgid "Add a review"
142msgid "Add a review"
130−msgstr ""
143+msgstr "Adăugați o recenzie"
131
144
132#: qml/Dash/Previews/PreviewRatingInput.qml:166
145#: qml/Dash/Previews/PreviewRatingInput.qml:166
133msgid "Send"
146msgid "Send"
134−msgstr ""
147+msgstr "Trimite"
148+
149+#: qml/Dash/ScopesOverview.qml:200
150+msgid "Manage Dash"
151+msgstr "Administrare Panou principal"
152+
153+#: qml/Dash/ScopesOverview.qml:405
154+msgid "Done"
155+msgstr "Finalizat"
156+
157+#: qml/Dash/ScopesOverview.qml:431
158+msgid "Store"
159+msgstr "Magazin"
160+
161+#: qml/Dash/ScopesOverviewTab.qml:36
162+msgid "Favorites"
163+msgstr "Favorite"
164+
165+#: qml/Dash/ScopesOverviewTab.qml:54
166+msgid "All"
167+msgstr "Tot"
135
168
136#: qml/Greeter/Greeter.qml:157
169#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
170msgid "Swipe to unlock"
138−msgstr ""
171+msgstr "Glisați pentru deblocare"
139
172
140#: qml/Hud/HudParametrizedActionsPage.qml:132
173#: qml/Hud/HudParametrizedActionsPage.qml:132
141msgid "Confirm"
174msgid "Confirm"
@@ -157,51 +190,59 @@ msgstr "Vorbiți acum..."
157msgid "Speaking..."
190msgid "Speaking..."
158msgstr "Vorbire..."
191msgstr "Vorbire..."
159
192
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
193+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
194msgid "Show password"
162−msgstr ""
195+msgstr "Arată parola"
163
196
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
197+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
198msgid "Please enter SIM PIN"
166−msgstr ""
199+msgstr "Introduceți PIN pentru SIM"
167
200
168#: qml/Panel/ActiveCallHint.qml:77
201#: qml/Panel/ActiveCallHint.qml:77
169msgid "Tap to return to call..."
202msgid "Tap to return to call..."
170−msgstr ""
203+msgstr "Atingeți pentru a vă întoarce la convorbire..."
171
204
172#: qml/Panel/ActiveCallHint.qml:90
205#: qml/Panel/ActiveCallHint.qml:90
173msgid "Conference"
206msgid "Conference"
174−msgstr ""
207+msgstr "Conferință"
175
208
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
209+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
210msgid "In queue…"
178−msgstr ""
211+msgstr "În așteptare..."
179
212
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
213+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
214msgid "Downloading"
182−msgstr ""
215+msgstr "Se descarcă"
183
216
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
217+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
218msgid "Paused, tap to resume"
186−msgstr ""
219+msgstr "În pauză, atingeți pentru a relua"
187
220
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
221+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
222msgid "Canceled"
190−msgstr ""
223+msgstr "Anulată"
191
224
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
225+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
226msgid "Finished"
194−msgstr ""
227+msgstr "Finalizată"
195
228
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
229+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
230msgid "Failed, tap to retry"
198−msgstr ""
231+msgstr "Eșec, atingeți pentru a încerca din nou"
232+
233+#: qml/Panel/Indicators/ModemInfoItem.qml:105
234+msgid "Unlock SIM"
235+msgstr "Deblocare SIM"
236+
237+#: qml/Panel/Indicators/RoamingIndication.qml:27
238+msgid "Roaming"
239+msgstr "Roaming"
199
240
200#: qml/Panel/SearchIndicator.qml:27
241#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
242msgid "Search"
202msgstr "Căutare"
243msgstr "Căutare"
203
244
204−#: qml/Shell.qml:359
245+#: qml/Shell.qml:256
205#, qt-format
246#, qt-format
206msgid "Please enter %1"
247msgid "Please enter %1"
207−msgstr ""
248+msgstr "Introduceți %1"
po/ru.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-01 07:14+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17141)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,52 +26,68 @@ msgstr "Закрепить ярлык"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Изъять ярлык"
27msgstr "Изъять ярлык"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Пропустить обучение"
47msgstr "Пропустить обучение"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Правый край"
51msgstr "Правый край"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40"Попробуйте переместить палец от правого края к левому для разблокировки "
56"Попробуйте переместить палец от правого края к левому для разблокировки "
41"устройства"
57"устройства"
42
58
43−#: qml/Components/EdgeDemo.qml:145
59+#: qml/Components/EdgeDemo.qml:144
44msgid "Top edge"
60msgid "Top edge"
45msgstr "Верхний край"
61msgstr "Верхний край"
46
62
47−#: qml/Components/EdgeDemo.qml:146
63+#: qml/Components/EdgeDemo.qml:145
48msgid "Try swiping from the top edge to access the indicators"
64msgid "Try swiping from the top edge to access the indicators"
49msgstr ""
65msgstr ""
50"Попробуйте переместить палец от верхнего края вниз для доступа к индикаторам"
66"Попробуйте переместить палец от верхнего края вниз для доступа к индикаторам"
51
67
52−#: qml/Components/EdgeDemo.qml:171
68+#: qml/Components/EdgeDemo.qml:170
53msgid "Close"
69msgid "Close"
54msgstr "Закрыть"
70msgstr "Закрыть"
55
71
56−#: qml/Components/EdgeDemo.qml:172
72+#: qml/Components/EdgeDemo.qml:171
57msgid "Swipe up again to close the settings screen"
73msgid "Swipe up again to close the settings screen"
58msgstr "Снова переместите палец вверх для закрытия экрана настроек"
74msgstr "Снова переместите палец вверх для закрытия экрана настроек"
59
75
60−#: qml/Components/EdgeDemo.qml:199
76+#: qml/Components/EdgeDemo.qml:198
61msgid "Left edge"
77msgid "Left edge"
62msgstr "Левый край"
78msgstr "Левый край"
63
79
64−#: qml/Components/EdgeDemo.qml:200
80+#: qml/Components/EdgeDemo.qml:199
65msgid "Swipe from the left to reveal the launcher for quick access to apps"
81msgid "Swipe from the left to reveal the launcher for quick access to apps"
66msgstr ""
82msgstr ""
67"Переместите палец от левого края вправо для открытия лаунчера для быстрого "
83"Переместите палец от левого края вправо для открытия лаунчера для быстрого "
68"доступа к приложениям"
84"доступа к приложениям"
69
85
70−#: qml/Components/EdgeDemo.qml:227
86+#: qml/Components/EdgeDemo.qml:226
71msgid "Well done"
87msgid "Well done"
72msgstr "Великолепно"
88msgstr "Великолепно"
73
89
74−#: qml/Components/EdgeDemo.qml:228
90+#: qml/Components/EdgeDemo.qml:227
75msgid ""
91msgid ""
76"You have now mastered the edge gestures and can start using the "
92"You have now mastered the edge gestures and can start using the "
77"phone<br><br>Tap on the screen to start"
93"phone<br><br>Tap on the screen to start"
@@ -79,20 +95,20 @@ msgstr ""
79"Вы научились пользоваться Ubuntu и можете начать использовать свой "
95"Вы научились пользоваться Ubuntu и можете начать использовать свой "
80"телефон<br><br>Нажмите на экран"
96"телефон<br><br>Нажмите на экран"
81
97
82−#: qml/Components/Lockscreen.qml:214
98+#: qml/Components/Lockscreen.qml:220
83msgid "Emergency Call"
99msgid "Emergency Call"
84msgstr "Экстренный вызов"
100msgstr "Экстренный вызов"
85
101
86−#: qml/Components/Lockscreen.qml:231
102+#: qml/Components/Lockscreen.qml:243
87msgid "OK"
103msgid "OK"
88msgstr "ОК"
104msgstr "ОК"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91#, qt-format
107#, qt-format
92msgid "Hello %1"
108msgid "Hello %1"
93msgstr "Привет, %1"
109msgstr "Привет, %1"
94
110
95−#: qml/Components/PassphraseLockscreen.qml:60
111+#: qml/Components/PassphraseLockscreen.qml:62
96msgid "Hello"
112msgid "Hello"
97msgstr "Привет"
113msgstr "Привет"
98
114
@@ -104,19 +120,11 @@ msgstr "ОТМЕНИТЬ"
104msgid "DONE"
120msgid "DONE"
105msgstr "ГОТОВО"
121msgstr "ГОТОВО"
106
122
107−#: qml/Components/SeeMore.qml:35
108−msgid "See more"
109−msgstr "Подробнее"
110−
111−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
112msgid "See less"
124msgid "See less"
113msgstr "Вкратце"
125msgstr "Вкратце"
114
126
115−#: qml/Dash/DashApps.qml:37
116−msgid "Recent"
117−msgstr "Недавние"
118−
119−#: qml/Dash/GenericScopeView.qml:330
127+#: qml/Dash/GenericScopeView.qml:358
120msgid "See all"
128msgid "See all"
121msgstr "Показать всё"
129msgstr "Показать всё"
122
130
@@ -140,6 +148,26 @@ msgstr "Добавьте отзыв"
140msgid "Send"
148msgid "Send"
141msgstr "Отправить"
149msgstr "Отправить"
142
150
151+#: qml/Dash/ScopesOverview.qml:200
152+msgid "Manage Dash"
153+msgstr ""
154+
155+#: qml/Dash/ScopesOverview.qml:405
156+msgid "Done"
157+msgstr ""
158+
159+#: qml/Dash/ScopesOverview.qml:431
160+msgid "Store"
161+msgstr ""
162+
163+#: qml/Dash/ScopesOverviewTab.qml:36
164+msgid "Favorites"
165+msgstr ""
166+
167+#: qml/Dash/ScopesOverviewTab.qml:54
168+msgid "All"
169+msgstr ""
170+
143#: qml/Greeter/Greeter.qml:157
171#: qml/Greeter/Greeter.qml:157
144msgid "Swipe to unlock"
172msgid "Swipe to unlock"
145msgstr "Смахните, чтобы разблокировать"
173msgstr "Смахните, чтобы разблокировать"
@@ -164,11 +192,11 @@ msgstr "Говорите..."
164msgid "Speaking..."
192msgid "Speaking..."
165msgstr "Говорите..."
193msgstr "Говорите..."
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:91
195+#: qml/Notifications/NotificationMenuItemFactory.qml:100
168msgid "Show password"
196msgid "Show password"
169msgstr "Показать пароль"
197msgstr "Показать пароль"
170
198
171−#: qml/Notifications/NotificationMenuItemFactory.qml:103
199+#: qml/Notifications/NotificationMenuItemFactory.qml:115
172msgid "Please enter SIM PIN"
200msgid "Please enter SIM PIN"
173msgstr "Введите PIN код"
201msgstr "Введите PIN код"
174
202
@@ -180,35 +208,43 @@ msgstr "Коснитесь для возврата к вызову..."
180msgid "Conference"
208msgid "Conference"
181msgstr "Конференция"
209msgstr "Конференция"
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:583
211+#: qml/Panel/Indicators/MenuItemFactory.qml:651
184msgid "In queue…"
212msgid "In queue…"
185msgstr "В очереди..."
213msgstr "В очереди..."
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:587
215+#: qml/Panel/Indicators/MenuItemFactory.qml:655
188msgid "Downloading"
216msgid "Downloading"
189msgstr "Загрузка"
217msgstr "Загрузка"
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:589
219+#: qml/Panel/Indicators/MenuItemFactory.qml:657
192msgid "Paused, tap to resume"
220msgid "Paused, tap to resume"
193msgstr "Приостановлено, коснитесь для возобновления"
221msgstr "Приостановлено, коснитесь для возобновления"
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:591
223+#: qml/Panel/Indicators/MenuItemFactory.qml:659
196msgid "Canceled"
224msgid "Canceled"
197msgstr "Отменено"
225msgstr "Отменено"
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:593
227+#: qml/Panel/Indicators/MenuItemFactory.qml:661
200msgid "Finished"
228msgid "Finished"
201msgstr "Завершено"
229msgstr "Завершено"
202
230
203−#: qml/Panel/Indicators/MenuItemFactory.qml:595
231+#: qml/Panel/Indicators/MenuItemFactory.qml:663
204msgid "Failed, tap to retry"
232msgid "Failed, tap to retry"
205msgstr "Сбой, коснитесь для повтора"
233msgstr "Сбой, коснитесь для повтора"
206
234
235+#: qml/Panel/Indicators/ModemInfoItem.qml:105
236+msgid "Unlock SIM"
237+msgstr ""
238+
239+#: qml/Panel/Indicators/RoamingIndication.qml:27
240+msgid "Roaming"
241+msgstr ""
242+
207#: qml/Panel/SearchIndicator.qml:27
243#: qml/Panel/SearchIndicator.qml:27
208msgid "Search"
244msgid "Search"
209msgstr "Поиск"
245msgstr "Поиск"
210
246
211−#: qml/Shell.qml:359
247+#: qml/Shell.qml:256
212#, qt-format
248#, qt-format
213msgid "Please enter %1"
249msgid "Please enter %1"
214msgstr "Пожалуйста, введите %1"
250msgstr "Пожалуйста, введите %1"
po/shn.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr ""
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr ""
186msgstr ""
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr ""
238msgstr ""
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/si.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr ""
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr ""
186msgstr ""
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr ""
238msgstr ""
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/sl.po+25−25
@@ -6,17 +6,16 @@
6msgid ""
6msgid ""
7msgstr ""
7msgstr ""
8"Project-Id-Version: unity\n"
8"Project-Id-Version: unity\n"
9−"Report-Msgid-Bugs-To: \n"
9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10−"POT-Creation-Date: 2014-08-05 19:54+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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−"Language: sl\n"
15"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
16"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
17"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
18−"X-Launchpad-Export-Date: 2014-08-07 06:27+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
19−"X-Generator: Launchpad (build 17147)\n"
18+"X-Generator: Launchpad (build 17156)\n"
20
19
21#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
22#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -118,15 +117,11 @@ msgstr "PREKLIČI"
118msgid "DONE"
117msgid "DONE"
119msgstr "KONČANO"
118msgstr "KONČANO"
120
119
121−#: qml/Components/SeeMore.qml:35
122−msgid "See more"
123−msgstr "Pokaži več"
124−
125−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:354
120+#: qml/Dash/GenericScopeView.qml:358
126msgid "See less"
121msgid "See less"
127msgstr "Pokaži manj"
122msgstr "Pokaži manj"
128
123
129−#: qml/Dash/GenericScopeView.qml:354
124+#: qml/Dash/GenericScopeView.qml:358
130msgid "See all"
125msgid "See all"
131msgstr "Ogled vsega"
126msgstr "Ogled vsega"
132
127
@@ -150,15 +145,15 @@ msgstr "Dodaj oceno"
150msgid "Send"
145msgid "Send"
151msgstr "Pošlji"
146msgstr "Pošlji"
152
147
153−#: qml/Dash/ScopesOverview.qml:187
148+#: qml/Dash/ScopesOverview.qml:200
154msgid "Manage Dash"
149msgid "Manage Dash"
155msgstr ""
150msgstr ""
156
151
157−#: qml/Dash/ScopesOverview.qml:392
152+#: qml/Dash/ScopesOverview.qml:405
158msgid "Done"
153msgid "Done"
159msgstr ""
154msgstr ""
160
155
161−#: qml/Dash/ScopesOverview.qml:418
156+#: qml/Dash/ScopesOverview.qml:431
162msgid "Store"
157msgid "Store"
163msgstr ""
158msgstr ""
164
159
@@ -194,11 +189,11 @@ msgstr "Govorite zdaj ..."
194msgid "Speaking..."
189msgid "Speaking..."
195msgstr "Govorjenje ..."
190msgstr "Govorjenje ..."
196
191
197−#: qml/Notifications/NotificationMenuItemFactory.qml:97
192+#: qml/Notifications/NotificationMenuItemFactory.qml:100
198msgid "Show password"
193msgid "Show password"
199msgstr "Pokaži geslo"
194msgstr "Pokaži geslo"
200
195
201−#: qml/Notifications/NotificationMenuItemFactory.qml:112
196+#: qml/Notifications/NotificationMenuItemFactory.qml:115
202msgid "Please enter SIM PIN"
197msgid "Please enter SIM PIN"
203msgstr "Vnesite PIN kartice SIM"
198msgstr "Vnesite PIN kartice SIM"
204
199
@@ -210,30 +205,38 @@ msgstr "Tapnite za vrnitev v klic ..."
210msgid "Conference"
205msgid "Conference"
211msgstr "Konferenca"
206msgstr "Konferenca"
212
207
213−#: qml/Panel/Indicators/MenuItemFactory.qml:577
208+#: qml/Panel/Indicators/MenuItemFactory.qml:651
214msgid "In queue…"
209msgid "In queue…"
215msgstr "V vrsti ..."
210msgstr "V vrsti ..."
216
211
217−#: qml/Panel/Indicators/MenuItemFactory.qml:581
212+#: qml/Panel/Indicators/MenuItemFactory.qml:655
218msgid "Downloading"
213msgid "Downloading"
219msgstr "Prejemanje"
214msgstr "Prejemanje"
220
215
221−#: qml/Panel/Indicators/MenuItemFactory.qml:583
216+#: qml/Panel/Indicators/MenuItemFactory.qml:657
222msgid "Paused, tap to resume"
217msgid "Paused, tap to resume"
223msgstr "Premor, tapnite za nadaljevanje"
218msgstr "Premor, tapnite za nadaljevanje"
224
219
225−#: qml/Panel/Indicators/MenuItemFactory.qml:585
220+#: qml/Panel/Indicators/MenuItemFactory.qml:659
226msgid "Canceled"
221msgid "Canceled"
227msgstr "Preklicano"
222msgstr "Preklicano"
228
223
229−#: qml/Panel/Indicators/MenuItemFactory.qml:587
224+#: qml/Panel/Indicators/MenuItemFactory.qml:661
230msgid "Finished"
225msgid "Finished"
231msgstr "Končano"
226msgstr "Končano"
232
227
233−#: qml/Panel/Indicators/MenuItemFactory.qml:589
228+#: qml/Panel/Indicators/MenuItemFactory.qml:663
234msgid "Failed, tap to retry"
229msgid "Failed, tap to retry"
235msgstr "Spodletelo, tapnite za ponovni poskus"
230msgstr "Spodletelo, tapnite za ponovni poskus"
236
231
232+#: qml/Panel/Indicators/ModemInfoItem.qml:105
233+msgid "Unlock SIM"
234+msgstr ""
235+
236+#: qml/Panel/Indicators/RoamingIndication.qml:27
237+msgid "Roaming"
238+msgstr ""
239+
237#: qml/Panel/SearchIndicator.qml:27
240#: qml/Panel/SearchIndicator.qml:27
238msgid "Search"
241msgid "Search"
239msgstr "Iskanje"
242msgstr "Iskanje"
@@ -242,6 +245,3 @@ msgstr "Iskanje"
242#, qt-format
245#, qt-format
243msgid "Please enter %1"
246msgid "Please enter %1"
244msgstr "Vnesite %1"
247msgstr "Vnesite %1"
245−
246−#~ msgid "Recent"
247−#~ msgstr "Nedavno"
po/sq.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:43+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,67 +26,83 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Cepi djathtas"
51msgstr "Cepi djathtas"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Cepi i sipërm"
59msgstr "Cepi i sipërm"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48"Përpiqu te fërkosh gishtin prej cepit të sipërm për te zhblokuar telefonin"
64"Përpiqu te fërkosh gishtin prej cepit të sipërm për te zhblokuar telefonin"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "Mbylle"
68msgstr "Mbylle"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr ""
72msgstr ""
57
73
58−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
59msgid "Left edge"
75msgid "Left edge"
60msgstr "Cepi majtas"
76msgstr "Cepi majtas"
61
77
62−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
64msgstr ""
80msgstr ""
65
81
66−#: qml/Components/EdgeDemo.qml:227
82+#: qml/Components/EdgeDemo.qml:226
67msgid "Well done"
83msgid "Well done"
68msgstr "Shumë mirë"
84msgstr "Shumë mirë"
69
85
70−#: qml/Components/EdgeDemo.qml:228
86+#: qml/Components/EdgeDemo.qml:227
71msgid ""
87msgid ""
72"You have now mastered the edge gestures and can start using the "
88"You have now mastered the edge gestures and can start using the "
73"phone<br><br>Tap on the screen to start"
89"phone<br><br>Tap on the screen to start"
74msgstr ""
90msgstr ""
75
91
76−#: qml/Components/Lockscreen.qml:214
92+#: qml/Components/Lockscreen.qml:220
77msgid "Emergency Call"
93msgid "Emergency Call"
78msgstr ""
94msgstr ""
79
95
80−#: qml/Components/Lockscreen.qml:231
96+#: qml/Components/Lockscreen.qml:243
81msgid "OK"
97msgid "OK"
82msgstr ""
98msgstr ""
83
99
84−#: qml/Components/PassphraseLockscreen.qml:60
100+#: qml/Components/PassphraseLockscreen.qml:62
85#, qt-format
101#, qt-format
86msgid "Hello %1"
102msgid "Hello %1"
87msgstr ""
103msgstr ""
88
104
89−#: qml/Components/PassphraseLockscreen.qml:60
105+#: qml/Components/PassphraseLockscreen.qml:62
90msgid "Hello"
106msgid "Hello"
91msgstr ""
107msgstr ""
92
108
@@ -98,19 +114,11 @@ msgstr ""
98msgid "DONE"
114msgid "DONE"
99msgstr ""
115msgstr ""
100
116
101−#: qml/Components/SeeMore.qml:35
102−msgid "See more"
103−msgstr ""
104−
105−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
117+#: qml/Dash/GenericScopeView.qml:358
106msgid "See less"
118msgid "See less"
107msgstr ""
119msgstr ""
108
120
109−#: qml/Dash/DashApps.qml:37
110−msgid "Recent"
111−msgstr ""
112−
113−#: qml/Dash/GenericScopeView.qml:330
121+#: qml/Dash/GenericScopeView.qml:358
114msgid "See all"
122msgid "See all"
115msgstr ""
123msgstr ""
116
124
@@ -134,6 +142,26 @@ msgstr "Shto një rishikim"
134msgid "Send"
142msgid "Send"
135msgstr ""
143msgstr ""
136
144
145+#: qml/Dash/ScopesOverview.qml:200
146+msgid "Manage Dash"
147+msgstr ""
148+
149+#: qml/Dash/ScopesOverview.qml:405
150+msgid "Done"
151+msgstr ""
152+
153+#: qml/Dash/ScopesOverview.qml:431
154+msgid "Store"
155+msgstr ""
156+
157+#: qml/Dash/ScopesOverviewTab.qml:36
158+msgid "Favorites"
159+msgstr ""
160+
161+#: qml/Dash/ScopesOverviewTab.qml:54
162+msgid "All"
163+msgstr ""
164+
137#: qml/Greeter/Greeter.qml:157
165#: qml/Greeter/Greeter.qml:157
138msgid "Swipe to unlock"
166msgid "Swipe to unlock"
139msgstr ""
167msgstr ""
@@ -158,11 +186,11 @@ msgstr ""
158msgid "Speaking..."
186msgid "Speaking..."
159msgstr ""
187msgstr ""
160
188
161−#: qml/Notifications/NotificationMenuItemFactory.qml:91
189+#: qml/Notifications/NotificationMenuItemFactory.qml:100
162msgid "Show password"
190msgid "Show password"
163msgstr ""
191msgstr ""
164
192
165−#: qml/Notifications/NotificationMenuItemFactory.qml:103
193+#: qml/Notifications/NotificationMenuItemFactory.qml:115
166msgid "Please enter SIM PIN"
194msgid "Please enter SIM PIN"
167msgstr ""
195msgstr ""
168
196
@@ -174,35 +202,43 @@ msgstr ""
174msgid "Conference"
202msgid "Conference"
175msgstr ""
203msgstr ""
176
204
177−#: qml/Panel/Indicators/MenuItemFactory.qml:583
205+#: qml/Panel/Indicators/MenuItemFactory.qml:651
178msgid "In queue…"
206msgid "In queue…"
179msgstr ""
207msgstr ""
180
208
181−#: qml/Panel/Indicators/MenuItemFactory.qml:587
209+#: qml/Panel/Indicators/MenuItemFactory.qml:655
182msgid "Downloading"
210msgid "Downloading"
183msgstr ""
211msgstr ""
184
212
185−#: qml/Panel/Indicators/MenuItemFactory.qml:589
213+#: qml/Panel/Indicators/MenuItemFactory.qml:657
186msgid "Paused, tap to resume"
214msgid "Paused, tap to resume"
187msgstr ""
215msgstr ""
188
216
189−#: qml/Panel/Indicators/MenuItemFactory.qml:591
217+#: qml/Panel/Indicators/MenuItemFactory.qml:659
190msgid "Canceled"
218msgid "Canceled"
191msgstr ""
219msgstr ""
192
220
193−#: qml/Panel/Indicators/MenuItemFactory.qml:593
221+#: qml/Panel/Indicators/MenuItemFactory.qml:661
194msgid "Finished"
222msgid "Finished"
195msgstr ""
223msgstr ""
196
224
197−#: qml/Panel/Indicators/MenuItemFactory.qml:595
225+#: qml/Panel/Indicators/MenuItemFactory.qml:663
198msgid "Failed, tap to retry"
226msgid "Failed, tap to retry"
199msgstr ""
227msgstr ""
200
228
229+#: qml/Panel/Indicators/ModemInfoItem.qml:105
230+msgid "Unlock SIM"
231+msgstr ""
232+
233+#: qml/Panel/Indicators/RoamingIndication.qml:27
234+msgid "Roaming"
235+msgstr ""
236+
201#: qml/Panel/SearchIndicator.qml:27
237#: qml/Panel/SearchIndicator.qml:27
202msgid "Search"
238msgid "Search"
203msgstr ""
239msgstr ""
204
240
205−#: qml/Shell.qml:359
241+#: qml/Shell.qml:256
206#, qt-format
242#, qt-format
207msgid "Please enter %1"
243msgid "Please enter %1"
208msgstr ""
244msgstr ""
po/sr.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr "Изговорите сада..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "Говор..."
186msgstr "Говор..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "Претрага"
238msgstr "Претрага"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/sv.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11"PO-Revision-Date: 2014-07-31 08:10+0000\n"
11"PO-Revision-Date: 2014-07-31 08:10+0000\n"
12"Last-Translator: Peter Hultqvist <phq@silentorbit.com>\n"
12"Last-Translator: Peter Hultqvist <phq@silentorbit.com>\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-01 07:14+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17141)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19"Language: sv\n"
19"Language: sv\n"
20
20
21#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -27,47 +27,63 @@ msgstr "Fäst genväg"
27msgid "Unpin shortcut"
27msgid "Unpin shortcut"
28msgstr "Släpp genväg"
28msgstr "Släpp genväg"
29
29
30+#: qml/Components/Dialogs.qml:142
31+msgid "Are you sure you would like to turn power off?"
32+msgstr ""
33+
34+#: qml/Components/Dialogs.qml:144
35+msgid "Power off"
36+msgstr ""
37+
38+#: qml/Components/Dialogs.qml:153
39+msgid "Restart"
40+msgstr ""
41+
42+#: qml/Components/Dialogs.qml:162
43+msgid "Cancel"
44+msgstr ""
45+
30#: qml/Components/EdgeDemoOverlay.qml:151
46#: qml/Components/EdgeDemoOverlay.qml:151
31msgid "Skip intro"
47msgid "Skip intro"
32msgstr "Hoppa över introduktion"
48msgstr "Hoppa över introduktion"
33
49
34−#: qml/Components/EdgeDemo.qml:113
50+#: qml/Components/EdgeDemo.qml:112
35msgid "Right edge"
51msgid "Right edge"
36msgstr "Högerkant"
52msgstr "Högerkant"
37
53
38−#: qml/Components/EdgeDemo.qml:114
54+#: qml/Components/EdgeDemo.qml:113
39msgid "Try swiping from the right edge to unlock the phone"
55msgid "Try swiping from the right edge to unlock the phone"
40msgstr "Svep från höger för att låsa upp telefonen"
56msgstr "Svep från höger för att låsa upp telefonen"
41
57
42−#: qml/Components/EdgeDemo.qml:145
58+#: qml/Components/EdgeDemo.qml:144
43msgid "Top edge"
59msgid "Top edge"
44msgstr "Överkant"
60msgstr "Överkant"
45
61
46−#: qml/Components/EdgeDemo.qml:146
62+#: qml/Components/EdgeDemo.qml:145
47msgid "Try swiping from the top edge to access the indicators"
63msgid "Try swiping from the top edge to access the indicators"
48msgstr "Svep från överkanten för att komma åt indikatorerna"
64msgstr "Svep från överkanten för att komma åt indikatorerna"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "Stäng"
68msgstr "Stäng"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr "Svep upp igen för att stänga inställningsfönstret"
72msgstr "Svep upp igen för att stänga inställningsfönstret"
57
73
58−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
59msgid "Left edge"
75msgid "Left edge"
60msgstr "Vänsterkant"
76msgstr "Vänsterkant"
61
77
62−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
64msgstr "Svep från vänster för att visa programstartaren"
80msgstr "Svep från vänster för att visa programstartaren"
65
81
66−#: qml/Components/EdgeDemo.qml:227
82+#: qml/Components/EdgeDemo.qml:226
67msgid "Well done"
83msgid "Well done"
68msgstr "Bra gjort"
84msgstr "Bra gjort"
69
85
70−#: qml/Components/EdgeDemo.qml:228
86+#: qml/Components/EdgeDemo.qml:227
71msgid ""
87msgid ""
72"You have now mastered the edge gestures and can start using the "
88"You have now mastered the edge gestures and can start using the "
73"phone<br><br>Tap on the screen to start"
89"phone<br><br>Tap on the screen to start"
@@ -75,20 +91,20 @@ msgstr ""
75"Du har nu bemästrat kantgesterna och kan börja använda "
91"Du har nu bemästrat kantgesterna och kan börja använda "
76"telefonen<br><br>Tryck på skärmen för att starta"
92"telefonen<br><br>Tryck på skärmen för att starta"
77
93
78−#: qml/Components/Lockscreen.qml:214
94+#: qml/Components/Lockscreen.qml:220
79msgid "Emergency Call"
95msgid "Emergency Call"
80msgstr "Nödsamtal"
96msgstr "Nödsamtal"
81
97
82−#: qml/Components/Lockscreen.qml:231
98+#: qml/Components/Lockscreen.qml:243
83msgid "OK"
99msgid "OK"
84msgstr "Ok"
100msgstr "Ok"
85
101
86−#: qml/Components/PassphraseLockscreen.qml:60
102+#: qml/Components/PassphraseLockscreen.qml:62
87#, qt-format
103#, qt-format
88msgid "Hello %1"
104msgid "Hello %1"
89msgstr "Hej %1"
105msgstr "Hej %1"
90
106
91−#: qml/Components/PassphraseLockscreen.qml:60
107+#: qml/Components/PassphraseLockscreen.qml:62
92msgid "Hello"
108msgid "Hello"
93msgstr "Hej"
109msgstr "Hej"
94
110
@@ -100,19 +116,11 @@ msgstr "AVBRYT"
100msgid "DONE"
116msgid "DONE"
101msgstr "KLAR"
117msgstr "KLAR"
102
118
103−#: qml/Components/SeeMore.qml:35
104−msgid "See more"
105−msgstr "Visa mer"
106−
107−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
119+#: qml/Dash/GenericScopeView.qml:358
108msgid "See less"
120msgid "See less"
109msgstr "Visa mindre"
121msgstr "Visa mindre"
110
122
111−#: qml/Dash/DashApps.qml:37
112−msgid "Recent"
113−msgstr "Senaste"
114−
115−#: qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
116msgid "See all"
124msgid "See all"
117msgstr "Visa alla"
125msgstr "Visa alla"
118
126
@@ -136,6 +144,26 @@ msgstr "Lägg till en recension"
136msgid "Send"
144msgid "Send"
137msgstr "Skicka"
145msgstr "Skicka"
138
146
147+#: qml/Dash/ScopesOverview.qml:200
148+msgid "Manage Dash"
149+msgstr ""
150+
151+#: qml/Dash/ScopesOverview.qml:405
152+msgid "Done"
153+msgstr ""
154+
155+#: qml/Dash/ScopesOverview.qml:431
156+msgid "Store"
157+msgstr ""
158+
159+#: qml/Dash/ScopesOverviewTab.qml:36
160+msgid "Favorites"
161+msgstr ""
162+
163+#: qml/Dash/ScopesOverviewTab.qml:54
164+msgid "All"
165+msgstr ""
166+
139#: qml/Greeter/Greeter.qml:157
167#: qml/Greeter/Greeter.qml:157
140msgid "Swipe to unlock"
168msgid "Swipe to unlock"
141msgstr "Svep för att låsa upp"
169msgstr "Svep för att låsa upp"
@@ -160,11 +188,11 @@ msgstr "Tala nu…"
160msgid "Speaking..."
188msgid "Speaking..."
161msgstr "Talar…"
189msgstr "Talar…"
162
190
163−#: qml/Notifications/NotificationMenuItemFactory.qml:91
191+#: qml/Notifications/NotificationMenuItemFactory.qml:100
164msgid "Show password"
192msgid "Show password"
165msgstr "Visa lösenord"
193msgstr "Visa lösenord"
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:103
195+#: qml/Notifications/NotificationMenuItemFactory.qml:115
168msgid "Please enter SIM PIN"
196msgid "Please enter SIM PIN"
169msgstr "Ange SIM PIN-kod"
197msgstr "Ange SIM PIN-kod"
170
198
@@ -176,35 +204,43 @@ msgstr "Tryck för att återgå till samtal..."
176msgid "Conference"
204msgid "Conference"
177msgstr "Konferens"
205msgstr "Konferens"
178
206
179−#: qml/Panel/Indicators/MenuItemFactory.qml:583
207+#: qml/Panel/Indicators/MenuItemFactory.qml:651
180msgid "In queue…"
208msgid "In queue…"
181msgstr "I kö…"
209msgstr "I kö…"
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:587
211+#: qml/Panel/Indicators/MenuItemFactory.qml:655
184msgid "Downloading"
212msgid "Downloading"
185msgstr "Hämtar"
213msgstr "Hämtar"
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:589
215+#: qml/Panel/Indicators/MenuItemFactory.qml:657
188msgid "Paused, tap to resume"
216msgid "Paused, tap to resume"
189msgstr "Pausad, tryck för att fortsätta"
217msgstr "Pausad, tryck för att fortsätta"
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:591
219+#: qml/Panel/Indicators/MenuItemFactory.qml:659
192msgid "Canceled"
220msgid "Canceled"
193msgstr "Avbröt"
221msgstr "Avbröt"
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:593
223+#: qml/Panel/Indicators/MenuItemFactory.qml:661
196msgid "Finished"
224msgid "Finished"
197msgstr "Klart"
225msgstr "Klart"
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:595
227+#: qml/Panel/Indicators/MenuItemFactory.qml:663
200msgid "Failed, tap to retry"
228msgid "Failed, tap to retry"
201msgstr "Misslyckades, tryck för att försöka igen"
229msgstr "Misslyckades, tryck för att försöka igen"
202
230
231+#: qml/Panel/Indicators/ModemInfoItem.qml:105
232+msgid "Unlock SIM"
233+msgstr ""
234+
235+#: qml/Panel/Indicators/RoamingIndication.qml:27
236+msgid "Roaming"
237+msgstr ""
238+
203#: qml/Panel/SearchIndicator.qml:27
239#: qml/Panel/SearchIndicator.qml:27
204msgid "Search"
240msgid "Search"
205msgstr "Sök"
241msgstr "Sök"
206
242
207−#: qml/Shell.qml:359
243+#: qml/Shell.qml:256
208#, qt-format
244#, qt-format
209msgid "Please enter %1"
245msgid "Please enter %1"
210msgstr "Vänligen fyll i %1"
246msgstr "Vänligen fyll i %1"
po/sw.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Funga"
67msgstr "Funga"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr "Tuma"
142msgstr "Tuma"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr ""
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr ""
186msgstr ""
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "Tafuta"
238msgstr "Tafuta"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/ta.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19"Language: ta\n"
19"Language: ta\n"
20
20
21#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -27,68 +27,84 @@ msgstr ""
27msgid "Unpin shortcut"
27msgid "Unpin shortcut"
28msgstr ""
28msgstr ""
29
29
30+#: qml/Components/Dialogs.qml:142
31+msgid "Are you sure you would like to turn power off?"
32+msgstr ""
33+
34+#: qml/Components/Dialogs.qml:144
35+msgid "Power off"
36+msgstr ""
37+
38+#: qml/Components/Dialogs.qml:153
39+msgid "Restart"
40+msgstr ""
41+
42+#: qml/Components/Dialogs.qml:162
43+msgid "Cancel"
44+msgstr ""
45+
30#: qml/Components/EdgeDemoOverlay.qml:151
46#: qml/Components/EdgeDemoOverlay.qml:151
31msgid "Skip intro"
47msgid "Skip intro"
32msgstr "அறிமுகத்தை தவிர்"
48msgstr "அறிமுகத்தை தவிர்"
33
49
34−#: qml/Components/EdgeDemo.qml:113
50+#: qml/Components/EdgeDemo.qml:112
35msgid "Right edge"
51msgid "Right edge"
36msgstr "வலது விளிம்பு"
52msgstr "வலது விளிம்பு"
37
53
38−#: qml/Components/EdgeDemo.qml:114
54+#: qml/Components/EdgeDemo.qml:113
39msgid "Try swiping from the right edge to unlock the phone"
55msgid "Try swiping from the right edge to unlock the phone"
40msgstr "தொலைபேசியை திறக்க வலது முனையிலிருந்து தேய்த்து முயற்சி செய்"
56msgstr "தொலைபேசியை திறக்க வலது முனையிலிருந்து தேய்த்து முயற்சி செய்"
41
57
42−#: qml/Components/EdgeDemo.qml:145
58+#: qml/Components/EdgeDemo.qml:144
43msgid "Top edge"
59msgid "Top edge"
44msgstr "மேல் விளிம்பு"
60msgstr "மேல் விளிம்பு"
45
61
46−#: qml/Components/EdgeDemo.qml:146
62+#: qml/Components/EdgeDemo.qml:145
47msgid "Try swiping from the top edge to access the indicators"
63msgid "Try swiping from the top edge to access the indicators"
48msgstr "காட்டிகளை அனுக மேல் விளிம்பிலிருந்து தேய்த்து முயற்சி செய்"
64msgstr "காட்டிகளை அனுக மேல் விளிம்பிலிருந்து தேய்த்து முயற்சி செய்"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "மூடு"
68msgstr "மூடு"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr "அமைவுகளின் திரையை மூட மறுபடியும் மேலே தேய்க்கவும்"
72msgstr "அமைவுகளின் திரையை மூட மறுபடியும் மேலே தேய்க்கவும்"
57
73
58−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
59msgid "Left edge"
75msgid "Left edge"
60msgstr "இடது விளிம்பு"
76msgstr "இடது விளிம்பு"
61
77
62−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
64msgstr ""
80msgstr ""
65"பயன்பாடுகளின் விரைவான அணுகலை பெறத்தேவையான தொடக்கியை இடமிருந்து தேய்த்தால் "
81"பயன்பாடுகளின் விரைவான அணுகலை பெறத்தேவையான தொடக்கியை இடமிருந்து தேய்த்தால் "
66"வெளிப்படும்"
82"வெளிப்படும்"
67
83
68−#: qml/Components/EdgeDemo.qml:227
84+#: qml/Components/EdgeDemo.qml:226
69msgid "Well done"
85msgid "Well done"
70msgstr "நன்றாக செய்தீர்கள்"
86msgstr "நன்றாக செய்தீர்கள்"
71
87
72−#: qml/Components/EdgeDemo.qml:228
88+#: qml/Components/EdgeDemo.qml:227
73msgid ""
89msgid ""
74"You have now mastered the edge gestures and can start using the "
90"You have now mastered the edge gestures and can start using the "
75"phone<br><br>Tap on the screen to start"
91"phone<br><br>Tap on the screen to start"
76msgstr ""
92msgstr ""
77
93
78−#: qml/Components/Lockscreen.qml:214
94+#: qml/Components/Lockscreen.qml:220
79msgid "Emergency Call"
95msgid "Emergency Call"
80msgstr "அவசர அழைப்பு"
96msgstr "அவசர அழைப்பு"
81
97
82−#: qml/Components/Lockscreen.qml:231
98+#: qml/Components/Lockscreen.qml:243
83msgid "OK"
99msgid "OK"
84msgstr ""
100msgstr ""
85
101
86−#: qml/Components/PassphraseLockscreen.qml:60
102+#: qml/Components/PassphraseLockscreen.qml:62
87#, qt-format
103#, qt-format
88msgid "Hello %1"
104msgid "Hello %1"
89msgstr "வணக்கம் %1"
105msgstr "வணக்கம் %1"
90
106
91−#: qml/Components/PassphraseLockscreen.qml:60
107+#: qml/Components/PassphraseLockscreen.qml:62
92msgid "Hello"
108msgid "Hello"
93msgstr "வணக்கம்"
109msgstr "வணக்கம்"
94
110
@@ -100,19 +116,11 @@ msgstr ""
100msgid "DONE"
116msgid "DONE"
101msgstr ""
117msgstr ""
102
118
103−#: qml/Components/SeeMore.qml:35
104−msgid "See more"
105−msgstr ""
106−
107−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
119+#: qml/Dash/GenericScopeView.qml:358
108msgid "See less"
120msgid "See less"
109msgstr ""
121msgstr ""
110
122
111−#: qml/Dash/DashApps.qml:37
112−msgid "Recent"
113−msgstr ""
114−
115−#: qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
116msgid "See all"
124msgid "See all"
117msgstr ""
125msgstr ""
118
126
@@ -136,6 +144,26 @@ msgstr "ஒரு பரிசீலனையை சேர்"
136msgid "Send"
144msgid "Send"
137msgstr "அனுப்பு"
145msgstr "அனுப்பு"
138
146
147+#: qml/Dash/ScopesOverview.qml:200
148+msgid "Manage Dash"
149+msgstr ""
150+
151+#: qml/Dash/ScopesOverview.qml:405
152+msgid "Done"
153+msgstr ""
154+
155+#: qml/Dash/ScopesOverview.qml:431
156+msgid "Store"
157+msgstr ""
158+
159+#: qml/Dash/ScopesOverviewTab.qml:36
160+msgid "Favorites"
161+msgstr ""
162+
163+#: qml/Dash/ScopesOverviewTab.qml:54
164+msgid "All"
165+msgstr ""
166+
139#: qml/Greeter/Greeter.qml:157
167#: qml/Greeter/Greeter.qml:157
140msgid "Swipe to unlock"
168msgid "Swipe to unlock"
141msgstr ""
169msgstr ""
@@ -160,11 +188,11 @@ msgstr "இப்பொது பேசு..."
160msgid "Speaking..."
188msgid "Speaking..."
161msgstr "பேசுகிறது..."
189msgstr "பேசுகிறது..."
162
190
163−#: qml/Notifications/NotificationMenuItemFactory.qml:91
191+#: qml/Notifications/NotificationMenuItemFactory.qml:100
164msgid "Show password"
192msgid "Show password"
165msgstr ""
193msgstr ""
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:103
195+#: qml/Notifications/NotificationMenuItemFactory.qml:115
168msgid "Please enter SIM PIN"
196msgid "Please enter SIM PIN"
169msgstr ""
197msgstr ""
170
198
@@ -176,35 +204,43 @@ msgstr ""
176msgid "Conference"
204msgid "Conference"
177msgstr ""
205msgstr ""
178
206
179−#: qml/Panel/Indicators/MenuItemFactory.qml:583
207+#: qml/Panel/Indicators/MenuItemFactory.qml:651
180msgid "In queue…"
208msgid "In queue…"
181msgstr ""
209msgstr ""
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:587
211+#: qml/Panel/Indicators/MenuItemFactory.qml:655
184msgid "Downloading"
212msgid "Downloading"
185msgstr ""
213msgstr ""
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:589
215+#: qml/Panel/Indicators/MenuItemFactory.qml:657
188msgid "Paused, tap to resume"
216msgid "Paused, tap to resume"
189msgstr ""
217msgstr ""
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:591
219+#: qml/Panel/Indicators/MenuItemFactory.qml:659
192msgid "Canceled"
220msgid "Canceled"
193msgstr ""
221msgstr ""
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:593
223+#: qml/Panel/Indicators/MenuItemFactory.qml:661
196msgid "Finished"
224msgid "Finished"
197msgstr ""
225msgstr ""
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:595
227+#: qml/Panel/Indicators/MenuItemFactory.qml:663
200msgid "Failed, tap to retry"
228msgid "Failed, tap to retry"
201msgstr ""
229msgstr ""
202
230
231+#: qml/Panel/Indicators/ModemInfoItem.qml:105
232+msgid "Unlock SIM"
233+msgstr ""
234+
235+#: qml/Panel/Indicators/RoamingIndication.qml:27
236+msgid "Roaming"
237+msgstr ""
238+
203#: qml/Panel/SearchIndicator.qml:27
239#: qml/Panel/SearchIndicator.qml:27
204msgid "Search"
240msgid "Search"
205msgstr "தெடு"
241msgstr "தெடு"
206
242
207−#: qml/Shell.qml:359
243+#: qml/Shell.qml:256
208#, qt-format
244#, qt-format
209msgid "Please enter %1"
245msgid "Please enter %1"
210msgstr "தயவுச்செய்து %1 உள்ளிடு"
246msgstr "தயவுச்செய்து %1 உள்ளிடு"
po/te.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "పరిచయాన్ని దాటవేయి"
47msgstr "పరిచయాన్ని దాటవేయి"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "కుడి అంచు"
51msgstr "కుడి అంచు"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "ఫోను తాళంతీయుటకు కుడి అంచు నుండి స్వైప్ చేయ ప్రయత్నించండి"
55msgstr "ఫోను తాళంతీయుటకు కుడి అంచు నుండి స్వైప్ చేయ ప్రయత్నించండి"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "పై అంచు"
59msgstr "పై అంచు"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "మూసివేయి"
67msgstr "మూసివేయి"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "అమరికల తెరను మూసివేయుటకు మరలా పైకి స్వైప్ చేయండి"
71msgstr "అమరికల తెరను మూసివేయుటకు మరలా పైకి స్వైప్ చేయండి"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "ఎడమ అంచు"
75msgstr "ఎడమ అంచు"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "బాగా చేశారు"
83msgstr "బాగా చేశారు"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "అత్యవసర పిలుపు"
93msgstr "అత్యవసర పిలుపు"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr "సరే"
97msgstr "సరే"
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "హలో %1"
102msgstr "హలో %1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "హలో"
106msgstr "హలో"
91
107
@@ -97,19 +113,11 @@ msgstr "రద్దుచేయి"
97msgid "DONE"
113msgid "DONE"
98msgstr "పూర్తయ్యింది"
114msgstr "పూర్తయ్యింది"
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr "మరింత చూడండి"
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr "ఇటీవలివి"
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr "ఒక సమీక్షను వ్రాయండి"
133msgid "Send"
141msgid "Send"
134msgstr "పంపు"
142msgstr "పంపు"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr "తాళంతీయుటకు గీకండి"
166msgstr "తాళంతీయుటకు గీకండి"
@@ -157,11 +185,11 @@ msgstr "ఇప్పుడు మాట్లాడండి..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "మాట్లాడుతున్నారు..."
186msgstr "మాట్లాడుతున్నారు..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "సంకేతపదాన్ని చూపించు"
190msgstr "సంకేతపదాన్ని చూపించు"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr "దయచేసి సిమ్ పిన్ ఇవ్వండి"
194msgstr "దయచేసి సిమ్ పిన్ ఇవ్వండి"
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr "దింపుకుంటున్నది"
210msgstr "దింపుకుంటున్నది"
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr "రద్దుచేయబడింది"
218msgstr "రద్దుచేయబడింది"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr "పూర్తయింది"
222msgstr "పూర్తయింది"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "వెతుకు"
238msgstr "వెతుకు"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "దయచేసి %1 ప్రవేశపెట్టండి"
243msgstr "దయచేసి %1 ప్రవేశపెట్టండి"
po/tr.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,48 +26,64 @@ msgstr "Kısayolu iğnele"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Kısayol iğnesini kaldır"
27msgstr "Kısayol iğnesini kaldır"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Tanıtımı geç"
47msgstr "Tanıtımı geç"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Sağ kenar"
51msgstr "Sağ kenar"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Kilidi açmak için sağ kenardan sürüklemeyi deneyin"
55msgstr "Kilidi açmak için sağ kenardan sürüklemeyi deneyin"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Üst kenar"
59msgstr "Üst kenar"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "Bildiricilere erişmek için üst kenarı sürükleyin"
63msgstr "Bildiricilere erişmek için üst kenarı sürükleyin"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "Kapat"
67msgstr "Kapat"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "Ayarlar ekranını kapatmak için tekrar yukarı kaydırın"
71msgstr "Ayarlar ekranını kapatmak için tekrar yukarı kaydırın"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "Sol kenar"
75msgstr "Sol kenar"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64"Uygulamalara hızlı erişim çalıştırıcısını açmak için sol kenarı sürükleyin"
80"Uygulamalara hızlı erişim çalıştırıcısını açmak için sol kenarı sürükleyin"
65
81
66−#: qml/Components/EdgeDemo.qml:227
82+#: qml/Components/EdgeDemo.qml:226
67msgid "Well done"
83msgid "Well done"
68msgstr "Tebrikler"
84msgstr "Tebrikler"
69
85
70−#: qml/Components/EdgeDemo.qml:228
86+#: qml/Components/EdgeDemo.qml:227
71msgid ""
87msgid ""
72"You have now mastered the edge gestures and can start using the "
88"You have now mastered the edge gestures and can start using the "
73"phone<br><br>Tap on the screen to start"
89"phone<br><br>Tap on the screen to start"
@@ -75,20 +91,20 @@ msgstr ""
75"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "
91"Kenar haraketlerini öğrendiniz ve telefonu kullanmaya "
76"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"
92"başlayabilirsiniz<br><br>Başlamak için ekrana dokunun"
77
93
78−#: qml/Components/Lockscreen.qml:214
94+#: qml/Components/Lockscreen.qml:220
79msgid "Emergency Call"
95msgid "Emergency Call"
80msgstr "Acil Arama"
96msgstr "Acil Arama"
81
97
82−#: qml/Components/Lockscreen.qml:231
98+#: qml/Components/Lockscreen.qml:243
83msgid "OK"
99msgid "OK"
84msgstr "Tamam"
100msgstr "Tamam"
85
101
86−#: qml/Components/PassphraseLockscreen.qml:60
102+#: qml/Components/PassphraseLockscreen.qml:62
87#, qt-format
103#, qt-format
88msgid "Hello %1"
104msgid "Hello %1"
89msgstr "Merhaba %1"
105msgstr "Merhaba %1"
90
106
91−#: qml/Components/PassphraseLockscreen.qml:60
107+#: qml/Components/PassphraseLockscreen.qml:62
92msgid "Hello"
108msgid "Hello"
93msgstr "Merhaba"
109msgstr "Merhaba"
94
110
@@ -100,19 +116,11 @@ msgstr "İPTAL"
100msgid "DONE"
116msgid "DONE"
101msgstr "BİTTİ"
117msgstr "BİTTİ"
102
118
103−#: qml/Components/SeeMore.qml:35
104−msgid "See more"
105−msgstr "Daha fazlası"
106−
107−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
119+#: qml/Dash/GenericScopeView.qml:358
108msgid "See less"
120msgid "See less"
109msgstr "Daha azını gör"
121msgstr "Daha azını gör"
110
122
111−#: qml/Dash/DashApps.qml:37
112−msgid "Recent"
113−msgstr "En son"
114−
115−#: qml/Dash/GenericScopeView.qml:330
123+#: qml/Dash/GenericScopeView.qml:358
116msgid "See all"
124msgid "See all"
117msgstr ""
125msgstr ""
118
126
@@ -136,6 +144,26 @@ msgstr "Bir inceleme ekle"
136msgid "Send"
144msgid "Send"
137msgstr "Gönder"
145msgstr "Gönder"
138
146
147+#: qml/Dash/ScopesOverview.qml:200
148+msgid "Manage Dash"
149+msgstr ""
150+
151+#: qml/Dash/ScopesOverview.qml:405
152+msgid "Done"
153+msgstr ""
154+
155+#: qml/Dash/ScopesOverview.qml:431
156+msgid "Store"
157+msgstr ""
158+
159+#: qml/Dash/ScopesOverviewTab.qml:36
160+msgid "Favorites"
161+msgstr ""
162+
163+#: qml/Dash/ScopesOverviewTab.qml:54
164+msgid "All"
165+msgstr ""
166+
139#: qml/Greeter/Greeter.qml:157
167#: qml/Greeter/Greeter.qml:157
140msgid "Swipe to unlock"
168msgid "Swipe to unlock"
141msgstr "Açmak için kaydırın"
169msgstr "Açmak için kaydırın"
@@ -160,11 +188,11 @@ msgstr "Şimdi Konuşun..."
160msgid "Speaking..."
188msgid "Speaking..."
161msgstr "Konuşuyor..."
189msgstr "Konuşuyor..."
162
190
163−#: qml/Notifications/NotificationMenuItemFactory.qml:91
191+#: qml/Notifications/NotificationMenuItemFactory.qml:100
164msgid "Show password"
192msgid "Show password"
165msgstr "Parolayı göster"
193msgstr "Parolayı göster"
166
194
167−#: qml/Notifications/NotificationMenuItemFactory.qml:103
195+#: qml/Notifications/NotificationMenuItemFactory.qml:115
168msgid "Please enter SIM PIN"
196msgid "Please enter SIM PIN"
169msgstr "Lütfen SIM PIN'inizi girin"
197msgstr "Lütfen SIM PIN'inizi girin"
170
198
@@ -176,35 +204,43 @@ msgstr ""
176msgid "Conference"
204msgid "Conference"
177msgstr ""
205msgstr ""
178
206
179−#: qml/Panel/Indicators/MenuItemFactory.qml:583
207+#: qml/Panel/Indicators/MenuItemFactory.qml:651
180msgid "In queue…"
208msgid "In queue…"
181msgstr "Beklemede..."
209msgstr "Beklemede..."
182
210
183−#: qml/Panel/Indicators/MenuItemFactory.qml:587
211+#: qml/Panel/Indicators/MenuItemFactory.qml:655
184msgid "Downloading"
212msgid "Downloading"
185msgstr "İndiriliyor"
213msgstr "İndiriliyor"
186
214
187−#: qml/Panel/Indicators/MenuItemFactory.qml:589
215+#: qml/Panel/Indicators/MenuItemFactory.qml:657
188msgid "Paused, tap to resume"
216msgid "Paused, tap to resume"
189msgstr "Duraklatıldı, devam etmek için dokunun"
217msgstr "Duraklatıldı, devam etmek için dokunun"
190
218
191−#: qml/Panel/Indicators/MenuItemFactory.qml:591
219+#: qml/Panel/Indicators/MenuItemFactory.qml:659
192msgid "Canceled"
220msgid "Canceled"
193msgstr "İptal edildi"
221msgstr "İptal edildi"
194
222
195−#: qml/Panel/Indicators/MenuItemFactory.qml:593
223+#: qml/Panel/Indicators/MenuItemFactory.qml:661
196msgid "Finished"
224msgid "Finished"
197msgstr "Bitti"
225msgstr "Bitti"
198
226
199−#: qml/Panel/Indicators/MenuItemFactory.qml:595
227+#: qml/Panel/Indicators/MenuItemFactory.qml:663
200msgid "Failed, tap to retry"
228msgid "Failed, tap to retry"
201msgstr "Başarısız, yeniden denemek için dokunun"
229msgstr "Başarısız, yeniden denemek için dokunun"
202
230
231+#: qml/Panel/Indicators/ModemInfoItem.qml:105
232+msgid "Unlock SIM"
233+msgstr ""
234+
235+#: qml/Panel/Indicators/RoamingIndication.qml:27
236+msgid "Roaming"
237+msgstr ""
238+
203#: qml/Panel/SearchIndicator.qml:27
239#: qml/Panel/SearchIndicator.qml:27
204msgid "Search"
240msgid "Search"
205msgstr "Ara"
241msgstr "Ara"
206
242
207−#: qml/Shell.qml:359
243+#: qml/Shell.qml:256
208#, qt-format
244#, qt-format
209msgid "Please enter %1"
245msgid "Please enter %1"
210msgstr "Lütfen %1 girin"
246msgstr "Lütfen %1 girin"
po/ug.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-31 07:15+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,47 +26,63 @@ msgstr "تېزلەتمىنى قوي"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "تېزلەتمىنى ئېلىۋەت"
27msgstr "تېزلەتمىنى ئېلىۋەت"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "قىسقىچە تونۇشتۇرۇشتىن ئاتلاش"
47msgstr "قىسقىچە تونۇشتۇرۇشتىن ئاتلاش"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "ئوڭ گىرۋەك"
51msgstr "ئوڭ گىرۋەك"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "تېلېفوننى قۇلۇپتىن ئېچىش ئۈچۈن ئوڭ گىرۋەكتىن سىيرىڭ"
55msgstr "تېلېفوننى قۇلۇپتىن ئېچىش ئۈچۈن ئوڭ گىرۋەكتىن سىيرىڭ"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "ئۈستى گىرۋەك"
59msgstr "ئۈستى گىرۋەك"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "كۆرسەتكۈچلەرنى زىيارەت قىلىش ئۈچۈن ئۈستى گىرۋەكتىن سىيرىڭ"
63msgstr "كۆرسەتكۈچلەرنى زىيارەت قىلىش ئۈچۈن ئۈستى گىرۋەكتىن سىيرىڭ"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "ياپ"
67msgstr "ياپ"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "تەڭشەش ئېكرانىنى يېپىش ئۈچۈن ئۈستىگە قايتا سىيرىڭ"
71msgstr "تەڭشەش ئېكرانىنى يېپىش ئۈچۈن ئۈستىگە قايتا سىيرىڭ"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "سول گىرۋەك"
75msgstr "سول گىرۋەك"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "قوللىنىشلارنى تىز زىيارەت قىلىش ئۈچۈن سولدىن سىيرىپ ئىجراچىنى ئېچىڭ"
79msgstr "قوللىنىشلارنى تىز زىيارەت قىلىش ئۈچۈن سولدىن سىيرىپ ئىجراچىنى ئېچىڭ"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "ياخشى بولدى"
83msgstr "ياخشى بولدى"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
@@ -74,20 +90,20 @@ msgstr ""
74"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "
90"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "
75"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
91"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
76
92
77−#: qml/Components/Lockscreen.qml:214
93+#: qml/Components/Lockscreen.qml:220
78msgid "Emergency Call"
94msgid "Emergency Call"
79msgstr "جىددىي تېلېفون"
95msgstr "جىددىي تېلېفون"
80
96
81−#: qml/Components/Lockscreen.qml:231
97+#: qml/Components/Lockscreen.qml:243
82msgid "OK"
98msgid "OK"
83msgstr "تامام"
99msgstr "تامام"
84
100
85−#: qml/Components/PassphraseLockscreen.qml:60
101+#: qml/Components/PassphraseLockscreen.qml:62
86#, qt-format
102#, qt-format
87msgid "Hello %1"
103msgid "Hello %1"
88msgstr "سالام %1"
104msgstr "سالام %1"
89
105
90−#: qml/Components/PassphraseLockscreen.qml:60
106+#: qml/Components/PassphraseLockscreen.qml:62
91msgid "Hello"
107msgid "Hello"
92msgstr "ئەسسالامۇئەلەيكۇم"
108msgstr "ئەسسالامۇئەلەيكۇم"
93
109
@@ -99,19 +115,11 @@ msgstr "ۋاز كەچ"
99msgid "DONE"
115msgid "DONE"
100msgstr "تامام"
116msgstr "تامام"
101
117
102−#: qml/Components/SeeMore.qml:35
103−msgid "See more"
104−msgstr "جىقراق كۆرۈش"
105−
106−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
118+#: qml/Dash/GenericScopeView.qml:358
107msgid "See less"
119msgid "See less"
108msgstr "ئازراق كۆرۈش"
120msgstr "ئازراق كۆرۈش"
109
121
110−#: qml/Dash/DashApps.qml:37
111−msgid "Recent"
112−msgstr "يېقىنقى"
113−
114−#: qml/Dash/GenericScopeView.qml:330
122+#: qml/Dash/GenericScopeView.qml:358
115msgid "See all"
123msgid "See all"
116msgstr "ھەممىنى كۆرۈش…"
124msgstr "ھەممىنى كۆرۈش…"
117
125
@@ -135,6 +143,26 @@ msgstr "باھا قوشۇش"
135msgid "Send"
143msgid "Send"
136msgstr "ئەۋەت"
144msgstr "ئەۋەت"
137
145
146+#: qml/Dash/ScopesOverview.qml:200
147+msgid "Manage Dash"
148+msgstr ""
149+
150+#: qml/Dash/ScopesOverview.qml:405
151+msgid "Done"
152+msgstr ""
153+
154+#: qml/Dash/ScopesOverview.qml:431
155+msgid "Store"
156+msgstr ""
157+
158+#: qml/Dash/ScopesOverviewTab.qml:36
159+msgid "Favorites"
160+msgstr ""
161+
162+#: qml/Dash/ScopesOverviewTab.qml:54
163+msgid "All"
164+msgstr ""
165+
138#: qml/Greeter/Greeter.qml:157
166#: qml/Greeter/Greeter.qml:157
139msgid "Swipe to unlock"
167msgid "Swipe to unlock"
140msgstr "سىيرىسىڭىز قۇلۇپسىزلىنىدۇ"
168msgstr "سىيرىسىڭىز قۇلۇپسىزلىنىدۇ"
@@ -159,11 +187,11 @@ msgstr "ئەمدى سۆزلەڭ…"
159msgid "Speaking..."
187msgid "Speaking..."
160msgstr "سۆزلەۋاتىسىز…"
188msgstr "سۆزلەۋاتىسىز…"
161
189
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
190+#: qml/Notifications/NotificationMenuItemFactory.qml:100
163msgid "Show password"
191msgid "Show password"
164msgstr "ئىم كۆرسەت"
192msgstr "ئىم كۆرسەت"
165
193
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
194+#: qml/Notifications/NotificationMenuItemFactory.qml:115
167msgid "Please enter SIM PIN"
195msgid "Please enter SIM PIN"
168msgstr "سىم(SIM) كارتىڭىزنىڭ PIN نومۇرىنى كىرگۈزۈڭ"
196msgstr "سىم(SIM) كارتىڭىزنىڭ PIN نومۇرىنى كىرگۈزۈڭ"
169
197
@@ -175,35 +203,43 @@ msgstr "سۆزلىشىشكە قايتىش ئۈچۈن چېكىڭ…"
175msgid "Conference"
203msgid "Conference"
176msgstr "يىغىن"
204msgstr "يىغىن"
177
205
178−#: qml/Panel/Indicators/MenuItemFactory.qml:583
206+#: qml/Panel/Indicators/MenuItemFactory.qml:651
179msgid "In queue…"
207msgid "In queue…"
180msgstr "قاتاردا…"
208msgstr "قاتاردا…"
181
209
182−#: qml/Panel/Indicators/MenuItemFactory.qml:587
210+#: qml/Panel/Indicators/MenuItemFactory.qml:655
183msgid "Downloading"
211msgid "Downloading"
184msgstr "چۈشۈرۈۋاتىدۇ"
212msgstr "چۈشۈرۈۋاتىدۇ"
185
213
186−#: qml/Panel/Indicators/MenuItemFactory.qml:589
214+#: qml/Panel/Indicators/MenuItemFactory.qml:657
187msgid "Paused, tap to resume"
215msgid "Paused, tap to resume"
188msgstr "توختىتىلغان، چەكسە داۋاملىشىدۇ"
216msgstr "توختىتىلغان، چەكسە داۋاملىشىدۇ"
189
217
190−#: qml/Panel/Indicators/MenuItemFactory.qml:591
218+#: qml/Panel/Indicators/MenuItemFactory.qml:659
191msgid "Canceled"
219msgid "Canceled"
192msgstr "قالدۇرۇۋېتىلدى"
220msgstr "قالدۇرۇۋېتىلدى"
193
221
194−#: qml/Panel/Indicators/MenuItemFactory.qml:593
222+#: qml/Panel/Indicators/MenuItemFactory.qml:661
195msgid "Finished"
223msgid "Finished"
196msgstr "تاماملاندى"
224msgstr "تاماملاندى"
197
225
198−#: qml/Panel/Indicators/MenuItemFactory.qml:595
226+#: qml/Panel/Indicators/MenuItemFactory.qml:663
199msgid "Failed, tap to retry"
227msgid "Failed, tap to retry"
200msgstr "مەغلۇپ بولدى، چېكىپ قايتا سىناڭ"
228msgstr "مەغلۇپ بولدى، چېكىپ قايتا سىناڭ"
201
229
230+#: qml/Panel/Indicators/ModemInfoItem.qml:105
231+msgid "Unlock SIM"
232+msgstr ""
233+
234+#: qml/Panel/Indicators/RoamingIndication.qml:27
235+msgid "Roaming"
236+msgstr ""
237+
202#: qml/Panel/SearchIndicator.qml:27
238#: qml/Panel/SearchIndicator.qml:27
203msgid "Search"
239msgid "Search"
204msgstr "ئىزدە"
240msgstr "ئىزدە"
205
241
206−#: qml/Shell.qml:359
242+#: qml/Shell.qml:256
207#, qt-format
243#, qt-format
208msgid "Please enter %1"
244msgid "Please enter %1"
209msgstr "%1 نى كىرگۈزۈڭ"
245msgstr "%1 نى كىرگۈزۈڭ"
po/uk.po+73−37
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-07-29 07:53+0000\n"
11+"PO-Revision-Date: 2014-08-12 14:38+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-07-31 07:15+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,50 +26,66 @@ msgstr "Заблокувати кнопку"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "Розблокувати кнопку"
27msgstr "Розблокувати кнопку"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "Ви справді хочете вимкнути пристрій?"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "Вимкнути"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "Перезавантажити"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "Скасувати"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "Пропустити вступ"
47msgstr "Пропустити вступ"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "Правий край"
51msgstr "Правий край"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "Спробуйте провести пальцем від правою краю, щоб розблокувати телефон"
55msgstr "Спробуйте провести пальцем від правою краю, щоб розблокувати телефон"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "Верхній край"
59msgstr "Верхній край"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48"Спробуйте провести пальцем від верхнього краю, щоб розблокувати телефон"
64"Спробуйте провести пальцем від верхнього краю, щоб розблокувати телефон"
49
65
50−#: qml/Components/EdgeDemo.qml:171
66+#: qml/Components/EdgeDemo.qml:170
51msgid "Close"
67msgid "Close"
52msgstr "Закрити"
68msgstr "Закрити"
53
69
54−#: qml/Components/EdgeDemo.qml:172
70+#: qml/Components/EdgeDemo.qml:171
55msgid "Swipe up again to close the settings screen"
71msgid "Swipe up again to close the settings screen"
56msgstr "Проведіть пальцем ще раз, щоб закрити вікно параметрів"
72msgstr "Проведіть пальцем ще раз, щоб закрити вікно параметрів"
57
73
58−#: qml/Components/EdgeDemo.qml:199
74+#: qml/Components/EdgeDemo.qml:198
59msgid "Left edge"
75msgid "Left edge"
60msgstr "Лівий край"
76msgstr "Лівий край"
61
77
62−#: qml/Components/EdgeDemo.qml:200
78+#: qml/Components/EdgeDemo.qml:199
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
79msgid "Swipe from the left to reveal the launcher for quick access to apps"
64msgstr ""
80msgstr ""
65"Проведіть пальцем від лівого краю, щоб відкрити панель запуску для "
81"Проведіть пальцем від лівого краю, щоб відкрити панель запуску для "
66"пришвидшення доступу до програм"
82"пришвидшення доступу до програм"
67
83
68−#: qml/Components/EdgeDemo.qml:227
84+#: qml/Components/EdgeDemo.qml:226
69msgid "Well done"
85msgid "Well done"
70msgstr "Добре"
86msgstr "Добре"
71
87
72−#: qml/Components/EdgeDemo.qml:228
88+#: qml/Components/EdgeDemo.qml:227
73msgid ""
89msgid ""
74"You have now mastered the edge gestures and can start using the "
90"You have now mastered the edge gestures and can start using the "
75"phone<br><br>Tap on the screen to start"
91"phone<br><br>Tap on the screen to start"
@@ -77,20 +93,20 @@ msgstr ""
77"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "
93"Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "
78"можна користуватися.<br><br>Торкніться екрана, щоб розпочати."
94"можна користуватися.<br><br>Торкніться екрана, щоб розпочати."
79
95
80−#: qml/Components/Lockscreen.qml:214
96+#: qml/Components/Lockscreen.qml:220
81msgid "Emergency Call"
97msgid "Emergency Call"
82msgstr "Терміновий виклик"
98msgstr "Терміновий виклик"
83
99
84−#: qml/Components/Lockscreen.qml:231
100+#: qml/Components/Lockscreen.qml:243
85msgid "OK"
101msgid "OK"
86msgstr "Гаразд"
102msgstr "Гаразд"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89#, qt-format
105#, qt-format
90msgid "Hello %1"
106msgid "Hello %1"
91msgstr "Привіт, %1"
107msgstr "Привіт, %1"
92
108
93−#: qml/Components/PassphraseLockscreen.qml:60
109+#: qml/Components/PassphraseLockscreen.qml:62
94msgid "Hello"
110msgid "Hello"
95msgstr "Привіт!"
111msgstr "Привіт!"
96
112
@@ -102,19 +118,11 @@ msgstr "Скасувати"
102msgid "DONE"
118msgid "DONE"
103msgstr "Виконано"
119msgstr "Виконано"
104
120
105−#: qml/Components/SeeMore.qml:35
106−msgid "See more"
107−msgstr "Докладніше"
108−
109−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
121+#: qml/Dash/GenericScopeView.qml:358
110msgid "See less"
122msgid "See less"
111msgstr "Стисліше"
123msgstr "Стисліше"
112
124
113−#: qml/Dash/DashApps.qml:37
114−msgid "Recent"
115−msgstr "Нещодавні"
116−
117−#: qml/Dash/GenericScopeView.qml:330
125+#: qml/Dash/GenericScopeView.qml:358
118msgid "See all"
126msgid "See all"
119msgstr "Детальніше"
127msgstr "Детальніше"
120
128
@@ -138,6 +146,26 @@ msgstr "Додати рецензію"
138msgid "Send"
146msgid "Send"
139msgstr "Надіслати"
147msgstr "Надіслати"
140
148
149+#: qml/Dash/ScopesOverview.qml:200
150+msgid "Manage Dash"
151+msgstr "Керування панеллю"
152+
153+#: qml/Dash/ScopesOverview.qml:405
154+msgid "Done"
155+msgstr "Виконано"
156+
157+#: qml/Dash/ScopesOverview.qml:431
158+msgid "Store"
159+msgstr "Крамниця"
160+
161+#: qml/Dash/ScopesOverviewTab.qml:36
162+msgid "Favorites"
163+msgstr "Улюблене"
164+
165+#: qml/Dash/ScopesOverviewTab.qml:54
166+msgid "All"
167+msgstr "Все"
168+
141#: qml/Greeter/Greeter.qml:157
169#: qml/Greeter/Greeter.qml:157
142msgid "Swipe to unlock"
170msgid "Swipe to unlock"
143msgstr "Проведіть пальцем, щоб розблокувати"
171msgstr "Проведіть пальцем, щоб розблокувати"
@@ -162,11 +190,11 @@ msgstr "Можна говорити…"
162msgid "Speaking..."
190msgid "Speaking..."
163msgstr "Мовлення…"
191msgstr "Мовлення…"
164
192
165−#: qml/Notifications/NotificationMenuItemFactory.qml:91
193+#: qml/Notifications/NotificationMenuItemFactory.qml:100
166msgid "Show password"
194msgid "Show password"
167msgstr "Показати пароль"
195msgstr "Показати пароль"
168
196
169−#: qml/Notifications/NotificationMenuItemFactory.qml:103
197+#: qml/Notifications/NotificationMenuItemFactory.qml:115
170msgid "Please enter SIM PIN"
198msgid "Please enter SIM PIN"
171msgstr "Введіть PIN-код SIM-картки"
199msgstr "Введіть PIN-код SIM-картки"
172
200
@@ -178,35 +206,43 @@ msgstr "Торкніться, щоб повернутися до дзвінка
178msgid "Conference"
206msgid "Conference"
179msgstr "Конференція"
207msgstr "Конференція"
180
208
181−#: qml/Panel/Indicators/MenuItemFactory.qml:583
209+#: qml/Panel/Indicators/MenuItemFactory.qml:651
182msgid "In queue…"
210msgid "In queue…"
183msgstr "У черзі…"
211msgstr "У черзі…"
184
212
185−#: qml/Panel/Indicators/MenuItemFactory.qml:587
213+#: qml/Panel/Indicators/MenuItemFactory.qml:655
186msgid "Downloading"
214msgid "Downloading"
187msgstr "Отримуємо"
215msgstr "Отримуємо"
188
216
189−#: qml/Panel/Indicators/MenuItemFactory.qml:589
217+#: qml/Panel/Indicators/MenuItemFactory.qml:657
190msgid "Paused, tap to resume"
218msgid "Paused, tap to resume"
191msgstr "Призупинено, торкніться, щоб поновити"
219msgstr "Призупинено, торкніться, щоб поновити"
192
220
193−#: qml/Panel/Indicators/MenuItemFactory.qml:591
221+#: qml/Panel/Indicators/MenuItemFactory.qml:659
194msgid "Canceled"
222msgid "Canceled"
195msgstr "Скасовано"
223msgstr "Скасовано"
196
224
197−#: qml/Panel/Indicators/MenuItemFactory.qml:593
225+#: qml/Panel/Indicators/MenuItemFactory.qml:661
198msgid "Finished"
226msgid "Finished"
199msgstr "Завершено"
227msgstr "Завершено"
200
228
201−#: qml/Panel/Indicators/MenuItemFactory.qml:595
229+#: qml/Panel/Indicators/MenuItemFactory.qml:663
202msgid "Failed, tap to retry"
230msgid "Failed, tap to retry"
203msgstr "Помилка, торкніться, щоб повторити спробу"
231msgstr "Помилка, торкніться, щоб повторити спробу"
204
232
233+#: qml/Panel/Indicators/ModemInfoItem.qml:105
234+msgid "Unlock SIM"
235+msgstr "Розблокувати SIM"
236+
237+#: qml/Panel/Indicators/RoamingIndication.qml:27
238+msgid "Roaming"
239+msgstr "Роумінг"
240+
205#: qml/Panel/SearchIndicator.qml:27
241#: qml/Panel/SearchIndicator.qml:27
206msgid "Search"
242msgid "Search"
207msgstr "Пошук"
243msgstr "Пошук"
208
244
209−#: qml/Shell.qml:359
245+#: qml/Shell.qml:256
210#, qt-format
246#, qt-format
211msgid "Please enter %1"
247msgid "Please enter %1"
212msgstr "Будь ласка, введіть %1"
248msgstr "Будь ласка, введіть %1"
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+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr ""
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr ""
186msgstr ""
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr ""
238msgstr ""
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/xh.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr ""
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr ""
27msgstr ""
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr ""
47msgstr ""
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr ""
51msgstr ""
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr ""
55msgstr ""
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr ""
59msgstr ""
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr ""
63msgstr ""
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr ""
67msgstr ""
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr ""
71msgstr ""
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr ""
75msgstr ""
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
79msgstr ""
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr ""
83msgstr ""
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr ""
89msgstr ""
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr ""
93msgstr ""
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr ""
97msgstr ""
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr ""
102msgstr ""
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr ""
106msgstr ""
91
107
@@ -97,19 +113,11 @@ msgstr ""
97msgid "DONE"
113msgid "DONE"
98msgstr ""
114msgstr ""
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr ""
118msgstr ""
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr ""
122msgstr ""
115
123
@@ -133,6 +141,26 @@ msgstr ""
133msgid "Send"
141msgid "Send"
134msgstr ""
142msgstr ""
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr ""
166msgstr ""
@@ -157,11 +185,11 @@ msgstr ""
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr ""
186msgstr ""
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr ""
190msgstr ""
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr ""
194msgstr ""
167
195
@@ -173,35 +201,43 @@ msgstr ""
173msgid "Conference"
201msgid "Conference"
174msgstr ""
202msgstr ""
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr ""
206msgstr ""
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr ""
210msgstr ""
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr ""
214msgstr ""
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr ""
218msgstr ""
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr ""
222msgstr ""
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr ""
226msgstr ""
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr ""
238msgstr ""
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr ""
243msgstr ""
po/zh_CN.po+74−38
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-31 07:15+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-13 06:56+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr "固定快捷方式"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "取消固定快捷方式"
27msgstr "取消固定快捷方式"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr "确定要关闭电源吗？"
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr "关机"
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr "重启"
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr "取消"
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "跳过简介"
47msgstr "跳过简介"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "右边缘"
51msgstr "右边缘"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "从右边滑动可以解锁"
55msgstr "从右边滑动可以解锁"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "上边缘"
59msgstr "上边缘"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "从上边缘划入可以访问指示器"
63msgstr "从上边缘划入可以访问指示器"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "关闭"
67msgstr "关闭"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "再次向上划动可以关闭设置界面"
71msgstr "再次向上划动可以关闭设置界面"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "左边缘"
75msgstr "左边缘"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "从左边划入展开启动器可以快速打开应用"
79msgstr "从左边划入展开启动器可以快速打开应用"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "做得好"
83msgstr "做得好"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了<br><br>请点击屏幕开始使用"
89msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了<br><br>请点击屏幕开始使用"
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "紧急电话"
93msgstr "紧急电话"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr "确定"
97msgstr "确定"
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "你好，%1"
102msgstr "你好，%1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "你好"
106msgstr "你好"
91
107
@@ -97,19 +113,11 @@ msgstr "取消"
97msgid "DONE"
113msgid "DONE"
98msgstr "完成"
114msgstr "完成"
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr "了解更多"
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr "显示更少"
118msgstr "显示更少"
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr "最近使用过的"
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr "查看全部"
122msgstr "查看全部"
115
123
@@ -133,6 +141,26 @@ msgstr "添加评论"
133msgid "Send"
141msgid "Send"
134msgstr "发送"
142msgstr "发送"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr "管理 Dash"
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr "完成"
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr "商店"
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr "收藏夹"
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr "所有"
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr "滑动解锁"
166msgstr "滑动解锁"
@@ -157,11 +185,11 @@ msgstr "现在请讲..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "讲话中..."
186msgstr "讲话中..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "显示密码"
190msgstr "显示密码"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr "请输入 SIM PIN"
194msgstr "请输入 SIM PIN"
167
195
@@ -173,35 +201,43 @@ msgstr "点击回到通话..."
173msgid "Conference"
201msgid "Conference"
174msgstr "会议"
202msgstr "会议"
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr "排队中..."
206msgstr "排队中..."
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr "正在下载"
210msgstr "正在下载"
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr "已暂停，点击继续"
214msgstr "已暂停，点击继续"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr "已取消"
218msgstr "已取消"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr "已完成"
222msgstr "已完成"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr "下载失败，请点击重试"
226msgstr "下载失败，请点击重试"
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr "解开 SIM"
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr "漫游"
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "搜索"
238msgstr "搜索"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "请输入 %1"
243msgstr "请输入 %1"
po/zh_HK.po+99−63
@@ -7,123 +7,131 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\n"
11−"PO-Revision-Date: 2014-01-25 13:32+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-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
22msgid "Pin shortcut"
22msgid "Pin shortcut"
23−msgstr ""
23+msgstr "釘住捷徑"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27+msgstr "取消捷徑釘選"
28+
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
27msgstr ""
43msgstr ""
28
44
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "跳過介紹"
47msgstr "跳過介紹"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35−msgstr "右邊緣"
51+msgstr "右側邊緣"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39−msgstr "試從右邊緣輕掃解鎖手機"
55+msgstr "試從右邊緣向左滑動解鎖手機"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "頂部邊緣"
59msgstr "頂部邊緣"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "試從頂部邊緣輕掃存取指示器"
63msgstr "試從頂部邊緣輕掃存取指示器"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "關閉"
67msgstr "關閉"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55−msgstr "再向上掃一次以關閉設定畫面"
71+msgstr "再向上滑動一次以關閉設定畫面"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59−msgstr "左邊緣"
75+msgstr "左側邊緣"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63−msgstr "從左邊緣輕掃以顯示啟動器快速訪問應用"
79+msgstr "從左側邊緣滑動以顯示啟動器快速查看應用"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "做得好"
83msgstr "做得好"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73−msgstr ""
89+msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "緊急電話"
93msgstr "緊急電話"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81−msgstr ""
97+msgstr "確定"
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "您好 %1"
102msgstr "您好 %1"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "您好"
106msgstr "您好"
91
107
92#: qml/Components/PinLockscreen.qml:198
108#: qml/Components/PinLockscreen.qml:198
93msgid "CANCEL"
109msgid "CANCEL"
94−msgstr ""
110+msgstr "取消"
95
111
96#: qml/Components/PinLockscreen.qml:216
112#: qml/Components/PinLockscreen.qml:216
97msgid "DONE"
113msgid "DONE"
98−msgstr ""
114+msgstr "完成"
99−
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr ""
103
115
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106−msgstr ""
118+msgstr "縮減查看"
107−
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr ""
111
119
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114−msgstr ""
122+msgstr "查看全部"
115
123
116#: qml/Dash/Previews/PreviewActionCombo.qml:34
124#: qml/Dash/Previews/PreviewActionCombo.qml:34
117msgid "More..."
125msgid "More..."
118−msgstr ""
126+msgstr "更多..."
119
127
120#: qml/Dash/Previews/PreviewActionCombo.qml:34
128#: qml/Dash/Previews/PreviewActionCombo.qml:34
121msgid "Less..."
129msgid "Less..."
122−msgstr ""
130+msgstr "縮減…"
123
131
124#: qml/Dash/Previews/PreviewRatingInput.qml:81
132#: qml/Dash/Previews/PreviewRatingInput.qml:81
125msgid "Rate this"
133msgid "Rate this"
126−msgstr "評價"
134+msgstr "評分"
127
135
128#: qml/Dash/Previews/PreviewRatingInput.qml:126
136#: qml/Dash/Previews/PreviewRatingInput.qml:126
129msgid "Add a review"
137msgid "Add a review"
@@ -133,9 +141,29 @@ msgstr "新增評論"
133msgid "Send"
141msgid "Send"
134msgstr "傳送"
142msgstr "傳送"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138−msgstr ""
166+msgstr "滑動解除鎖定"
139
167
140#: qml/Hud/HudParametrizedActionsPage.qml:132
168#: qml/Hud/HudParametrizedActionsPage.qml:132
141msgid "Confirm"
169msgid "Confirm"
@@ -147,61 +175,69 @@ msgstr "輸入或說出指令"
147
175
148#: qml/Hud/Hud.qml:84
176#: qml/Hud/Hud.qml:84
149msgid "Loading. Please Wait..."
177msgid "Loading. Please Wait..."
150−msgstr "正載入。請稍候..."
178+msgstr "載入中。請稍候..."
151
179
152#: qml/Hud/Hud.qml:89
180#: qml/Hud/Hud.qml:89
153msgid "Speak Now..."
181msgid "Speak Now..."
154−msgstr "馬上講..."
182+msgstr "請講..."
155
183
156#: qml/Hud/Hud.qml:94
184#: qml/Hud/Hud.qml:94
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "正在講..."
186msgstr "正在講..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "顯示密碼"
190msgstr "顯示密碼"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166−msgstr ""
194+msgstr "請輸入 SIM 卡 PIN 碼"
167
195
168#: qml/Panel/ActiveCallHint.qml:77
196#: qml/Panel/ActiveCallHint.qml:77
169msgid "Tap to return to call..."
197msgid "Tap to return to call..."
170−msgstr ""
198+msgstr "輕觸可返回通話…"
171
199
172#: qml/Panel/ActiveCallHint.qml:90
200#: qml/Panel/ActiveCallHint.qml:90
173msgid "Conference"
201msgid "Conference"
174−msgstr ""
202+msgstr "會議"
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178−msgstr ""
206+msgstr "佇列中…"
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182−msgstr ""
210+msgstr "下載中"
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186−msgstr ""
214+msgstr "已暫停，輕觸以繼續"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190−msgstr ""
218+msgstr "已取消"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194−msgstr ""
222+msgstr "已完成"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
226+msgstr "失敗，輕觸以重試"
227+
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
198msgstr ""
234msgstr ""
199
235
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "搜尋"
238msgstr "搜尋"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "請輸入 %1"
243msgstr "請輸入 %1"
po/zh_TW.po+72−36
@@ -7,15 +7,15 @@ 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-07-11 14:59+0200\n"
10+"POT-Creation-Date: 2014-08-08 11:17+0200\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-07-27 06:35+0000\n"
17+"X-Launchpad-Export-Date: 2014-08-12 06:44+0000\n"
18−"X-Generator: Launchpad (build 17131)\n"
18+"X-Generator: Launchpad (build 17156)\n"
19
19
20#: plugins/Unity/Launcher/launcheritem.cpp:43
20#: plugins/Unity/Launcher/launcheritem.cpp:43
21#: plugins/Unity/Launcher/launcheritem.cpp:73
21#: plugins/Unity/Launcher/launcheritem.cpp:73
@@ -26,66 +26,82 @@ msgstr "釘住捷徑"
26msgid "Unpin shortcut"
26msgid "Unpin shortcut"
27msgstr "取消捷徑釘選"
27msgstr "取消捷徑釘選"
28
28
29+#: qml/Components/Dialogs.qml:142
30+msgid "Are you sure you would like to turn power off?"
31+msgstr ""
32+
33+#: qml/Components/Dialogs.qml:144
34+msgid "Power off"
35+msgstr ""
36+
37+#: qml/Components/Dialogs.qml:153
38+msgid "Restart"
39+msgstr ""
40+
41+#: qml/Components/Dialogs.qml:162
42+msgid "Cancel"
43+msgstr ""
44+
29#: qml/Components/EdgeDemoOverlay.qml:151
45#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
46msgid "Skip intro"
31msgstr "略過導覽"
47msgstr "略過導覽"
32
48
33−#: qml/Components/EdgeDemo.qml:113
49+#: qml/Components/EdgeDemo.qml:112
34msgid "Right edge"
50msgid "Right edge"
35msgstr "右側邊緣"
51msgstr "右側邊緣"
36
52
37−#: qml/Components/EdgeDemo.qml:114
53+#: qml/Components/EdgeDemo.qml:113
38msgid "Try swiping from the right edge to unlock the phone"
54msgid "Try swiping from the right edge to unlock the phone"
39msgstr "從螢幕右緣向左滑動解鎖手機"
55msgstr "從螢幕右緣向左滑動解鎖手機"
40
56
41−#: qml/Components/EdgeDemo.qml:145
57+#: qml/Components/EdgeDemo.qml:144
42msgid "Top edge"
58msgid "Top edge"
43msgstr "上方邊緣"
59msgstr "上方邊緣"
44
60
45−#: qml/Components/EdgeDemo.qml:146
61+#: qml/Components/EdgeDemo.qml:145
46msgid "Try swiping from the top edge to access the indicators"
62msgid "Try swiping from the top edge to access the indicators"
47msgstr "從螢幕上緣向下滑動打開指示器"
63msgstr "從螢幕上緣向下滑動打開指示器"
48
64
49−#: qml/Components/EdgeDemo.qml:171
65+#: qml/Components/EdgeDemo.qml:170
50msgid "Close"
66msgid "Close"
51msgstr "關閉"
67msgstr "關閉"
52
68
53−#: qml/Components/EdgeDemo.qml:172
69+#: qml/Components/EdgeDemo.qml:171
54msgid "Swipe up again to close the settings screen"
70msgid "Swipe up again to close the settings screen"
55msgstr "再次向上滑動關閉設定畫面"
71msgstr "再次向上滑動關閉設定畫面"
56
72
57−#: qml/Components/EdgeDemo.qml:199
73+#: qml/Components/EdgeDemo.qml:198
58msgid "Left edge"
74msgid "Left edge"
59msgstr "左方邊緣"
75msgstr "左方邊緣"
60
76
61−#: qml/Components/EdgeDemo.qml:200
77+#: qml/Components/EdgeDemo.qml:199
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
78msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr "從螢幕左緣向右滑動揭開啟動器可快速存取程式"
79msgstr "從螢幕左緣向右滑動揭開啟動器可快速存取程式"
64
80
65−#: qml/Components/EdgeDemo.qml:227
81+#: qml/Components/EdgeDemo.qml:226
66msgid "Well done"
82msgid "Well done"
67msgstr "做得好"
83msgstr "做得好"
68
84
69−#: qml/Components/EdgeDemo.qml:228
85+#: qml/Components/EdgeDemo.qml:227
70msgid ""
86msgid ""
71"You have now mastered the edge gestures and can start using the "
87"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
88"phone<br><br>Tap on the screen to start"
73msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
89msgstr "您現在已熟練邊緣手勢，可以開始使用手機了<br><br>輕觸螢幕開始使用"
74
90
75−#: qml/Components/Lockscreen.qml:214
91+#: qml/Components/Lockscreen.qml:220
76msgid "Emergency Call"
92msgid "Emergency Call"
77msgstr "緊急通話"
93msgstr "緊急通話"
78
94
79−#: qml/Components/Lockscreen.qml:231
95+#: qml/Components/Lockscreen.qml:243
80msgid "OK"
96msgid "OK"
81msgstr "確定"
97msgstr "確定"
82
98
83−#: qml/Components/PassphraseLockscreen.qml:60
99+#: qml/Components/PassphraseLockscreen.qml:62
84#, qt-format
100#, qt-format
85msgid "Hello %1"
101msgid "Hello %1"
86msgstr "%1 您好"
102msgstr "%1 您好"
87
103
88−#: qml/Components/PassphraseLockscreen.qml:60
104+#: qml/Components/PassphraseLockscreen.qml:62
89msgid "Hello"
105msgid "Hello"
90msgstr "您好"
106msgstr "您好"
91
107
@@ -97,19 +113,11 @@ msgstr "取消"
97msgid "DONE"
113msgid "DONE"
98msgstr "完成"
114msgstr "完成"
99
115
100−#: qml/Components/SeeMore.qml:35
101−msgid "See more"
102−msgstr "查看更多"
103−
104−#: qml/Components/SeeMore.qml:58 qml/Dash/GenericScopeView.qml:330
116+#: qml/Dash/GenericScopeView.qml:358
105msgid "See less"
117msgid "See less"
106msgstr "縮減查看"
118msgstr "縮減查看"
107
119
108−#: qml/Dash/DashApps.qml:37
109−msgid "Recent"
110−msgstr "最近"
111−
112−#: qml/Dash/GenericScopeView.qml:330
120+#: qml/Dash/GenericScopeView.qml:358
113msgid "See all"
121msgid "See all"
114msgstr "查看全部"
122msgstr "查看全部"
115
123
@@ -133,6 +141,26 @@ msgstr "新增評論"
133msgid "Send"
141msgid "Send"
134msgstr "發送"
142msgstr "發送"
135
143
144+#: qml/Dash/ScopesOverview.qml:200
145+msgid "Manage Dash"
146+msgstr ""
147+
148+#: qml/Dash/ScopesOverview.qml:405
149+msgid "Done"
150+msgstr ""
151+
152+#: qml/Dash/ScopesOverview.qml:431
153+msgid "Store"
154+msgstr ""
155+
156+#: qml/Dash/ScopesOverviewTab.qml:36
157+msgid "Favorites"
158+msgstr ""
159+
160+#: qml/Dash/ScopesOverviewTab.qml:54
161+msgid "All"
162+msgstr ""
163+
136#: qml/Greeter/Greeter.qml:157
164#: qml/Greeter/Greeter.qml:157
137msgid "Swipe to unlock"
165msgid "Swipe to unlock"
138msgstr "滑開解除鎖定"
166msgstr "滑開解除鎖定"
@@ -157,11 +185,11 @@ msgstr "請說..."
157msgid "Speaking..."
185msgid "Speaking..."
158msgstr "說話中..."
186msgstr "說話中..."
159
187
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
188+#: qml/Notifications/NotificationMenuItemFactory.qml:100
161msgid "Show password"
189msgid "Show password"
162msgstr "顯示密碼"
190msgstr "顯示密碼"
163
191
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
192+#: qml/Notifications/NotificationMenuItemFactory.qml:115
165msgid "Please enter SIM PIN"
193msgid "Please enter SIM PIN"
166msgstr "請輸入 SIM 卡 PIN 碼"
194msgstr "請輸入 SIM 卡 PIN 碼"
167
195
@@ -173,35 +201,43 @@ msgstr "輕觸可返回通話…"
173msgid "Conference"
201msgid "Conference"
174msgstr "會議"
202msgstr "會議"
175
203
176−#: qml/Panel/Indicators/MenuItemFactory.qml:583
204+#: qml/Panel/Indicators/MenuItemFactory.qml:651
177msgid "In queue…"
205msgid "In queue…"
178msgstr "佇列中…"
206msgstr "佇列中…"
179
207
180−#: qml/Panel/Indicators/MenuItemFactory.qml:587
208+#: qml/Panel/Indicators/MenuItemFactory.qml:655
181msgid "Downloading"
209msgid "Downloading"
182msgstr "下載中"
210msgstr "下載中"
183
211
184−#: qml/Panel/Indicators/MenuItemFactory.qml:589
212+#: qml/Panel/Indicators/MenuItemFactory.qml:657
185msgid "Paused, tap to resume"
213msgid "Paused, tap to resume"
186msgstr "已暫停，輕觸可繼續"
214msgstr "已暫停，輕觸可繼續"
187
215
188−#: qml/Panel/Indicators/MenuItemFactory.qml:591
216+#: qml/Panel/Indicators/MenuItemFactory.qml:659
189msgid "Canceled"
217msgid "Canceled"
190msgstr "已取消"
218msgstr "已取消"
191
219
192−#: qml/Panel/Indicators/MenuItemFactory.qml:593
220+#: qml/Panel/Indicators/MenuItemFactory.qml:661
193msgid "Finished"
221msgid "Finished"
194msgstr "已完成"
222msgstr "已完成"
195
223
196−#: qml/Panel/Indicators/MenuItemFactory.qml:595
224+#: qml/Panel/Indicators/MenuItemFactory.qml:663
197msgid "Failed, tap to retry"
225msgid "Failed, tap to retry"
198msgstr "失敗，輕觸可重試"
226msgstr "失敗，輕觸可重試"
199
227
228+#: qml/Panel/Indicators/ModemInfoItem.qml:105
229+msgid "Unlock SIM"
230+msgstr ""
231+
232+#: qml/Panel/Indicators/RoamingIndication.qml:27
233+msgid "Roaming"
234+msgstr ""
235+
200#: qml/Panel/SearchIndicator.qml:27
236#: qml/Panel/SearchIndicator.qml:27
201msgid "Search"
237msgid "Search"
202msgstr "搜尋"
238msgstr "搜尋"
203
239
204−#: qml/Shell.qml:359
240+#: qml/Shell.qml:256
205#, qt-format
241#, qt-format
206msgid "Please enter %1"
242msgid "Please enter %1"
207msgstr "請輸入 %1"
243msgstr "請輸入 %1"
qml/Components/Background.qml+6
@@ -15,6 +15,7 @@
15 */
15 */
16
16
17import QtQuick 2.0
17import QtQuick 2.0
18+import Utils 0.1 as Utils
18
19
19Loader {
20Loader {
20 id: root
21 id: root
@@ -23,6 +24,11 @@ Loader {
23 property url style
24 property url style
24 readonly property var parsedStyle: String(style)
25 readonly property var parsedStyle: String(style)
25 .match(/^(color|gradient):\/\/\/(?:(#(?:[0-9a-f]{3,4}){1,2}|[a-z]{3,}))(?:\/(#(?:[0-9a-f]{3,4}){1,2}|[a-z]{3,}))?\/?$/i)
26 .match(/^(color|gradient):\/\/\/(?:(#(?:[0-9a-f]{3,4}){1,2}|[a-z]{3,}))(?:\/(#(?:[0-9a-f]{3,4}){1,2}|[a-z]{3,}))?\/?$/i)
27+ readonly property var luminance: {
28+ if (!parsedStyle) return 0.5;
29+ if (parsedStyle[1] === "color") return Utils.Style.luminance(parsedStyle[2]);
30+ else if (parsedStyle[1] === "gradient") return Utils.Style.luminance(parsedStyle[2], parsedStyle[3]);
31+ }
26
32
27 sourceComponent: {
33 sourceComponent: {
28 if (style == "") return null;
34 if (style == "") return null;
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/Components/graphics/PageHeaderBaseDivider@18.pngdeleted

Binary file not shown.

qml/Components/graphics/PageHeaderBaseDivider@18.scideleted−5
@@ -1,5 +0,0 @@
1−border.top: 4
2−border.bottom: 4
3−border.left: 0
4−border.right: 0
5−source: PageHeaderBaseDivider@18.png
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)
58+ onPressAndHold: root.pressAndHold(index)
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/Dash.qml+1−1
@@ -271,7 +271,7 @@ Showable {
271 opacity: 0
271 opacity: 0
272 visible: opacity > 0
272 visible: opacity > 0
273
273
274− readonly property bool processing: dashContent.processing || scopeItem.processing
274+ readonly property bool processing: dashContent.processing || scopeItem.processing || scopesOverview.processing
275
275
276 Behavior on opacity {
276 Behavior on opacity {
277 UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
277 UbuntuNumberAnimation { duration: UbuntuAnimation.FastDuration }
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
@@ -233,6 +233,7 @@ FocusScope {
233 switch (cardTool.categoryLayout) {
233 switch (cardTool.categoryLayout) {
234 case "carousel": return "CardCarousel.qml";
234 case "carousel": return "CardCarousel.qml";
235 case "vertical-journal": return "CardVerticalJournal.qml";
235 case "vertical-journal": return "CardVerticalJournal.qml";
236+ case "horizontal-list": return "CardHorizontalList.qml";
236 case "grid":
237 case "grid":
237 default: return "CardGrid.qml";
238 default: return "CardGrid.qml";
238 }
239 }
@@ -372,7 +373,7 @@ FocusScope {
372 }
373 }
373 fontSize: "small"
374 fontSize: "small"
374 font.weight: Font.Bold
375 font.weight: Font.Bold
375− color: scopeStyle ? scopeStyle.foreground : "grey"
376+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
376 visible: baseItem.expandable && !baseItem.headerLink
377 visible: baseItem.expandable && !baseItem.headerLink
377 }
378 }
378 }
379 }
@@ -410,7 +411,7 @@ FocusScope {
410 width: categoryView.width
411 width: categoryView.width
411 height: section != "" ? units.gu(5) : 0
412 height: section != "" ? units.gu(5) : 0
412 text: section
413 text: section
413− color: scopeStyle ? scopeStyle.foreground : "grey"
414+ color: scopeStyle ? scopeStyle.foreground : Theme.palette.normal.baseText
414 iconName: delegate && delegate.headerLink ? "go-next" : ""
415 iconName: delegate && delegate.headerLink ? "go-next" : ""
415 onClicked: {
416 onClicked: {
416 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
417 if (delegate.headerLink) scopeView.scope.performQuery(delegate.headerLink);
qml/Components/PageHeader.qml → qml/Dash/PageHeader.qmlrenamed+25−24
@@ -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
@@ -287,25 +288,6 @@ Item {
287 }
288 }
288 }
289 }
289
290
290− Row {
291− spacing: units.gu(.5)
292− Repeater {
293− objectName: "paginationRepeater"
294− model: root.paginationCount
295− Image {
296− objectName: "paginationDots_" + index
297− height: units.gu(1)
298− width: height
299− source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
300− }
301− }
302− anchors {
303− top: headerContainer.bottom
304− horizontalCenter: headerContainer.horizontalCenter
305− topMargin: units.gu(.5)
306− }
307− }
308−
309 Component {
291 Component {
310 id: popoverComponent
292 id: popoverComponent
311 Popover {
293 Popover {
@@ -343,7 +325,7 @@ Item {
343 }
325 }
344 }
326 }
345
327
346− BorderImage {
328+ Rectangle {
347 id: bottomBorder
329 id: bottomBorder
348 anchors {
330 anchors {
349 top: headerContainer.bottom
331 top: headerContainer.bottom
@@ -352,7 +334,26 @@ Item {
352 bottom: bottomContainer.top
334 bottom: bottomContainer.top
353 }
335 }
354
336
355− source: "graphics/PageHeaderBaseDivider.sci"
337+ color: scopeStyle ? scopeStyle.headerDividerColor : "#e0e0e0"
338+ }
339+
340+ Row {
341+ spacing: units.gu(.5)
342+ Repeater {
343+ objectName: "paginationRepeater"
344+ model: root.paginationCount
345+ Image {
346+ objectName: "paginationDots_" + index
347+ height: units.gu(1)
348+ width: height
349+ source: (index == root.paginationIndex) ? "graphics/pagination_dot_on.png" : "graphics/pagination_dot_off.png"
350+ }
351+ }
352+ anchors {
353+ top: headerContainer.bottom
354+ horizontalCenter: headerContainer.horizontalCenter
355+ topMargin: units.gu(.5)
356+ }
356 }
357 }
357
358
358 Item {
359 Item {
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/PreviewActionButton.qml+1−4
@@ -15,16 +15,13 @@
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
19
20Button {
20Button {
21 signal triggeredAction(var actionData)
21 signal triggeredAction(var actionData)
22
22
23 property var data: null
23 property var data: null
24 objectName: "button" + (data && data.id || "")
24 objectName: "button" + (data && data.id || "")
25− color: Theme.palette.selected.foreground
26 text: data && data.label || ""
25 text: data && data.label || ""
27− iconSource: data && data.icon || ""
28− iconPosition: "left"
29 onClicked: triggeredAction(data)
26 onClicked: triggeredAction(data)
30}
27}
qml/Dash/Previews/PreviewActionCombo.qml+4−2
@@ -15,7 +15,7 @@
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
19
20Item {
20Item {
21 id: root
21 id: root
@@ -25,6 +25,7 @@ Item {
25 signal triggeredAction(var actionData)
25 signal triggeredAction(var actionData)
26
26
27 property alias model: actionRepeater.model
27 property alias model: actionRepeater.model
28+ property color strokeColor: Theme.palette.normal.textBase
28
29
29 Button {
30 Button {
30 id: moreButton
31 id: moreButton
@@ -32,7 +33,7 @@ Item {
32
33
33 objectName: "moreLessButton"
34 objectName: "moreLessButton"
34 text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
35 text: !expanded ? i18n.tr("More...") : i18n.tr("Less...")
35− color: Theme.palette.selected.foreground
36+ strokeColor: root.strokeColor
36 onClicked: expanded = !expanded
37 onClicked: expanded = !expanded
37 width: parent.width
38 width: parent.width
38 }
39 }
@@ -60,6 +61,7 @@ Item {
60 data: modelData
61 data: modelData
61 width: implicitWidth < parent.width ? parent.width : implicitWidth
62 width: implicitWidth < parent.width ? parent.width : implicitWidth
62 onClicked: root.triggeredAction(modelData)
63 onClicked: root.triggeredAction(modelData)
64+ strokeColor: root.strokeColor
63 }
65 }
64 }
66 }
65 }
67 }
qml/Dash/Previews/PreviewActions.qml+8
@@ -24,6 +24,8 @@ import QtQuick 2.1
24PreviewWidget {
24PreviewWidget {
25 id: root
25 id: root
26
26
27+ property var scopeStyle: null
28+
27 height: row.height + units.gu(1)
29 height: row.height + units.gu(1)
28
30
29 Row {
31 Row {
@@ -46,6 +48,11 @@ PreviewWidget {
46 item.model = row.actions.slice(1);
48 item.model = row.actions.slice(1);
47 }
49 }
48 }
50 }
51+ Binding {
52+ target: loader.item
53+ property: "strokeColor"
54+ value: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText
55+ }
49 Connections {
56 Connections {
50 target: loader.item
57 target: loader.item
51 onTriggeredAction: {
58 onTriggeredAction: {
@@ -59,6 +66,7 @@ PreviewWidget {
59 visible: row.actions && row.actions.length > 0
66 visible: row.actions && row.actions.length > 0
60 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
67 onTriggeredAction: root.triggered(root.widgetId, actionData.id, actionData)
61 width: (root.width - units.gu(1)) / 2
68 width: (root.width - units.gu(1)) / 2
69+ color: root.scopeStyle ? root.scopeStyle.previewButtonColor : Theme.palette.selected.foreground
62 }
70 }
63 }
71 }
64}
72}
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+9−1
@@ -32,6 +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 property bool growingDashFromPos: false
36 property bool growingDashFromPos: false
36 readonly property bool searching: scope && scope.searchQuery == ""
37 readonly property bool searching: scope && scope.searchQuery == ""
37 readonly property bool showingNonFavoriteScope: tempScopeItem.scope != null
38 readonly property bool showingNonFavoriteScope: tempScopeItem.scope != null
@@ -147,7 +148,12 @@ Item {
147
148
148 ScopeStyle {
149 ScopeStyle {
149 id: overviewScopeStyle
150 id: overviewScopeStyle
151+ style: { "foreground-color" : "white",
150− style: { "foreground-color" : "white", "background-color" : "transparent" }
152+ "background-color" : "transparent",
153+ "page-header": {
154+ "background": "color:///transparent"
155+ }
156+ }
151 }
157 }
152
158
153 DashBackground {
159 DashBackground {
@@ -302,6 +308,7 @@ Item {
302 Connections {
308 Connections {
303 target: loader.item
309 target: loader.item
304 onClicked: {
310 onClicked: {
311+ pageHeader.unfocus();
305 if (tabBar.currentTab == 0) {
312 if (tabBar.currentTab == 0) {
306 root.favoriteSelected(itemModel.scopeId);
313 root.favoriteSelected(itemModel.scopeId);
307 } else {
314 } else {
@@ -350,6 +357,7 @@ Item {
350 Behavior on opacity { UbuntuNumberAnimation { } }
357 Behavior on opacity { UbuntuNumberAnimation { } }
351
358
352 function itemClicked(index, result, item, itemModel, resultsModel, limitedCategoryItemCount) {
359 function itemClicked(index, result, item, itemModel, resultsModel, limitedCategoryItemCount) {
360+ pageHeader.unfocus();
353 pageHeader.closePopup();
361 pageHeader.closePopup();
354 if (itemModel.scopeId) {
362 if (itemModel.scopeId) {
355 // This can end up in openScope so save restorePosition and restoreSize
363 // This can end up in openScope so save restorePosition and restoreSize
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/Greeter/Greeter.qml+9−9
@@ -26,11 +26,12 @@ Showable {
26 created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
26 created: greeterContentLoader.status == Loader.Ready && greeterContentLoader.item.ready
27
27
28 property url defaultBackground
28 property url defaultBackground
29+ property bool loadContent: required
29
30
30 // 1 when fully shown and 0 when fully hidden
31 // 1 when fully shown and 0 when fully hidden
31 property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
32 property real showProgress: MathUtils.clamp((width - Math.abs(x)) / width, 0, 1)
32
33
33− showAnimation: StandardAnimation { property: "x"; to: 0 }
34+ showAnimation: StandardAnimation { property: "x"; to: 0; duration: UbuntuAnimation.FastDuration }
34 hideAnimation: __leftHideAnimation
35 hideAnimation: __leftHideAnimation
35
36
36 property alias dragHandleWidth: dragHandle.width
37 property alias dragHandleWidth: dragHandle.width
@@ -58,10 +59,8 @@ Showable {
58
59
59 onRequiredChanged: {
60 onRequiredChanged: {
60 // Reset hide animation to default once we're finished with it
61 // Reset hide animation to default once we're finished with it
61− if (!required) {
62+ if (required) {
62− // Put back on left for reliable show direction and so that
63+ // Reset hide animation so that a hide() call is reliably left
63− // if normal hide() is called, we don't animate from right.
64− x = -width
65 hideAnimation = __leftHideAnimation
64 hideAnimation = __leftHideAnimation
66 }
65 }
67 }
66 }
@@ -90,12 +89,13 @@ Showable {
90 onPressAndHold: {} // eat event, but no need to tease, as drag will cover it
89 onPressAndHold: {} // eat event, but no need to tease, as drag will cover it
91
90
92 onDragEnd: {
91 onDragEnd: {
93− if (rightEvaluator.shouldAutoComplete())
92+ if (greeter.x > 0 && rightEvaluator.shouldAutoComplete()) {
94 greeter.hideRight()
93 greeter.hideRight()
95− else if (leftEvaluator.shouldAutoComplete())
94+ } else if (greeter.x < 0 && leftEvaluator.shouldAutoComplete()) {
96 greeter.hide();
95 greeter.hide();
97− else
96+ } else {
98 greeter.show(); // undo drag
97 greeter.show(); // undo drag
98+ }
99 }
99 }
100
100
101 onDragValueChanged: {
101 onDragValueChanged: {
@@ -127,7 +127,7 @@ Showable {
127 property var infographicModel: LightDM.Infographic
127 property var infographicModel: LightDM.Infographic
128 readonly property int backgroundTopMargin: -greeter.y
128 readonly property int backgroundTopMargin: -greeter.y
129
129
130− source: required ? "GreeterContent.qml" : ""
130+ source: loadContent ? "GreeterContent.qml" : ""
131
131
132 onLoaded: {
132 onLoaded: {
133 selected(currentIndex);
133 selected(currentIndex);
qml/Greeter/Infographics.qml+46−102
@@ -26,6 +26,9 @@ Item {
26
26
27 property int animDuration: 10
27 property int animDuration: 10
28
28
29+ property bool __useDotAnimation: true
30+ property int __circleModifier: __useDotAnimation ? 1 : 2
31+
29 Connections {
32 Connections {
30 target: model
33 target: model
31
34
@@ -41,19 +44,24 @@ Item {
41
44
42 function startShowAnimation() {
45 function startShowAnimation() {
43 dotHideAnimTimer.stop()
46 dotHideAnimTimer.stop()
44− circleShrinkAnimTimer.stop()
45 notification.hideAnim.stop()
47 notification.hideAnim.stop()
46
48
49+ if (__useDotAnimation) {
47− dotShowAnimTimer.startFromBeginning()
50+ dotShowAnimTimer.startFromBeginning()
51+ }
48 notification.showAnim.start()
52 notification.showAnim.start()
49 }
53 }
50
54
51 function startHideAnimation() {
55 function startHideAnimation() {
52 dotShowAnimTimer.stop()
56 dotShowAnimTimer.stop()
53− circleGrowAnimTimer.stop()
57+ circleChangeAnimTimer.stop()
54 notification.showAnim.stop()
58 notification.showAnim.stop()
55
59
60+ if (__useDotAnimation) {
56− dotHideAnimTimer.startFromBeginning()
61+ dotHideAnimTimer.startFromBeginning()
62+ } else {
63+ circleChangeAnimTimer.startFromBeginning()
64+ }
57 notification.hideAnim.start()
65 notification.hideAnim.start()
58 }
66 }
59
67
@@ -73,22 +81,22 @@ Item {
73 anchors.centerIn: parent
81 anchors.centerIn: parent
74
82
75 Timer {
83 Timer {
76− id: circleGrowAnimTimer
84+ id: circleChangeAnimTimer
77
85
78 property int pastCircleCounter
86 property int pastCircleCounter
79 property int presentCircleCounter
87 property int presentCircleCounter
80
88
81− interval: animDuration
89+ interval: notification.duration
82 running: false
90 running: false
83 repeat: true
91 repeat: true
84 onTriggered: {
92 onTriggered: {
85 if (pastCircleCounter < pastCircles.count) {
93 if (pastCircleCounter < pastCircles.count) {
86 var nextCircle = pastCircles.itemAt(pastCircleCounter++)
94 var nextCircle = pastCircles.itemAt(pastCircleCounter++)
87− if (nextCircle !== null) nextCircle.pastCircleGrowAnim.start()
95+ if (nextCircle !== null) nextCircle.pastCircleChangeAnim.start()
88 }
96 }
89 if (pastCircleCounter > pastCircles.count / 2) {
97 if (pastCircleCounter > pastCircles.count / 2) {
90 var nextCircle = presentCircles.itemAt(presentCircleCounter++)
98 var nextCircle = presentCircles.itemAt(presentCircleCounter++)
91− if (nextCircle !== null) nextCircle.presentCircleGrowAnim.start()
99+ if (nextCircle !== null) nextCircle.presentCircleChangeAnim.start()
92 }
100 }
93 if (presentCircleCounter > infographic.model.currentDay && pastCircleCounter >= pastCircles.count) {
101 if (presentCircleCounter > infographic.model.currentDay && pastCircleCounter >= pastCircles.count) {
94 stop()
102 stop()
@@ -96,39 +104,8 @@ Item {
96 }
104 }
97
105
98 function startFromBeginning() {
106 function startFromBeginning() {
99− circleGrowAnimTimer.pastCircleCounter = 0
107+ circleChangeAnimTimer.pastCircleCounter = 0
100− circleGrowAnimTimer.presentCircleCounter = 0
108+ circleChangeAnimTimer.presentCircleCounter = 0
101− start()
102− }
103− }
104−
105− Timer {
106− id: circleShrinkAnimTimer
107−
108− property int pastCircleCounter
109− property int presentCircleCounter
110−
111− interval: animDuration
112− running: false
113− repeat: true
114− onTriggered: {
115− if (pastCircleCounter >= 0) {
116− var nextCircle = pastCircles.itemAt(pastCircleCounter--)
117− if (nextCircle !== null) nextCircle.pastCircleShrinkAnim.start()
118− }
119− if (pastCircleCounter < pastCircles.count / 2) {
120− var nextCircle = presentCircles.itemAt(presentCircleCounter--)
121− if (nextCircle !== null) nextCircle.presentCircleShrinkAnim.start()
122− }
123− if (presentCircleCounter < 0) {
124− stop()
125− infographic.model.readyForDataChange()
126− }
127− }
128−
129− function startFromBeginning() {
130− pastCircleCounter = pastCircles.count - 1
131− presentCircleCounter = model.currentDay
132 start()
109 start()
133 }
110 }
134 }
111 }
@@ -139,8 +116,7 @@ Item {
139 model: infographic.model.secondMonth
116 model: infographic.model.secondMonth
140
117
141 delegate: ObjectPositioner {
118 delegate: ObjectPositioner {
142− property alias pastCircleGrowAnim: pastCircleGrowAnim
119+ property alias pastCircleChangeAnim: pastCircleChangeAnim
143− property alias pastCircleShrinkAnim: pastCircleShrinkAnim
144
120
145 index: model.index
121 index: model.index
146 count: pastCircles.count
122 count: pastCircles.count
@@ -160,52 +136,33 @@ Item {
160 opacity: 0.0
136 opacity: 0.0
161 scale: 0.0
137 scale: 0.0
162 visible: modelData !== undefined
138 visible: modelData !== undefined
163− color: Gradient.threeColorByIndex(index, count, infographic.model.secondColor)
139+ color: "transparent"
164
140
165 SequentialAnimation {
141 SequentialAnimation {
166− id: pastCircleGrowAnim
142+ id: pastCircleChangeAnim
167
143
168 loops: 1
144 loops: 1
169 ParallelAnimation {
145 ParallelAnimation {
170 PropertyAnimation {
146 PropertyAnimation {
171 target: pastCircle
147 target: pastCircle
172 property: "opacity"
148 property: "opacity"
173− from: 0.0
174 to: pastCircle.circleOpacity
149 to: pastCircle.circleOpacity
175 easing.type: Easing.OutCurve
150 easing.type: Easing.OutCurve
176− duration: circleGrowAnimTimer.interval * 4
151+ duration: circleChangeAnimTimer.interval * __circleModifier
177 }
152 }
178 PropertyAnimation {
153 PropertyAnimation {
179 target: pastCircle
154 target: pastCircle
180 property: "scale"
155 property: "scale"
181− from: 0.0
182 to: modelData
156 to: modelData
183 easing.type: Easing.OutCurve
157 easing.type: Easing.OutCurve
184− duration: circleGrowAnimTimer.interval * 4
158+ duration: circleChangeAnimTimer.interval * __circleModifier
185− }
186− }
187− }
188−
189− SequentialAnimation {
190− id: pastCircleShrinkAnim
191−
192− loops: 1
193− ParallelAnimation {
194− PropertyAnimation {
195− target: pastCircle
196− property: "opacity"
197− from: pastCircle.circleOpacity
198− to: 0.0
199− easing.type: Easing.OutCurve
200− duration: circleShrinkAnimTimer.interval * 4
201 }
159 }
202− PropertyAnimation {
160+ ColorAnimation {
203 target: pastCircle
161 target: pastCircle
204− property: "scale"
162+ property: "color"
205− from: modelData
163+ to: Gradient.threeColorByIndex(index, count, infographic.model.secondColor)
206− to: 0.0
207 easing.type: Easing.OutCurve
164 easing.type: Easing.OutCurve
208− duration: circleShrinkAnimTimer.interval * 4
165+ duration: circleChangeAnimTimer.interval * __circleModifier
209 }
166 }
210 }
167 }
211 }
168 }
@@ -219,8 +176,7 @@ Item {
219 model: infographic.model.firstMonth
176 model: infographic.model.firstMonth
220
177
221 delegate: ObjectPositioner {
178 delegate: ObjectPositioner {
222− property alias presentCircleGrowAnim: presentCircleGrowAnim
179+ property alias presentCircleChangeAnim: presentCircleChangeAnim
223− property alias presentCircleShrinkAnim: presentCircleShrinkAnim
224
180
225 index: model.index
181 index: model.index
226 count: presentCircles.count
182 count: presentCircles.count
@@ -240,10 +196,10 @@ Item {
240 opacity: 0.0
196 opacity: 0.0
241 scale: 0.0
197 scale: 0.0
242 visible: modelData !== undefined
198 visible: modelData !== undefined
243− color: Gradient.threeColorByIndex(index, infographic.model.currentDay, infographic.model.firstColor)
199+ color: "transparent"
244
200
245 SequentialAnimation {
201 SequentialAnimation {
246− id: presentCircleGrowAnim
202+ id: presentCircleChangeAnim
247
203
248 loops: 1
204 loops: 1
249
205
@@ -253,36 +209,21 @@ Item {
253 property: "opacity"
209 property: "opacity"
254 to: presentCircle.circleOpacity
210 to: presentCircle.circleOpacity
255 easing.type: Easing.OutCurve
211 easing.type: Easing.OutCurve
256− duration: circleGrowAnimTimer.interval * 4
212+ duration: circleChangeAnimTimer.interval * __circleModifier
257 }
213 }
258 PropertyAnimation {
214 PropertyAnimation {
259 target: presentCircle
215 target: presentCircle
260 property: "scale"
216 property: "scale"
261 to: modelData
217 to: modelData
262 easing.type: Easing.OutCurve
218 easing.type: Easing.OutCurve
263− duration: circleGrowAnimTimer.interval * 4
219+ duration: circleChangeAnimTimer.interval * __circleModifier
264 }
220 }
265− }
221+ ColorAnimation {
266− }
267−
268− SequentialAnimation {
269− id: presentCircleShrinkAnim
270−
271− loops: 1
272− ParallelAnimation {
273− PropertyAnimation {
274 target: presentCircle
222 target: presentCircle
275− property: "opacity"
223+ property: "color"
276− to: 0.0
224+ to: Gradient.threeColorByIndex(index, infographic.model.currentDay, infographic.model.firstColor)
277 easing.type: Easing.OutCurve
225 easing.type: Easing.OutCurve
278− duration: circleShrinkAnimTimer.interval * 4
226+ duration: circleChangeAnimTimer.interval * __circleModifier
279− }
280− PropertyAnimation {
281− target: presentCircle
282− property: "scale"
283− to: 0.0
284− easing.type: Easing.OutCurve
285− duration: circleShrinkAnimTimer.interval * 4
286 }
227 }
287 }
228 }
288 }
229 }
@@ -313,7 +254,7 @@ Item {
313 stop()
254 stop()
314 }
255 }
315 if (dotCounter == Math.round(dots.count / 2)) {
256 if (dotCounter == Math.round(dots.count / 2)) {
316− circleGrowAnimTimer.startFromBeginning()
257+ circleChangeAnimTimer.startFromBeginning()
317 }
258 }
318 }
259 }
319
260
@@ -340,8 +281,8 @@ Item {
340 } else {
281 } else {
341 stop()
282 stop()
342 }
283 }
343− if (dotCounter == Math.round(dots.count / 2)) {
284+ if (dotCounter == 0) {
344− circleShrinkAnimTimer.startFromBeginning()
285+ infographic.model.readyForDataChange()
345 }
286 }
346 }
287 }
347
288
@@ -413,6 +354,7 @@ Item {
413 property alias showAnim: increaseOpacity
354 property alias showAnim: increaseOpacity
414
355
415 property real baseOpacity: 0.6
356 property real baseOpacity: 0.6
357+ property real duration: dotShowAnimTimer.interval * 5
416
358
417 height: 0.7 * backgroundCircle.width
359 height: 0.7 * backgroundCircle.width
418 width: notification.height
360 width: notification.height
@@ -432,7 +374,7 @@ Item {
432 property: "opacity"
374 property: "opacity"
433 from: 0.0
375 from: 0.0
434 to: notification.baseOpacity
376 to: notification.baseOpacity
435− duration: dotShowAnimTimer.interval * dots.count * 5
377+ duration: notification.duration * dots.count
436 }
378 }
437
379
438 PropertyAnimation {
380 PropertyAnimation {
@@ -442,7 +384,8 @@ Item {
442 property: "opacity"
384 property: "opacity"
443 from: notification.baseOpacity
385 from: notification.baseOpacity
444 to: 0.0
386 to: 0.0
445− duration: dotShowAnimTimer.interval * dots.count * 5
387+ duration: notification.duration * dots.count
388+ onStopped: if (!__useDotAnimation) infographic.model.readyForDataChange()
446 }
389 }
447 }
390 }
448 }
391 }
@@ -453,9 +396,10 @@ Item {
453 onDoubleClicked: {
396 onDoubleClicked: {
454 if (!dotHideAnimTimer.running &&
397 if (!dotHideAnimTimer.running &&
455 !dotShowAnimTimer.running &&
398 !dotShowAnimTimer.running &&
456− !circleShrinkAnimTimer.running &&
399+ !circleChangeAnimTimer.running) {
457− !circleGrowAnimTimer.running)
400+ __useDotAnimation = false
458 infographic.model.nextDataSource()
401 infographic.model.nextDataSource()
402+ }
459 }
403 }
460
404
461 onClicked: mouse.accepted = false
405 onClicked: mouse.accepted = false
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+3
@@ -311,6 +311,9 @@ Item {
311 onLoaded: {
311 onLoaded: {
312 notification.fullscreen = Qt.binding(function() { return fullscreen; });
312 notification.fullscreen = Qt.binding(function() { return fullscreen; });
313 }
313 }
314+ onAccepted: {
315+ notification.notification.invokeAction(actionRepeater.itemAt(0).actionId)
316+ }
314 }
317 }
315 }
318 }
316 }
319 }
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+59−11
@@ -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
@@ -48,9 +50,15 @@ Item {
48 property url background
50 property url background
49 readonly property real panelHeight: panel.panelHeight
51 readonly property real panelHeight: panel.panelHeight
50
52
53+ readonly property bool locked: LightDM.Greeter.active && !LightDM.Greeter.authenticated
54+
51 property bool sideStageEnabled: shell.width >= units.gu(100)
55 property bool sideStageEnabled: shell.width >= units.gu(100)
52 readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
56 readonly property string focusedApplicationId: ApplicationManager.focusedApplicationId
53
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+
54 function activateApplication(appId) {
62 function activateApplication(appId) {
55 if (ApplicationManager.findApplication(appId)) {
63 if (ApplicationManager.findApplication(appId)) {
56 ApplicationManager.requestFocusApplication(appId);
64 ApplicationManager.requestFocusApplication(appId);
@@ -253,13 +261,21 @@ Item {
253
261
254 onShowPrompt: {
262 onShowPrompt: {
255 if (greeter.narrowMode) {
263 if (greeter.narrowMode) {
264+ var promptText = text.toLowerCase()
265+ if (isDefaultPrompt) {
266+ promptText = lockscreen.alphaNumeric ?
267+ i18n.tr("passphrase") : i18n.tr("passcode")
268+ }
256− lockscreen.placeholderText = i18n.tr("Please enter %1").arg(text.toLowerCase());
269+ lockscreen.placeholderText = i18n.tr("Enter your %1").arg(promptText)
270+ lockscreen.wrongPlaceholderText = i18n.tr("Incorrect %1").arg(promptText) +
271+ "\n" +
272+ i18n.tr("Please re-enter")
257 lockscreen.show();
273 lockscreen.show();
258 }
274 }
259 }
275 }
260
276
261 onPromptlessChanged: {
277 onPromptlessChanged: {
262− if (LightDM.Greeter.promptless) {
278+ if (LightDM.Greeter.promptless && LightDM.Greeter.authenticated) {
263 lockscreen.hide()
279 lockscreen.hide()
264 } else {
280 } else {
265 lockscreen.reset();
281 lockscreen.reset();
@@ -268,13 +284,40 @@ Item {
268 }
284 }
269
285
270 onAuthenticationComplete: {
286 onAuthenticationComplete: {
287+ if (LightDM.Greeter.authenticated) {
288+ AccountsService.failedLogins = 0
289+ }
290+ // Else only penalize user for a failed login if they actually were
291+ // prompted for a password. We do this below after the promptless
292+ // early exit.
293+
271 if (LightDM.Greeter.promptless) {
294 if (LightDM.Greeter.promptless) {
272 return;
295 return;
273 }
296 }
297+
274 if (LightDM.Greeter.authenticated) {
298 if (LightDM.Greeter.authenticated) {
275 lockscreen.hide();
299 lockscreen.hide();
276 greeter.login();
300 greeter.login();
277 } else {
301 } else {
302+ AccountsService.failedLogins++
303+ if (maxFailedLogins >= 2) { // require at least a warning
304+ if (AccountsService.failedLogins === maxFailedLogins - 1) {
305+ var title = lockscreen.alphaNumeric ?
306+ i18n.tr("Sorry, incorrect passphrase.") :
307+ i18n.tr("Sorry, incorrect passcode.")
308+ var text = i18n.tr("This will be your last attempt.") + " " +
309+ (lockscreen.alphaNumeric ?
310+ i18n.tr("If passphrase is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted.") :
311+ i18n.tr("If passcode is entered incorrectly, your phone will conduct a factory reset and all personal data will be deleted."))
312+ lockscreen.showInfoPopup(title, text)
313+ } else if (AccountsService.failedLogins >= maxFailedLogins) {
314+ SystemImage.factoryReset() // Ouch!
315+ }
316+ }
317+ if (failedLoginsDelayAttempts > 0 && AccountsService.failedLogins % failedLoginsDelayAttempts == 0) {
318+ lockscreen.forceDelay(failedLoginsDelaySeconds * 1000)
319+ }
320+
278 lockscreen.clear(true);
321 lockscreen.clear(true);
279 if (greeter.narrowMode) {
322 if (greeter.narrowMode) {
280 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
323 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole))
@@ -309,8 +352,16 @@ Item {
309 }
352 }
310
353
311 property bool fullyShown: showProgress === 1.0
354 property bool fullyShown: showProgress === 1.0
355+ onFullyShownChanged: {
356+ // Wait until the greeter is completely covering lockscreen before resetting it.
357+ if (fullyShown && !LightDM.Greeter.authenticated) {
358+ lockscreen.reset();
359+ lockscreen.show();
360+ }
361+ }
362+
312 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
363 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
313− onShowProgressChanged: if (LightDM.Greeter.promptless && showProgress === 0) greeter.login()
364+ onShowProgressChanged: if (LightDM.Greeter.authenticated && showProgress === 0) greeter.login()
314
365
315 Greeter {
366 Greeter {
316 id: greeter
367 id: greeter
@@ -323,6 +374,7 @@ Item {
323 available: true
374 available: true
324 hides: [launcher, panel.indicators]
375 hides: [launcher, panel.indicators]
325 shown: true
376 shown: true
377+ loadContent: required || lockscreen.required // keeps content in memory for quick show()
326
378
327 defaultBackground: shell.background
379 defaultBackground: shell.background
328
380
@@ -347,10 +399,6 @@ Item {
347 if (greeter.narrowMode) {
399 if (greeter.narrowMode) {
348 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
400 LightDM.Greeter.authenticate(LightDM.Users.data(0, LightDM.UserRoles.NameRole));
349 }
401 }
350− if (!LightDM.Greeter.promptless) {
351− lockscreen.reset();
352− lockscreen.show();
353− }
354 greeter.fakeActiveForApp = "";
402 greeter.fakeActiveForApp = "";
355 greeter.forceActiveFocus();
403 greeter.forceActiveFocus();
356 }
404 }
@@ -400,7 +448,7 @@ Item {
400 }
448 }
401
449
402 if (LightDM.Greeter.active) {
450 if (LightDM.Greeter.active) {
403− if (!LightDM.Greeter.promptless) {
451+ if (!LightDM.Greeter.authenticated) {
404 lockscreen.show()
452 lockscreen.show()
405 }
453 }
406 greeter.hide()
454 greeter.hide()
@@ -412,7 +460,7 @@ Item {
412 }
460 }
413
461
414 function showDash() {
462 function showDash() {
415− if (LightDM.Greeter.active && !LightDM.Greeter.promptless) {
463+ if (shell.locked) {
416 return;
464 return;
417 }
465 }
418 if (greeter.shown) {
466 if (greeter.shown) {
@@ -436,7 +484,7 @@ Item {
436 anchors.fill: parent //because this draws indicator menus
484 anchors.fill: parent //because this draws indicator menus
437 indicators {
485 indicators {
438 hides: [launcher]
486 hides: [launcher]
439− available: edgeDemo.panelEnabled && greeter.fakeActiveForApp === ""
487+ available: edgeDemo.panelEnabled && !shell.locked
440 contentEnabled: edgeDemo.panelContentEnabled
488 contentEnabled: edgeDemo.panelContentEnabled
441 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
489 width: parent.width > units.gu(60) ? units.gu(40) : parent.width
442 panelHeight: units.gu(3)
490 panelHeight: units.gu(3)
@@ -460,7 +508,7 @@ Item {
460 anchors.bottom: parent.bottom
508 anchors.bottom: parent.bottom
461 width: parent.width
509 width: parent.width
462 dragAreaWidth: shell.edgeSize
510 dragAreaWidth: shell.edgeSize
463− available: edgeDemo.launcherEnabled && greeter.fakeActiveForApp === ""
511+ available: edgeDemo.launcherEnabled && !shell.locked
464
512
465 onShowDashHome: showHome()
513 onShowDashHome: showHome()
466 onDash: showDash()
514 onDash: showDash()
qml/Stages/AppSurfaceContainer.qmlnew file+96
@@ -0,0 +1,96 @@
1+/*
2+ * Copyright 2014 Canonical Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU Lesser General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU Lesser General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU Lesser General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+*/
16+
17+import QtQuick 2.0
18+import "Animations"
19+
20+SurfaceContainer {
21+ id: container
22+ property var promptSurfaces
23+
24+ property bool appHasCreatedASurface: false
25+
26+ onSurfaceChanged: {
27+ if (surface) {
28+ if (!appHasCreatedASurface) {
29+ surface.visible = false; // hide until splash screen removed
30+ appHasCreatedASurface = true;
31+ }
32+ }
33+ }
34+
35+ function revealSurface() {
36+ surface.visible = true;
37+ splashLoader.source = "";
38+ }
39+
40+ Timer { //FIXME - need to delay removing splash screen to allow surface resize to complete
41+ id: surfaceRevealDelay
42+ interval: 100
43+ onTriggered: surfaceContainer.revealSurface()
44+ }
45+
46+ Loader {
47+ z: 3
48+ id: splashLoader
49+ anchors.fill: parent
50+ }
51+
52+ Repeater {
53+ model: container.promptSurfaces
54+
55+ delegate: SurfaceContainer {
56+ anchors {
57+ fill: container
58+ topMargin: container.surface.anchors.topMargin
59+ rightMargin: container.surface.anchors.rightMargin
60+ bottomMargin: container.surface.anchors.bottomMargin
61+ leftMargin: container.surface.anchors.leftMargin
62+ }
63+
64+ z: 4 + index
65+ surface: modelData
66+
67+ Component.onCompleted: {
68+ animateIn();
69+ }
70+ }
71+ }
72+
73+ StateGroup {
74+ id: appSurfaceState
75+ states: [
76+ State {
77+ name: "noSurfaceYet"
78+ when: !surfaceContainer.appHasCreatedASurface
79+ StateChangeScript {
80+ script: { splashLoader.setSource("Splash.qml", { "name": model.name, "image": model.icon }); }
81+ }
82+ },
83+ State {
84+ name: "hasSurface"
85+ when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface !== null)
86+ StateChangeScript { script: { surfaceRevealDelay.start(); } }
87+ },
88+ State {
89+ name: "surfaceLostButAppStillAlive"
90+ when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface === null)
91+ // TODO - use app snapshot
92+ }
93+ ]
94+ state: "noSurfaceYet"
95+ }
96+}
qml/Stages/SpreadDelegate.qml+2−52
@@ -35,26 +35,12 @@ Item {
35 signal clicked()
35 signal clicked()
36 signal closed()
36 signal closed()
37
37
38− SurfaceContainer {
38+ AppSurfaceContainer {
39 id: surfaceContainer
39 id: surfaceContainer
40 objectName: "surfaceContainer"
40 objectName: "surfaceContainer"
41 anchors.fill: parent
41 anchors.fill: parent
42 surface: model.surface
42 surface: model.surface
43− property bool appHasCreatedASurface: false
43+ promptSurfaces: model.application.promptSurfaces
44−
45− onSurfaceChanged: {
46− if (surface) {
47− if (!appHasCreatedASurface) {
48− surface.visible = false; // hide until splash screen removed
49− appHasCreatedASurface = true;
50− }
51− }
52− }
53−
54− function revealSurface() {
55− surface.visible = true;
56− splashLoader.source = "";
57− }
58
44
59 Binding {
45 Binding {
60 target: surfaceContainer.surface
46 target: surfaceContainer.surface
@@ -75,12 +61,6 @@ Item {
75 value: root.interactive
61 value: root.interactive
76 }
62 }
77
63
78− Timer { //FIXME - need to delay removing splash screen to allow surface resize to complete
79− id: surfaceRevealDelay
80− interval: 100
81− onTriggered: surfaceContainer.revealSurface()
82− }
83−
84 Connections {
64 Connections {
85 target: surface
65 target: surface
86 // FIXME: I would rather not need to do this, but currently it doesn't get
66 // FIXME: I would rather not need to do this, but currently it doesn't get
@@ -115,36 +95,6 @@ Item {
115 }
95 }
116 }
96 }
117
97
118−
119− StateGroup {
120− id: appSurfaceState
121− states: [
122− State {
123− name: "noSurfaceYet"
124− when: !surfaceContainer.appHasCreatedASurface
125− StateChangeScript {
126− script: { splashLoader.setSource("Splash.qml", { "name": model.name, "image": model.icon }); }
127− }
128− },
129− State {
130− name: "hasSurface"
131− when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface !== null)
132− StateChangeScript { script: { surfaceRevealDelay.start(); } }
133− },
134− State {
135− name: "surfaceLostButAppStillAlive"
136− when: surfaceContainer.appHasCreatedASurface && (surfaceContainer.surface === null)
137− // TODO - use app snapshot
138− }
139− ]
140− state: "noSurfaceYet"
141− }
142−
143− Loader {
144− id: splashLoader
145− anchors.fill: surfaceContainer
146− }
147−
148 DraggingArea {
98 DraggingArea {
149 id: dragArea
99 id: dragArea
150 anchors.fill: parent
100 anchors.fill: parent
qml/Stages/SurfaceContainer.qml+5−22
@@ -40,19 +40,12 @@ Item {
40 childSurfaces[i].removed();
40 childSurfaces[i].removed();
41 }
41 }
42
42
43− //if we don't have children, nothing will tell us to animate out, so do it.
44− if (childSurfaces.length === 0) {
45− animateOut();
46− }
47− // tell our parent to animate out.
48− if (surface.parentSurface) {
49− surface.parentSurface.parent.animateOut();
43+ animateOut();
50− }
51 }
44 }
52 }
45 }
53
46
54 Repeater {
47 Repeater {
55− model: container.surface ? container.surface.childSurfaces : 0
48+ model: surface.childSurfaces
56
49
57 delegate: Loader {
50 delegate: Loader {
58 z: 2
51 z: 2
@@ -68,14 +61,13 @@ Item {
68 source: Qt.resolvedUrl("SurfaceContainer.qml")
61 source: Qt.resolvedUrl("SurfaceContainer.qml")
69 onLoaded: {
62 onLoaded: {
70 item.surface = modelData;
63 item.surface = modelData;
71− item.animateIn(swipeFromBottom);
64+ item.animateIn();
72− container.animateIn(swipeUp);
73 }
65 }
74 }
66 }
75 }
67 }
76
68
77− function animateIn(component) {
69+ function animateIn() {
78− var animation = component.createObject(container, { "surface": container.surface });
70+ var animation = swipeFromBottom.createObject(container, { "surface": container.surface });
79 animation.start();
71 animation.start();
80
72
81 var tmp = d.animations;
73 var tmp = d.animations;
@@ -104,20 +96,11 @@ Item {
104 id: swipeFromBottom
96 id: swipeFromBottom
105 SwipeFromBottomAnimation {}
97 SwipeFromBottomAnimation {}
106 }
98 }
107− Component {
108− id: swipeUp
109− SwipeUpAnimation {}
110− }
111− Component {
112− id: darkenFade
113− DarkenAndFadeInAnimation {}
114− }
115
99
116 states: [
100 states: [
117 State {
101 State {
118 name: "initial"
102 name: "initial"
119 PropertyChanges { target: surface; anchors.fill: container }
103 PropertyChanges { target: surface; anchors.fill: container }
120 }
104 }
121− // TODO: more animations!
122 ]
105 ]
123}
106}
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/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/greeter.py+2−1
@@ -28,6 +28,7 @@ class Greeter(UnityEmulatorBase):
28 def swipe(self):
28 def swipe(self):
29 """Swipe the greeter screen away."""
29 """Swipe the greeter screen away."""
30 self.created.wait_for(True)
30 self.created.wait_for(True)
31+ self.showProgress.wait_for(1)
31
32
32 rect = self.globalRect
33 rect = self.globalRect
33 start_x = rect[0] + rect[2] - 3
34 start_x = rect[0] + rect[2] - 3
@@ -36,7 +37,7 @@ class Greeter(UnityEmulatorBase):
36 stop_y = start_y
37 stop_y = start_y
37 self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
38 self.pointing_device.drag(start_x, start_y, stop_x, stop_y)
38
39
39− self.created.wait_for(False)
40+ self.showProgress.wait_for(0)
40
41
41 def get_prompt(self):
42 def get_prompt(self):
42 return self.select_single(
43 return self.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/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/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/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/Unity/Application/ApplicationDBusAdaptor.cpp+10−4
@@ -43,9 +43,9 @@ MirSurfaceItem* topSurface(MirSurfaceItem* surface)
43 return child ? child : surface;
43 return child ? child : surface;
44}
44}
45
45
46−quint32 ApplicationDBusAdaptor::addChildSurface(const QString &appId, const QString &surfaceImage)
46+quint32 ApplicationDBusAdaptor::addPromptSurface(const QString &appId, const QString &surfaceImage)
47{
47{
48− qDebug() << "ApplicationDBusAdaptor::addChildSurface - " << appId;
48+ qDebug() << "ApplicationDBusAdaptor::addPromptSurface to " << appId;
49
49
50 ApplicationInfo* application = m_applicationManager->findApplication(appId);
50 ApplicationInfo* application = m_applicationManager->findApplication(appId);
51 if (!application) {
51 if (!application) {
@@ -53,12 +53,18 @@ quint32 ApplicationDBusAdaptor::addChildSurface(const QString &appId, const QStr
53 return 0;
53 return 0;
54 }
54 }
55 quint32 surfaceId = ++nextId;
55 quint32 surfaceId = ++nextId;
56− MirSurfaceItem* surface = new MirSurfaceItem(QString("ChildSurface%1").arg(surfaceId),
56+ MirSurfaceItem* surface = new MirSurfaceItem(QString("%1-ChildSurface%2").arg(appId).arg(surfaceId),
57 MirSurfaceItem::Normal,
57 MirSurfaceItem::Normal,
58 MirSurfaceItem::Maximized,
58 MirSurfaceItem::Maximized,
59 QUrl(surfaceImage));
59 QUrl(surfaceImage));
60 m_childItems[surfaceId] = surface;
60 m_childItems[surfaceId] = surface;
61+
62+ if (application->promptSurfaceList().count() > 0) {
61− surface->setParentSurface(topSurface(application->surface()));
63+ surface->setParentSurface(topSurface(application->promptSurfaceList()[0]));
64+ } else {
65+ application->addPromptSurface(surface);
66+ }
67+
62 return surfaceId;
68 return surfaceId;
63}
69}
64
70
tests/mocks/Unity/Application/ApplicationDBusAdaptor.h+1−1
@@ -31,7 +31,7 @@ public:
31 ApplicationDBusAdaptor(ApplicationManager* applicationManager);
31 ApplicationDBusAdaptor(ApplicationManager* applicationManager);
32
32
33public Q_SLOTS:
33public Q_SLOTS:
34− quint32 addChildSurface(const QString& appId, const QString& surfaceImage);
34+ quint32 addPromptSurface(const QString& appId, const QString& surfaceImage);
35 void removeChildSurface(int surfaceId);
35 void removeChildSurface(int surfaceId);
36
36
37private:
37private:
tests/mocks/Unity/Application/ApplicationInfo.cpp+53
@@ -78,6 +78,7 @@ void ApplicationInfo::createSurface()
78
78
79void ApplicationInfo::setSurface(MirSurfaceItem* surface)
79void ApplicationInfo::setSurface(MirSurfaceItem* surface)
80{
80{
81+ qDebug() << "Application::setSurface - appId=" << appId() << "surface=" << surface;
81 if (m_surface == surface)
82 if (m_surface == surface)
82 return;
83 return;
83
84
@@ -98,3 +99,55 @@ void ApplicationInfo::setSurface(MirSurfaceItem* surface)
98 Q_EMIT surfaceChanged(m_surface);
99 Q_EMIT surfaceChanged(m_surface);
99 SurfaceManager::singleton()->registerSurface(m_surface);
100 SurfaceManager::singleton()->registerSurface(m_surface);
100}
101}
102+
103+void ApplicationInfo::addPromptSurface(MirSurfaceItem* surface)
104+{
105+ qDebug() << "ApplicationInfo::addPromptSurface " << surface->name() << " to " << name();
106+ if (surface == m_surface || m_promptSurfaces.contains(surface)) return;
107+
108+ surface->setApplication(this);
109+ m_promptSurfaces.append(surface);
110+ Q_EMIT promptSurfacesChanged();
111+}
112+
113+void ApplicationInfo::removeSurface(MirSurfaceItem* surface)
114+{
115+ if (m_surface == surface) {
116+ setSurface(nullptr);
117+ } else if (m_promptSurfaces.contains(surface)) {
118+ qDebug() << "Application::removeSurface " << surface->name() << " from " << name();
119+
120+ m_promptSurfaces.removeAll(surface);
121+ surface->setApplication(nullptr);
122+
123+ Q_EMIT promptSurfacesChanged();
124+ }
125+}
126+
127+QList<MirSurfaceItem*> ApplicationInfo::promptSurfaceList() const
128+{
129+ return m_promptSurfaces;
130+}
131+
132+QQmlListProperty<MirSurfaceItem> ApplicationInfo::promptSurfaces()
133+{
134+ return QQmlListProperty<MirSurfaceItem>(this,
135+ 0,
136+ ApplicationInfo::promptSurfaceCount,
137+ ApplicationInfo::promptSurfaceAt);
138+}
139+
140+int ApplicationInfo::promptSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop)
141+{
142+ ApplicationInfo *p = qobject_cast<ApplicationInfo*>(prop->object);
143+ return p->m_promptSurfaces.count();
144+}
145+
146+MirSurfaceItem* ApplicationInfo::promptSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index)
147+{
148+ ApplicationInfo *p = qobject_cast<ApplicationInfo*>(prop->object);
149+
150+ if (index < 0 || index >= p->m_promptSurfaces.count())
151+ return nullptr;
152+ return p->m_promptSurfaces[index];
153+}
tests/mocks/Unity/Application/ApplicationInfo.h+13
@@ -38,6 +38,7 @@ class ApplicationInfo : public ApplicationInfoInterface {
38 Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
38 Q_PROPERTY(bool fullscreen READ fullscreen WRITE setFullscreen NOTIFY fullscreenChanged)
39 Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
39 Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
40 Q_PROPERTY(MirSurfaceItem* surface READ surface NOTIFY surfaceChanged)
40 Q_PROPERTY(MirSurfaceItem* surface READ surface NOTIFY surfaceChanged)
41+ Q_PROPERTY(QQmlListProperty<MirSurfaceItem> promptSurfaces READ promptSurfaces NOTIFY promptSurfacesChanged DESIGNABLE false)
41
42
42 // Only exists in this fake implementation
43 // Only exists in this fake implementation
43
44
@@ -85,8 +86,15 @@ public:
85 void setSurface(MirSurfaceItem* surface);
86 void setSurface(MirSurfaceItem* surface);
86 MirSurfaceItem* surface() const { return m_surface; }
87 MirSurfaceItem* surface() const { return m_surface; }
87
88
89+ void removeSurface(MirSurfaceItem* surface);
90+
91+ void addPromptSurface(MirSurfaceItem* surface);
92+ QList<MirSurfaceItem*> promptSurfaceList() const;
93+ QQmlListProperty<MirSurfaceItem> promptSurfaces();
94+
88Q_SIGNALS:
95Q_SIGNALS:
89 void surfaceChanged(MirSurfaceItem*);
96 void surfaceChanged(MirSurfaceItem*);
97+ void promptSurfacesChanged();
90
98
91private Q_SLOTS:
99private Q_SLOTS:
92 void onStateChanged(State state);
100 void onStateChanged(State state);
@@ -94,10 +102,15 @@ private Q_SLOTS:
94 void createSurface();
102 void createSurface();
95
103
96private:
104private:
105+ static int promptSurfaceCount(QQmlListProperty<MirSurfaceItem> *prop);
106+ static MirSurfaceItem* promptSurfaceAt(QQmlListProperty<MirSurfaceItem> *prop, int index);
107+
97 QQuickItem *m_parentItem;
108 QQuickItem *m_parentItem;
98 MirSurfaceItem* m_surface;
109 MirSurfaceItem* m_surface;
110+ QList<MirSurfaceItem*> m_promptSurfaces;
99};
111};
100
112
101Q_DECLARE_METATYPE(ApplicationInfo*)
113Q_DECLARE_METATYPE(ApplicationInfo*)
114+Q_DECLARE_METATYPE(QQmlListProperty<MirSurfaceItem>)
102
115
103#endif // APPLICATION_H
116#endif // APPLICATION_H
tests/mocks/Unity/Application/ApplicationManager.cpp+3
@@ -51,6 +51,7 @@ ApplicationManager::ApplicationManager(QObject *parent)
51{
51{
52 m_roleNames.insert(RoleSurface, "surface");
52 m_roleNames.insert(RoleSurface, "surface");
53 m_roleNames.insert(RoleFullscreen, "fullscreen");
53 m_roleNames.insert(RoleFullscreen, "fullscreen");
54+ m_roleNames.insert(RoleApplication, "application");
54
55
55 buildListOfAvailableApplications();
56 buildListOfAvailableApplications();
56
57
@@ -92,6 +93,8 @@ QVariant ApplicationManager::data(const QModelIndex& index, int role) const {
92 return QVariant::fromValue(app->surface());
93 return QVariant::fromValue(app->surface());
93 case RoleFullscreen:
94 case RoleFullscreen:
94 return app->fullscreen();
95 return app->fullscreen();
96+ case RoleApplication:
97+ return QVariant::fromValue(app);
95 default:
98 default:
96 return QVariant();
99 return QVariant();
97 }
100 }
tests/mocks/Unity/Application/ApplicationManager.h+1
@@ -53,6 +53,7 @@ class ApplicationManager : public ApplicationManagerInterface {
53 enum MoreRoles {
53 enum MoreRoles {
54 RoleSurface = RoleScreenshot+1,
54 RoleSurface = RoleScreenshot+1,
55 RoleFullscreen,
55 RoleFullscreen,
56+ RoleApplication,
56 };
57 };
57 enum Role {
58 enum Role {
58 Dash, Default, Indicators, Notifications, Greeter, Launcher, OnScreenKeyboard,
59 Dash, Default, Indicators, Notifications, Greeter, Launcher, OnScreenKeyboard,
tests/mocks/Unity/Application/MirSurfaceItem.cpp+16−8
@@ -34,6 +34,8 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,
34 , m_parentSurface(nullptr)
34 , m_parentSurface(nullptr)
35 , m_haveInputMethod(false)
35 , m_haveInputMethod(false)
36{
36{
37+ qDebug() << "MirSurfaceItem::MirSurfaceItem() " << this->name();
38+
37 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
39 QQmlEngine::setObjectOwnership(this, QQmlEngine::CppOwnership);
38
40
39 // The virtual keyboard (input method) has a big transparent area so that
41 // The virtual keyboard (input method) has a big transparent area so that
@@ -46,6 +48,8 @@ MirSurfaceItem::MirSurfaceItem(const QString& name,
46
48
47MirSurfaceItem::~MirSurfaceItem()
49MirSurfaceItem::~MirSurfaceItem()
48{
50{
51+ qDebug() << "MirSurfaceItem::~MirSurfaceItem() " << name();
52+
49 QList<MirSurfaceItem*> children(m_children);
53 QList<MirSurfaceItem*> children(m_children);
50 for (MirSurfaceItem* child : children) {
54 for (MirSurfaceItem* child : children) {
51 child->setParentSurface(nullptr);
55 child->setParentSurface(nullptr);
@@ -54,7 +58,7 @@ MirSurfaceItem::~MirSurfaceItem()
54 m_parentSurface->removeChildSurface(this);
58 m_parentSurface->removeChildSurface(this);
55
59
56 if (m_application)
60 if (m_application)
57− m_application->setSurface(nullptr);
61+ m_application->removeSurface(this);
58}
62}
59
63
60void MirSurfaceItem::paint(QPainter * painter)
64void MirSurfaceItem::paint(QPainter * painter)
@@ -75,7 +79,7 @@ void MirSurfaceItem::release()
75 }
79 }
76
80
77 if (m_application) {
81 if (m_application) {
78− m_application->setSurface(nullptr);
82+ m_application->removeSurface(this);
79 }
83 }
80 if (!parent()) {
84 if (!parent()) {
81 deleteLater();
85 deleteLater();
@@ -104,20 +108,24 @@ void MirSurfaceItem::setParentSurface(MirSurfaceItem* surface)
104 Q_EMIT parentSurfaceChanged(surface);
108 Q_EMIT parentSurfaceChanged(surface);
105}
109}
106
110
111+void MirSurfaceItem::addChildSurface(MirSurfaceItem* surface)
112+{
113+ qDebug() << "MirSurfaceItem::addChildSurface " << surface->name() << " to " << name();
114+
115+ m_children.append(surface);
116+ Q_EMIT childSurfacesChanged();
117+}
118+
107void MirSurfaceItem::removeChildSurface(MirSurfaceItem* surface)
119void MirSurfaceItem::removeChildSurface(MirSurfaceItem* surface)
108{
120{
121+ qDebug() << "MirSurfaceItem::removeChildSurface " << surface->name() << " from " << name();
122+
109 if (m_children.contains(surface)) {
123 if (m_children.contains(surface)) {
110 m_children.removeOne(surface);
124 m_children.removeOne(surface);
111 Q_EMIT childSurfacesChanged();
125 Q_EMIT childSurfacesChanged();
112 }
126 }
113}
127}
114
128
115−void MirSurfaceItem::addChildSurface(MirSurfaceItem* surface)
116−{
117− m_children.append(surface);
118− Q_EMIT childSurfacesChanged();
119−}
120−
121QList<MirSurfaceItem*> MirSurfaceItem::childSurfaceList()
129QList<MirSurfaceItem*> MirSurfaceItem::childSurfaceList()
122{
130{
123 return m_children;
131 return m_children;
tests/mocks/Unity/Application/MirSurfaceItem.h+1
@@ -117,5 +117,6 @@ private:
117};
117};
118
118
119Q_DECLARE_METATYPE(MirSurfaceItem*)
119Q_DECLARE_METATYPE(MirSurfaceItem*)
120+Q_DECLARE_METATYPE(QList<MirSurfaceItem*>)
120
121
121#endif // MIRSURFACEITEM_H
122#endif // MIRSURFACEITEM_H
tests/mocks/Unity/fake_categories.cpp+6−2
@@ -109,11 +109,13 @@ Categories::data(const QModelIndex& index, int role) const
109 }
109 }
110 case RoleComponents:
110 case RoleComponents:
111 {
111 {
112− QVariantMap map, artMap;
112+ QVariantMap map, artMap, attributeMap;
113 artMap["aspect-ratio"] = "1.0";
113 artMap["aspect-ratio"] = "1.0";
114 artMap["field"] = "art";
114 artMap["field"] = "art";
115 map["art"] = artMap;
115 map["art"] = artMap;
116 map["title"] = "HOLA";
116 map["title"] = "HOLA";
117+ attributeMap["field"] = "attribute";
118+ map["attributes"] = attributeMap;
117 return map;
119 return map;
118 }
120 }
119 case RoleHeaderLink:
121 case RoleHeaderLink:
@@ -156,7 +158,7 @@ Categories::data(const QModelIndex& index, int role) const
156 }
158 }
157 case RoleComponents:
159 case RoleComponents:
158 {
160 {
159− QVariantMap map, artMap;
161+ QVariantMap map, artMap, attributeMap;
160 if (index.row() % 2 != 0) {
162 if (index.row() % 2 != 0) {
161 artMap["aspect-ratio"] = QString("1.%1").arg(index.row());
163 artMap["aspect-ratio"] = QString("1.%1").arg(index.row());
162 } else {
164 } else {
@@ -166,6 +168,8 @@ Categories::data(const QModelIndex& index, int role) const
166 map["art"] = artMap;
168 map["art"] = artMap;
167 map["title"] = "HOLA";
169 map["title"] = "HOLA";
168 map["subtitle"] = "HOLA";
170 map["subtitle"] = "HOLA";
171+ attributeMap["field"] = "attribute";
172+ map["attributes"] = attributeMap;
169 return map;
173 return map;
170 }
174 }
171 case RoleHeaderLink:
175 case RoleHeaderLink:
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+3−1
@@ -226,7 +226,9 @@ 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+ h["divider-color"] = "red";
231+ h["navigation-background"] = "color:///black";
230 m["page-header"] = h;
232 m["page-header"] = h;
231 }
233 }
232 return m;
234 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+5−7
@@ -61,18 +61,16 @@ Label {
61 id: titleLabel;
61 id: titleLabel;
62 objectName: "titleLabel";
62 objectName: "titleLabel";
63 anchors { right: parent.right;
63 anchors { right: parent.right;
64−rightMargin: units.gu(1);
65−left: parent.left;
64+ left: parent.left;
66−top: artShapeHolder.bottom;
65+ top: artShapeHolder.bottom;
67− topMargin: units.gu(1);
66+ topMargin: units.gu(1);
68−leftMargin: units.gu(1);
69− }
67+ }
70 elide: Text.ElideRight;
68 elide: Text.ElideRight;
71 fontSize: "small";
69 fontSize: "small";
72 wrapMode: Text.Wrap;
70 wrapMode: Text.Wrap;
73 maximumLineCount: 2;
71 maximumLineCount: 2;
74 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
75− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
73+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
76 visible: showHeader ;
74 visible: showHeader ;
77 text: root.title;
75 text: root.title;
78 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
tests/plugins/Dash/cardcreator/1.tst+1−1
@@ -1,3 +1,3 @@
1template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
1template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
2−components: {"art":{"aspect-ratio":1.6,"field":"art"},"title":{"field":"title"}}
2+components: {"art":{"aspect-ratio":1.6,"field":"art"},"title":{"field":"title"},"attributes":{}}
3result: 1.res
3result: 1.res
tests/plugins/Dash/cardcreator/2.res+28−20
@@ -26,7 +26,7 @@ Loader {
26 gradientColor: getColor(1) || color;
26 gradientColor: getColor(1) || color;
27 anchors.fill: parent;
27 anchors.fill: parent;
28 image: backgroundImage.source ? backgroundImage : null;
28 image: backgroundImage.source ? backgroundImage : null;
29− property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b;
29+ property real luminance: Style.luminance(color);
30 property Image backgroundImage: Image {
30 property Image backgroundImage: Image {
31 objectName: "backgroundImage";
31 objectName: "backgroundImage";
32 source: {
32 source: {
@@ -55,17 +55,19 @@ Row {
55 spacing: margins;
55 spacing: margins;
56 height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
56 height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
57 anchors { top: parent.top;
57 anchors { top: parent.top;
58− topMargin: units.gu(1);
58+ topMargin: units.gu(1);
59−left: parent.left;
59+ left: parent.left;
60− }
60+ }
61 anchors.right: parent.right;
61 anchors.right: parent.right;
62 anchors.margins: margins;
62 anchors.margins: margins;
63+ anchors.rightMargin: 0;
64+ data: [
63− data: [ Image {
65+Image {
64 id: mascotImage;
66 id: mascotImage;
65 objectName: "mascotImage";
67 objectName: "mascotImage";
66 anchors { verticalCenter: parent.verticalCenter; }
68 anchors { verticalCenter: parent.verticalCenter; }
67 readonly property int maxSize: Math.max(width, height) * 4;
69 readonly property int maxSize: Math.max(width, height) * 4;
68− source: cardData && cardData["mascot"];
70+ source: cardData && cardData["mascot"] || "";
69 width: units.gu(6);
71 width: units.gu(6);
70 height: units.gu(5.625);
72 height: units.gu(5.625);
71 sourceSize { width: maxSize; height: maxSize }
73 sourceSize { width: maxSize; height: maxSize }
@@ -74,37 +76,43 @@ left: parent.left;
74 verticalAlignment: Image.AlignVCenter;
76 verticalAlignment: Image.AlignVCenter;
75 visible: showHeader;
77 visible: showHeader;
76 }
78 }
77−
79+,Item {
78− ,
80+ id: headerTitleContainer;
79− Column {
80− anchors.verticalCenter: parent.verticalCenter;
81+ anchors { verticalCenter: parent.verticalCenter; }
81− spacing: units.dp(2);
82− width: parent.width - x;
82+ width: parent.width - x;
83+ implicitHeight: titleLabel.height + subtitleLabel.height;
84+ data: [
83− data: [ Label {
85+ Label {
84 id: titleLabel;
86 id: titleLabel;
85 objectName: "titleLabel";
87 objectName: "titleLabel";
88+ anchors { right: parent.right;
89+ rightMargin: units.gu(1);
86− anchors { left: parent.left; right: parent.right }
90+ left: parent.left;
91+ top: parent.top; }
87 elide: Text.ElideRight;
92 elide: Text.ElideRight;
88 fontSize: "small";
93 fontSize: "small";
89 wrapMode: Text.Wrap;
94 wrapMode: Text.Wrap;
90 maximumLineCount: 2;
95 maximumLineCount: 2;
91 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
96 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
92− 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);
93 visible: showHeader ;
98 visible: showHeader ;
94 text: root.title;
99 text: root.title;
95 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
100 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
96 horizontalAlignment: root.headerAlignment;
101 horizontalAlignment: root.headerAlignment;
97 }
102 }
98−
99− ,
100− Label {
103+ ,Label {
101 id: subtitleLabel;
104 id: subtitleLabel;
102 objectName: "subtitleLabel";
105 objectName: "subtitleLabel";
106+ anchors { right: parent.right;
103− anchors { left: parent.left; right: parent.right }
107+ left: parent.left;
108+ rightMargin: units.gu(1);
109+ top: titleLabel.bottom;
110+ }
111+ anchors.topMargin: units.dp(2);
104 elide: Text.ElideRight;
112 elide: Text.ElideRight;
105 fontSize: "small";
113 fontSize: "small";
106 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
114 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
107− 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);
108 visible: titleLabel.visible && titleLabel.text;
116 visible: titleLabel.visible && titleLabel.text;
109 text: cardData && cardData["subtitle"] || "";
117 text: cardData && cardData["subtitle"] || "";
110 font.weight: Font.Light;
118 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/2.tst+1−1
@@ -1,3 +1,3 @@
1template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}
1template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}
2−components: {"art":{"aspect-ratio":1},"background":{"field":"background"},"mascot":{"field":"icon"},"subtitle":{"field":"author"},"title":{"field":"title"}}
2+components: {"art":{"aspect-ratio":1},"background":{"field":"background"},"mascot":{"field":"icon"},"subtitle":{"field":"author"},"title":{"field":"title"},"attributes":{}}
3result: 2.res
3result: 2.res
tests/plugins/Dash/cardcreator/3.res+11−14
@@ -61,18 +61,16 @@ Label {
61 id: titleLabel;
61 id: titleLabel;
62 objectName: "titleLabel";
62 objectName: "titleLabel";
63 anchors { right: parent.right;
63 anchors { right: parent.right;
64−rightMargin: units.gu(1);
65−left: parent.left;
64+ left: parent.left;
66−top: artShapeHolder.bottom;
65+ top: artShapeHolder.bottom;
67− topMargin: units.gu(1);
66+ topMargin: units.gu(1);
68−leftMargin: units.gu(1);
69− }
67+ }
70 elide: Text.ElideRight;
68 elide: Text.ElideRight;
71 fontSize: "small";
69 fontSize: "small";
72 wrapMode: Text.Wrap;
70 wrapMode: Text.Wrap;
73 maximumLineCount: 2;
71 maximumLineCount: 2;
74 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
72 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
75− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
73+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
76 visible: showHeader ;
74 visible: showHeader ;
77 text: root.title;
75 text: root.title;
78 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
76 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -82,16 +80,15 @@ Label {
82 id: subtitleLabel;
80 id: subtitleLabel;
83 objectName: "subtitleLabel";
81 objectName: "subtitleLabel";
84 anchors { left: titleLabel.left;
82 anchors { left: titleLabel.left;
85− leftMargin: titleLabel.leftMargin;
83+ leftMargin: titleLabel.leftMargin;
86− right: titleLabel.right;
84+ right: titleLabel.right;
87− rightMargin: titleLabel.rightMargin;
88− top: titleLabel.bottom;
85+ top: titleLabel.bottom;
86+ }
89− topMargin: units.dp(2);
87+ anchors.topMargin: units.dp(2);
90− }
91 elide: Text.ElideRight;
88 elide: Text.ElideRight;
92 fontSize: "small";
89 fontSize: "small";
93 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
90 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
94− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
91+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
95 visible: titleLabel.visible && titleLabel.text;
92 visible: titleLabel.visible && titleLabel.text;
96 text: cardData && cardData["subtitle"] || "";
93 text: cardData && cardData["subtitle"] || "";
97 font.weight: Font.Light;
94 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/3.tst+1−1
@@ -1,3 +1,3 @@
1template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
1template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
2−components: {"art":{"aspect-ratio":0.75,"field":"art"},"subtitle":{"field":"price"},"title":{"field":"title"}}
2+components: {"art":{"aspect-ratio":0.75,"field":"art"},"subtitle":{"field":"price"},"title":{"field":"title"},"attributes":{}}
3result: 3.res
3result: 3.res
tests/plugins/Dash/cardcreator/4.res+25−17
@@ -27,7 +27,9 @@ Row {
27}
27}
28 anchors.right: parent.right;
28 anchors.right: parent.right;
29 anchors.margins: margins;
29 anchors.margins: margins;
30+ anchors.rightMargin: 0;
31+data: [
30−data: [ Loader {
32+Loader {
31 id: mascotShapeLoader;
33 id: mascotShapeLoader;
32 objectName: "mascotShapeLoader";
34 objectName: "mascotShapeLoader";
33 asynchronous: root.asynchronous;
35 asynchronous: root.asynchronous;
@@ -39,13 +41,12 @@ data: [ Loader {
39 anchors { verticalCenter: parent.verticalCenter; }
41 anchors { verticalCenter: parent.verticalCenter; }
40 }
42 }
41
43
42−,
43−Image {
44+,Image {
44 id: mascotImage;
45 id: mascotImage;
45 objectName: "mascotImage";
46 objectName: "mascotImage";
46 anchors { verticalCenter: parent.verticalCenter; }
47 anchors { verticalCenter: parent.verticalCenter; }
47 readonly property int maxSize: Math.max(width, height) * 4;
48 readonly property int maxSize: Math.max(width, height) * 4;
48− source: cardData && cardData["mascot"];
49+ source: cardData && cardData["mascot"] || "";
49 width: units.gu(6);
50 width: units.gu(6);
50 height: units.gu(5.625);
51 height: units.gu(5.625);
51 sourceSize { width: maxSize; height: maxSize }
52 sourceSize { width: maxSize; height: maxSize }
@@ -55,36 +56,43 @@ Image {
55 visible: false;
56 visible: false;
56 }
57 }
57
58
58−,
59+,Item {
59−Column {
60+ id: headerTitleContainer;
60− anchors.verticalCenter: parent.verticalCenter;
61+ anchors { verticalCenter: parent.verticalCenter; }
61− spacing: units.dp(2);
62− width: parent.width - x;
62+ width: parent.width - x;
63+ implicitHeight: titleLabel.height + subtitleLabel.height;
64+ data: [
63−data: [ Label {
65+Label {
64 id: titleLabel;
66 id: titleLabel;
65 objectName: "titleLabel";
67 objectName: "titleLabel";
68+ anchors { right: parent.right;
69+ rightMargin: units.gu(1);
66− anchors { left: parent.left; right: parent.right }
70+ left: parent.left;
71+ top: parent.top; }
67 elide: Text.ElideRight;
72 elide: Text.ElideRight;
68 fontSize: "small";
73 fontSize: "small";
69 wrapMode: Text.Wrap;
74 wrapMode: Text.Wrap;
70 maximumLineCount: 2;
75 maximumLineCount: 2;
71 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
76 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
72− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
77+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
73 visible: showHeader ;
78 visible: showHeader ;
74 text: root.title;
79 text: root.title;
75 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
80 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
76 horizontalAlignment: root.headerAlignment;
81 horizontalAlignment: root.headerAlignment;
77 }
82 }
78−,
79−Label {
83+,Label {
80 id: subtitleLabel;
84 id: subtitleLabel;
81 objectName: "subtitleLabel";
85 objectName: "subtitleLabel";
86+ anchors { right: parent.right;
82− anchors { left: parent.left; right: parent.right }
87+ left: parent.left;
83−
88+ rightMargin: units.gu(1);
89+ top: titleLabel.bottom;
90+ }
91+ anchors.topMargin: units.dp(2);
84 elide: Text.ElideRight;
92 elide: Text.ElideRight;
85 fontSize: "small";
93 fontSize: "small";
86 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
94 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
87− color: root.scopeStyle ? root.scopeStyle.foreground : "grey";
95+ color: root.scopeStyle ? root.scopeStyle.foreground : Theme.palette.normal.baseText;
88 visible: titleLabel.visible && titleLabel.text;
96 visible: titleLabel.visible && titleLabel.text;
89 text: cardData && cardData["subtitle"] || "";
97 text: cardData && cardData["subtitle"] || "";
90 font.weight: Font.Light;
98 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/4.tst+1−1
@@ -1,3 +1,3 @@
1template: {"card-layout":"horizontal","card-size":"large","category-layout":"grid","collapsed-rows":2}
1template: {"card-layout":"horizontal","card-size":"large","category-layout":"grid","collapsed-rows":2}
2−components: {"art":{"aspect-ratio":1},"mascot":{"field":"mascot"},"subtitle":{"field":"domain"},"title":{"field":"title"}}
2+components: {"art":{"aspect-ratio":1},"mascot":{"field":"mascot"},"subtitle":{"field":"domain"},"title":{"field":"title"},"attributes":{}}
3result: 4.res
3result: 4.res
tests/plugins/Dash/cardcreator/5.res+14−16
@@ -69,7 +69,7 @@ Loader {
69 sourceComponent: ShaderEffect {
69 sourceComponent: ShaderEffect {
70 id: overlay;
70 id: overlay;
71 height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
71 height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
72− property real luminance: 0.2126 * overlayColor.r + 0.7152 * overlayColor.g + 0.0722 * overlayColor.b;
72+ property real luminance: Style.luminance(overlayColor);
73 property color overlayColor: cardData && cardData["overlayColor"] || "#99000000";
73 property color overlayColor: cardData && cardData["overlayColor"] || "#99000000";
74 property var source: ShaderEffectSource {
74 property var source: ShaderEffectSource {
75 id: shaderSource;
75 id: shaderSource;
@@ -102,19 +102,18 @@ readonly property int headerHeight: titleLabel.height + subtitleLabel.height + s
102Label {
102Label {
103 id: titleLabel;
103 id: titleLabel;
104 objectName: "titleLabel";
104 objectName: "titleLabel";
105+ anchors { right: parent.right;
105− anchors { left: parent.left;
106+ left: parent.left;
106− leftMargin: units.gu(1);
107+ leftMargin: units.gu(1);
107− right: parent.right;
108− rightMargin: units.gu(1);
109− top: overlayLoader.top;
108+ top: overlayLoader.top;
110− topMargin: units.gu(1);
109+ topMargin: units.gu(1);
111− }
110+ }
112 elide: Text.ElideRight;
111 elide: Text.ElideRight;
113 fontSize: "small";
112 fontSize: "small";
114 wrapMode: Text.Wrap;
113 wrapMode: Text.Wrap;
115 maximumLineCount: 2;
114 maximumLineCount: 2;
116 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
117− 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);
118 visible: showHeader && overlayLoader.active;
117 visible: showHeader && overlayLoader.active;
119 text: root.title;
118 text: root.title;
120 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
119 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
@@ -124,16 +123,15 @@ Label {
124 id: subtitleLabel;
123 id: subtitleLabel;
125 objectName: "subtitleLabel";
124 objectName: "subtitleLabel";
126 anchors { left: titleLabel.left;
125 anchors { left: titleLabel.left;
127− leftMargin: titleLabel.leftMargin;
126+ leftMargin: titleLabel.leftMargin;
128− right: titleLabel.right;
127+ right: titleLabel.right;
129− rightMargin: titleLabel.rightMargin;
130− top: titleLabel.bottom;
128+ top: titleLabel.bottom;
129+ }
131− topMargin: units.dp(2);
130+ anchors.topMargin: units.dp(2);
132− }
133 elide: Text.ElideRight;
131 elide: Text.ElideRight;
134 fontSize: "small";
132 fontSize: "small";
135 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
133 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
136− 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);
137 visible: titleLabel.visible && titleLabel.text;
135 visible: titleLabel.visible && titleLabel.text;
138 text: cardData && cardData["subtitle"] || "";
136 text: cardData && cardData["subtitle"] || "";
139 font.weight: Font.Light;
137 font.weight: Font.Light;
tests/plugins/Dash/cardcreator/5.tst+1−1
@@ -1,3 +1,3 @@
1template: {"card-layout":"vertical","card-size":"medium","category-layout":"carousel","collapsed-rows":2,"overlay":true}
1template: {"card-layout":"vertical","card-size":"medium","category-layout":"carousel","collapsed-rows":2,"overlay":true}
2−components: {"art":{"aspect-ratio":1,"field":"art"},"subtitle":{"field":"artist"},"title":{"field":"title"}}
2+components: {"art":{"aspect-ratio":1,"field":"art"},"subtitle":{"field":"artist"},"title":{"field":"title"},"attributes":{}}
3result: 5.res
3result: 5.res
tests/plugins/Dash/cardcreator/6.res+97−44
@@ -13,57 +13,110 @@ AbstractButton {
13 property bool asynchronous: true;
13 property bool asynchronous: true;
14 property bool showHeader: true;
14 property bool showHeader: true;
15 implicitWidth: childrenRect.width;
15 implicitWidth: childrenRect.width;
16−onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; }
17−readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
18−Item {
19− id: artShapeHolder;
20− height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height;
21− width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width;
22− anchors { horizontalCenter: parent.horizontalCenter; }
23− Loader {
16+Loader {
24− id: artShapeLoader;
17+ id: backgroundLoader;
25− objectName: "artShapeLoader";
18+ objectName: "backgroundLoader";
26− active: cardData && cardData["art"] || false;
19+ anchors.fill: parent;
27− asynchronous: root.asynchronous;
20+ asynchronous: root.asynchronous;
28− visible: status == Loader.Ready;
21+ visible: status == Loader.Ready;
29− sourceComponent: UbuntuShape {
22+ sourceComponent: UbuntuShape {
30− id: artShape;
31− objectName: "artShape";
23+ objectName: "background";
32− radius: "medium";
24+ radius: "medium";
33− visible: image.status == Image.Ready;
25+ color: getColor(0) || "white";
34− readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1;
26+ gradientColor: getColor(1) || color;
35− readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1;
27+ anchors.fill: parent;
36− Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
28+ image: backgroundImage.source ? backgroundImage : null;
37− Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); }
29+ property real luminance: Style.luminance(color);
38− function updateWidthHeightBindings() {
30+ property Image backgroundImage: Image {
39− if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) {
31+ objectName: "backgroundImage";
40− width = root.fixedArtShapeSize.width;
32+ source: {
41− height = root.fixedArtShapeSize.height;
33+ if (cardData && typeof cardData["background"] === "string") return cardData["background"];
42− } else {
34+ else if (template && typeof template["card-background"] === "string") return template["card-background"];
43− width = Qt.binding(function() { return !visible ? 0 : image.width });
35+ else return "";
44− height = Qt.binding(function() { return !visible ? 0 : image.height });
36+ }
37+ }
38+ function getColor(index) {
39+ if (cardData && typeof cardData["background"] === "object"
40+ && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) {
41+ return cardData["background"]["elements"][index];
42+ } else if (template && typeof template["card-background"] === "object"
43+ && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient")) {
44+ return template["card-background"]["elements"][index];
45+ } else return undefined;
46+ }
45− }
47+ }
46 }
48 }
47− image: Image {
49+readonly property size artShapeSize: Qt.size(-1, -1);
48− objectName: "artImage";
50+readonly property int headerHeight: titleLabel.height + subtitleLabel.height + subtitleLabel.anchors.topMargin;
49− source: cardData && cardData["art"] || "";
51+Item {
50− cache: true;
52+ id: headerTitleContainer;
51− asynchronous: root.asynchronous;
53+ anchors { right: parent.right; left: parent.left;
52− fillMode: Image.PreserveAspectCrop;
54+ top: parent.top;
53− width: root.width;
55+ topMargin: units.gu(1);
54− height: width / artShape.aspect;
56+ leftMargin: units.gu(1);
55− }
57+ }
56− }
58+ width: parent.width - x;
59+ implicitHeight: titleLabel.height + subtitleLabel.height;
60+ data: [
61+ Label {
62+ id: titleLabel;
63+ objectName: "titleLabel";
64+ anchors { right: emblemIcon.left;
65+ rightMargin: emblemIcon.width > 0 ? units.gu(0.5) : 0;
66+ left: parent.left;
67+ top: parent.top; }
68+ elide: Text.ElideRight;
69+ fontSize: "small";
70+ wrapMode: Text.Wrap;
71+ maximumLineCount: 2;
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 : Theme.palette.normal.baseText);
74+ visible: showHeader ;
75+ text: root.title;
76+ font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
77+ horizontalAlignment: root.headerAlignment;
57 }
78 }
58− }
79+,Label {
59−readonly property int headerHeight: 0;
80+ id: subtitleLabel;
81+ objectName: "subtitleLabel";
82+ anchors { right: parent.right;
83+ left: parent.left;
84+ rightMargin: units.gu(1);
85+ top: titleLabel.bottom;
86+ }
87+ anchors.topMargin: units.dp(2);
88+ elide: Text.ElideRight;
89+ fontSize: "small";
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 : Theme.palette.normal.baseText);
92+ visible: titleLabel.visible && titleLabel.text;
93+ text: cardData && cardData["subtitle"] || "";
94+ font.weight: Font.Light;
95+ horizontalAlignment: root.headerAlignment;
96+ }
97+,Icon {
98+ id: emblemIcon;
99+ objectName: "emblemIcon";
100+ anchors {
101+ bottom: titleLabel.baseline;
102+ right: parent.right;
103+ rightMargin: units.gu(1);
104+ }
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 : Theme.palette.normal.baseText);
107+ width: height;
108+ height: source != "" ? titleLabel.font.pixelSize : 0;
109+ }
110+
111+ ]
112+ }
60UbuntuShape {
113UbuntuShape {
61 id: touchdown;
114 id: touchdown;
62 objectName: "touchdown";
115 objectName: "touchdown";
63− anchors { fill: artShapeHolder }
116+ anchors { fill: backgroundLoader }
64 visible: root.pressed;
117 visible: root.pressed;
65 radius: "medium";
118 radius: "medium";
66 borderSource: "radius_pressed.sci"
119 borderSource: "radius_pressed.sci"
67}
120}
68−implicitHeight: artShapeHolder.height;
121+implicitHeight: headerTitleContainer.y + headerTitleContainer.height + units.gu(1);
69}
122}
tests/plugins/Dash/cardcreator/6.tst+2−2
@@ -1,3 +1,3 @@
1−template: {"card-layout":"vertical","card-size":"small","category-layout":"grid","collapsed-rows":2}
1+template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2}
2−components: {"art":{"aspect-ratio":1.6,"field":"art"}}
2+components: {"art":{"aspect-ratio":1},"background":{"field":"background"},"subtitle":{"field":"author"},"title":{"field":"title"},"emblem":{"field":"source"},"attributes":{}}
3result: 6.res
3result: 6.res
tests/plugins/Dash/cardcreator/7.res+36−24
@@ -26,7 +26,7 @@ Loader {
26 gradientColor: getColor(1) || color;
26 gradientColor: getColor(1) || color;
27 anchors.fill: parent;
27 anchors.fill: parent;
28 image: backgroundImage.source ? backgroundImage : null;
28 image: backgroundImage.source ? backgroundImage : null;
29− property real luminance: 0.2126 * color.r + 0.7152 * color.g + 0.0722 * color.b;
29+ property real luminance: Style.luminance(color);
30 property Image backgroundImage: Image {
30 property Image backgroundImage: Image {
31 objectName: "backgroundImage";
31 objectName: "backgroundImage";
32 source: {
32 source: {
@@ -55,17 +55,19 @@ Row {
55 spacing: margins;
55 spacing: margins;
56 height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
56 height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight;
57 anchors { top: parent.top;
57 anchors { top: parent.top;
58− topMargin: units.gu(1);
58+ topMargin: units.gu(1);
59−left: parent.left;
59+ left: parent.left;
60− }
60+ }
61 anchors.right: parent.right;
61 anchors.right: parent.right;
62 anchors.margins: margins;
62 anchors.margins: margins;
63− data: [ Image {
63+ anchors.rightMargin: 0;
64+ data: [
65+Image {
64 id: mascotImage;
66 id: mascotImage;
65 objectName: "mascotImage";
67 objectName: "mascotImage";
66 anchors { verticalCenter: parent.verticalCenter; }
68 anchors { verticalCenter: parent.verticalCenter; }
67 readonly property int maxSize: Math.max(width, height) * 4;
69 readonly property int maxSize: Math.max(width, height) * 4;
68− source: cardData && cardData["mascot"];
70+ source: cardData && cardData["mascot"] || "";
69 width: units.gu(6);
71 width: units.gu(6);
70 height: units.gu(5.625);
72 height: units.gu(5.625);
71 sourceSize { width: maxSize; height: maxSize }
73 sourceSize { width: maxSize; height: maxSize }
@@ -75,48 +77,58 @@ left: parent.left;
75 visible: showHeader;
77 visible: showHeader;
76 }
78 }
77
79
78− ,
80+,Item {
79− Column {
81+ id: headerTitleContainer;
80− anchors.verticalCenter: parent.verticalCenter;
82+ anchors { verticalCenter: parent.verticalCenter; }
81− spacing: units.dp(2);
83+ width: parent.width - x;
82− width: parent.width - x;
84+ implicitHeight: titleLabel.height + subtitleLabel.height + attributesRow.height;
83− data: [
85+ data: [
84− Label {
86+ Label {
85 id: titleLabel;
87 id: titleLabel;
86 objectName: "titleLabel";
88 objectName: "titleLabel";
87− anchors { left: parent.left; right: parent.right }
89+ anchors { right: parent.right;
90+ rightMargin: units.gu(1);
91+ left: parent.left;
92+ top: parent.top; }
88 elide: Text.ElideRight;
93 elide: Text.ElideRight;
89 fontSize: "small";
94 fontSize: "small";
90 wrapMode: Text.Wrap;
95 wrapMode: Text.Wrap;
91 maximumLineCount: 2;
96 maximumLineCount: 2;
92 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
97 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
93− 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);
94 visible: showHeader ;
99 visible: showHeader ;
95 text: root.title;
100 text: root.title;
96 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
101 font.weight: components && components["subtitle"] ? Font.DemiBold : Font.Normal;
97 horizontalAlignment: root.headerAlignment;
102 horizontalAlignment: root.headerAlignment;
98 }
103 }
99−,
104+,Label {
100−Label {
101 id: subtitleLabel;
105 id: subtitleLabel;
102 objectName: "subtitleLabel";
106 objectName: "subtitleLabel";
103− anchors { left: parent.left; right: parent.right }
107+ anchors { right: parent.right;
108+ left: parent.left;
109+ rightMargin: units.gu(1);
110+ top: titleLabel.bottom;
111+ }
112+ anchors.topMargin: units.dp(2);
104 elide: Text.ElideRight;
113 elide: Text.ElideRight;
105 fontSize: "small";
114 fontSize: "small";
106 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
115 font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale);
107− 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);
108 visible: titleLabel.visible && titleLabel.text;
117 visible: titleLabel.visible && titleLabel.text;
109 text: cardData && cardData["subtitle"] || "";
118 text: cardData && cardData["subtitle"] || "";
110 font.weight: Font.Light;
119 font.weight: Font.Light;
111 horizontalAlignment: root.headerAlignment;
120 horizontalAlignment: root.headerAlignment;
112 }
121 }
113−,
122+,CardAttributes {
114−CardAttributes {
115 id: attributesRow;
123 id: attributesRow;
116 objectName: "attributesRow";
124 objectName: "attributesRow";
117− anchors { left: parent.left; right: parent.right }
125+ anchors { right: parent.right;
118− 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");
126+ left: parent.left;
119− model: cardData["attributes"];
127+ rightMargin: units.gu(1);
128+ top: subtitleLabel.bottom;
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 : Theme.palette.normal.baseText);
131+ model: cardData && cardData["attributes"];
120 }
132 }
121
133
122 ]
134 ]
tests/plugins/Dash/tst_ScopeStyle.qml+54−33
@@ -18,6 +18,7 @@ import QtQuick 2.2
18import QtTest 1.0
18import QtTest 1.0
19import Dash 0.1
19import Dash 0.1
20import Ubuntu.Components 1.1
20import Ubuntu.Components 1.1
21+import Utils 0.1
21
22
22Rectangle {
23Rectangle {
23 width: units.gu(40)
24 width: units.gu(40)
@@ -35,39 +36,23 @@ Rectangle {
35 property color color
36 property color color
36 property var styles: [
37 property var styles: [
37 {},
38 {},
38− { "foreground-color": "red", "background-color": "black", "page-header": { "logo": "/foo/bar" } },
39+ { "foreground-color": "red", "background-color": "black", "page-header": { "logo": "/foo/bar" },
39− { "foreground-color": "green", "background-color": "white", "page-header": { "foreground-color": "black" } },
40+ "preview-button-color": "red"},
40− { "foreground-color": "blue", "background-color": "darkgrey", "page-header": { "background": "gradient:///white/blue" } },
41+ { "foreground-color": "green", "background-color": "white",
42+ "page-header": { "foreground-color": "black",
43+ "divider-color": "blue" } },
44+ { "foreground-color": "blue", "background-color": "darkgrey",
45+ "page-header": { "background": "gradient:///white/blue",
46+ "navigation-background": "gradient:///white/blue" } },
41 ]
47 ]
42
48
43 function cleanup() {
49 function cleanup() {
44 testCase.color = "transparent";
50 testCase.color = "transparent";
45 }
51 }
46
52
47− function test_luminance_data() {
48− return [
49− { tag: "#F00", luminance: 0.2126 },
50− { tag: "#0F0", luminance: 0.7152 },
51− { tag: "#00F", luminance: 0.0722 },
52− { tag: "white", luminance: 1.0 },
53− { tag: "black", luminance: 0.0 },
54− { tag: "lightgrey", luminance: 0.8275 },
55− { tag: "grey", luminance: 0.5020 },
56− { tag: "darkgrey", luminance: 0.6627 },
57− { tag: "red", luminance: 0.2126 },
58− { tag: "green", luminance: 0.3590 },
59− { tag: "blue", luminance: 0.0722 },
60− ];
61− }
62−
63− function test_luminance(data) {
64− testCase.color = data.tag;
65− compare(tool.luminance(testCase.color).toFixed(4), data.luminance.toFixed(4));
66− }
67−
68 function test_foreground_data() {
53 function test_foreground_data() {
69 return [
54 return [
70− { tag: "default", index: 0, foreground: "grey", luminance: 0.5020 },
55+ { tag: "default", index: 0, foreground: Theme.palette.normal.foreground, luminance: 0.5725 },
71 { tag: "red on black", index: 1, foreground: "red", luminance: 0.2126 },
56 { tag: "red on black", index: 1, foreground: "red", luminance: 0.2126 },
72 { tag: "green on white", index: 2, foreground: "green", luminance: 0.3590 },
57 { tag: "green on white", index: 2, foreground: "green", luminance: 0.3590 },
73 { tag: "blue on darkgrey", index: 3, foreground: "blue", luminance: 0.0722 },
58 { tag: "blue on darkgrey", index: 3, foreground: "blue", luminance: 0.0722 },
@@ -83,7 +68,7 @@ Rectangle {
83
68
84 function test_background_data() {
69 function test_background_data() {
85 return [
70 return [
86− { tag: "default", index: 0, background: "transparent" },
71+ { tag: "default", index: 0, background: "#00f5f5f5", luminance: 0.9608 },
87 { tag: "red on black", index: 1, background: "black", luminance: 0 },
72 { tag: "red on black", index: 1, background: "black", luminance: 0 },
88 { tag: "green on white", index: 2, background: "white", luminance: 1 },
73 { tag: "green on white", index: 2, background: "white", luminance: 1 },
89 { tag: "blue on darkgrey", index: 3, background: "darkgrey", luminance: 0.6627 },
74 { tag: "blue on darkgrey", index: 3, background: "darkgrey", luminance: 0.6627 },
@@ -94,14 +79,12 @@ Rectangle {
94 tool.style = testCase.styles[data.index];
79 tool.style = testCase.styles[data.index];
95 verify(Qt.colorEqual(tool.background, data.background),
80 verify(Qt.colorEqual(tool.background, data.background),
96 "Background color not equal: %1 != %2".arg(tool.background).arg(data.background));
81 "Background color not equal: %1 != %2".arg(tool.background).arg(data.background));
97− if (data.hasOwnProperty("luminance")) {
82+ compare(tool.backgroundLuminance.toFixed(4), data.luminance.toFixed(4));
98− compare(tool.backgroundLuminance.toFixed(4), data.luminance.toFixed(4));
99− }
100 }
83 }
101
84
102 function test_threshold_data() {
85 function test_threshold_data() {
103 return [
86 return [
104− { tag: "default", index: 0, threshold: 0.7510 },
87+ { tag: "default", index: 0, threshold: 0.7863 },
105 { tag: "red on black", index: 1, threshold: 0.1063 },
88 { tag: "red on black", index: 1, threshold: 0.1063 },
106 { tag: "green on white", index: 2, threshold: 0.6795 },
89 { tag: "green on white", index: 2, threshold: 0.6795 },
107 { tag: "blue on darkgrey", index: 3, threshold: 0.3675 },
90 { tag: "blue on darkgrey", index: 3, threshold: 0.3675 },
@@ -130,7 +113,7 @@ Rectangle {
130
113
131 function test_dark_data() {
114 function test_dark_data() {
132 return [
115 return [
133− { tag: "default", index: 0, dark: "grey" },
116+ { tag: "default", index: 0, dark: Theme.palette.normal.baseText },
134 { tag: "red on black", index: 1, dark: "black" },
117 { tag: "red on black", index: 1, dark: "black" },
135 { tag: "green on white", index: 2, dark: "green" },
118 { tag: "green on white", index: 2, dark: "green" },
136 { tag: "blue on darkgrey", index: 3, dark: "blue" },
119 { tag: "blue on darkgrey", index: 3, dark: "blue" },
@@ -157,7 +140,7 @@ Rectangle {
157
140
158 function test_headerForeground_data() {
141 function test_headerForeground_data() {
159 return [
142 return [
160− { tag: "default", index: 0, headerForeground: "grey" },
143+ { tag: "default", index: 0, headerForeground: Theme.palette.normal.baseText },
161 { tag: "black", index: 2, headerForeground: "black" },
144 { tag: "black", index: 2, headerForeground: "black" },
162 ];
145 ];
163 }
146 }
@@ -170,7 +153,7 @@ Rectangle {
170
153
171 function test_headerBackground_data() {
154 function test_headerBackground_data() {
172 return [
155 return [
173− { tag: "default", index: 0, headerBackground: "" },
156+ { tag: "default", index: 0, headerBackground: "color:///#f5f5f5" },
174 { tag: "black", index: 3, headerBackground: "gradient:///white/blue" },
157 { tag: "black", index: 3, headerBackground: "gradient:///white/blue" },
175 ];
158 ];
176 }
159 }
@@ -179,5 +162,43 @@ Rectangle {
179 tool.style = testCase.styles[data.index];
162 tool.style = testCase.styles[data.index];
180 compare(tool.headerBackground, data.headerBackground, "Header background was incorrect.");
163 compare(tool.headerBackground, data.headerBackground, "Header background was incorrect.");
181 }
164 }
165+
166+ function test_headerDividerColor_data() {
167+ return [
168+ { tag: "default", index: 0, headerDividerColor: "#e0e0e0" },
169+ { tag: "blue", index: 2, headerDividerColor: "blue" },
170+ ];
171+ }
172+
173+ function test_headerDividerColor(data) {
174+ tool.style = testCase.styles[data.index];
175+ verify(Qt.colorEqual(tool.headerDividerColor, data.headerDividerColor),
176+ "Header divider color not equal: %1 != %2".arg(tool.headerDividerColor).arg(data.headerDividerColor));
177+ }
178+
179+ function test_navigationBackground_data() {
180+ return [
181+ { tag: "default", index: 0, navigationBackground: "color:///#f5f5f5" },
182+ { tag: "black", index: 3, navigationBackground: "gradient:///white/blue" },
183+ ];
184+ }
185+
186+ function test_navigationBackground(data) {
187+ tool.style = testCase.styles[data.index];
188+ compare(tool.navigationBackground, data.navigationBackground, "Navigation background was incorrect.");
189+ }
190+
191+ function test_previewButtonColor_data() {
192+ return [
193+ { tag: "default", index: 0, previewButtonColor: Theme.palette.selected.foreground },
194+ { tag: "red", index: 1, previewButtonColor: "red" },
195+ ];
196+ }
197+
198+ function test_previewButtonColor(data) {
199+ tool.style = testCase.styles[data.index];
200+ verify(Qt.colorEqual(tool.previewButtonColor, data.previewButtonColor),
201+ "Preview button color not equal: %1 != %2".arg(tool.previewButtonColor).arg(data.previewButtonColor));
202+ }
182 }
203 }
183}
204}
tests/plugins/Utils/CMakeLists.txt+5
@@ -27,3 +27,8 @@ run_tests(
27 qsortfilterproxymodeltest
27 qsortfilterproxymodeltest
28 timeformattertest
28 timeformattertest
29 )
29 )
30+
31+# plain qml test
32+set(qmltest_DEFAULT_TARGETS qmltests)
33+set(qmltest_DEFAULT_PROPERTIES ENVIRONMENT "QT_QPA_PLATFORM=minimal")
34+add_qml_test(. UtilsStyle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins)
tests/plugins/Utils/tst_UtilsStyle.qmlnew file+47
@@ -0,0 +1,47 @@
1+/*
2+ * Copyright (C) 2014 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
17+import QtQuick 2.2
18+import QtTest 1.0
19+import Utils 0.1
20+
21+TestCase {
22+ id: testCase
23+ name: "UtilsStyle"
24+
25+ property color color
26+
27+ function test_luminance_data() {
28+ return [
29+ { tag: "#F00", luminance: 0.2126 },
30+ { tag: "#0F0", luminance: 0.7152 },
31+ { tag: "#00F", luminance: 0.0722 },
32+ { tag: "white", luminance: 1.0 },
33+ { tag: "black", luminance: 0.0 },
34+ { tag: "lightgrey", luminance: 0.8275 },
35+ { tag: "grey", luminance: 0.5020 },
36+ { tag: "darkgrey", luminance: 0.6627 },
37+ { tag: "red", luminance: 0.2126 },
38+ { tag: "green", luminance: 0.3590 },
39+ { tag: "blue", luminance: 0.0722 },
40+ ];
41+ }
42+
43+ function test_luminance(data) {
44+ testCase.color = data.tag;
45+ compare(Style.luminance(testCase.color).toFixed(4), data.luminance.toFixed(4));
46+ }
47+}
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_Background.qml+5−4
@@ -46,10 +46,10 @@ Rectangle {
46
46
47 function test_style_data() {
47 function test_style_data() {
48 return [
48 return [
49− { tag: "empty", style: "" },
49+ { tag: "empty", style: "", luminance: 0.5 },
50− { tag: "solid", style: "color:///black" },
50+ { tag: "solid", style: "color:///black", luminance: 0 },
51− { tag: "gradient", style: "gradient:///black/red" },
51+ { tag: "gradient", style: "gradient:///black/red", luminance: 0.1063 },
52− { tag: "image", style: "/some/path" },
52+ { tag: "image", style: "/some/path", luminance: 0.5 },
53 ];
53 ];
54 }
54 }
55
55
@@ -58,6 +58,7 @@ Rectangle {
58 expectFail("empty", "Empty style should not create a background.");
58 expectFail("empty", "Empty style should not create a background.");
59 loadedSpy.wait();
59 loadedSpy.wait();
60 compare(background.item.objectName, data.tag, "Background should be %1".arg(data.style));
60 compare(background.item.objectName, data.tag, "Background should be %1".arg(data.style));
61+ compare(background.luminance, data.luminance);
61 }
62 }
62
63
63 function test_solid() {
64 function test_solid() {
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/CardHelpers.js+1
@@ -60,6 +60,7 @@ var fullMapping = ' \
60 "art": "art", \
60 "art": "art", \
61 "subtitle": "subtitle", \
61 "subtitle": "subtitle", \
62 "mascot": "mascot", \
62 "mascot": "mascot", \
63+ "emblem": "emblem", \
63 "overlayColor": "overlayColor", \
64 "overlayColor": "overlayColor", \
64 "summary": "summary", \
65 "summary": "summary", \
65 "attributes": "attributes" \
66 "attributes": "attributes" \
tests/qmltests/Dash/Previews/tst_PreviewActions.qml+8−8
@@ -27,21 +27,21 @@ Rectangle {
27 height: units.gu(80)
27 height: units.gu(80)
28
28
29 property var actionDataOneAction: {
29 property var actionDataOneAction: {
30− "actions": [{"label": "Some Label", "icon": "../graphics/play_button.png", "id": "someid"}]
30+ "actions": [{"label": "Some Label", "id": "someid"}]
31 }
31 }
32
32
33 property var actionDataTwoActions: {
33 property var actionDataTwoActions: {
34− "actions": [{"label": "Some Label A", "icon": "../graphics/icon_clear.png", "id": "someid1"},
34+ "actions": [{"label": "Some Label A", "id": "someid1"},
35− {"label": "Some Label B", "icon": "../graphics/play_button.png", "id": "someid2"}
35+ {"label": "Some Label B", "id": "someid2"}
36 ]
36 ]
37 }
37 }
38
38
39 property var actionDataFiveActions: {
39 property var actionDataFiveActions: {
40− "actions": [{"label": "Some Label C", "icon": "../graphics/play_button.png", "id": "someid3"},
40+ "actions": [{"label": "Some Label C", "id": "someid3"},
41− {"label": "Some Label D", "icon": "../graphics/icon_clear.png", "id": "someid4"},
41+ {"label": "Some Label D", "id": "someid4"},
42− {"label": "Some Label E", "icon": "../graphics/play_button.png", "id": "someid5"},
42+ {"label": "Some Label E", "id": "someid5"},
43− {"label": "Some Label F", "icon": "../graphics/icon_clear.png", "id": "someid6"},
43+ {"label": "Some Label F", "id": "someid6"},
44− {"label": "Some Label G", "icon": "../graphics/play_button.png", "id": "someid7"}
44+ {"label": "Some Label G", "id": "someid7"}
45 ]
45 ]
46 }
46 }
47
47
tests/qmltests/Dash/artwork/emblem.pngnew file

Binary file not shown.

tests/qmltests/Dash/tst_Card.qml+20−2

This diff is too big to show here.

tests/qmltests/Dash/tst_CardTool.qml+6

This diff is too big to show here.

tests/qmltests/Dash/tst_Dash.qml+7−7

This diff is too big to show here.

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

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Components/tst_PageHeader.qml → tests/qmltests/Dash/tst_PageHeader.qmlrenamed+2−2

This diff is too big to show here.

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

This diff is too big to show here.

tests/qmltests/Greeter/tst_Lockscreen.qml−2

This diff is too big to show here.

tests/qmltests/tst_ShellWithPin.qml+69−4

This diff is too big to show here.