git.iko.soy/unity8
on xenial help sign in
merge trunk
90de529Alberto Aguirre
cmake/modules/QmlTest.cmake+4−4
compare with xenial
unifiedsplit
@@ -51,7 +51,7 @@ macro(add_manual_qml_test SUBPATH COMPONENT_NAME)
51
51
52 set(qmlscene_command
52 set(qmlscene_command
53 env ${qmltest_ENVIRONMENT}
53 env ${qmltest_ENVIRONMENT}
54− ${qmlscene_exe} ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
54+ ${qmlscene_exe} -qmljsdebugger=port:3768 ${CMAKE_CURRENT_SOURCE_DIR}/${qmltest_FILE}.qml
55 ${qmlscene_imports}
55 ${qmlscene_imports}
56 )
56 )
57 add_custom_target(${qmlscene_TARGET} ${qmlscene_command})
57 add_custom_target(${qmlscene_TARGET} ${qmlscene_command})
@@ -111,9 +111,9 @@ macro(add_qml_test_internal SUBPATH COMPONENT_NAME ITERATIONS)
111 -o -,txt
111 -o -,txt
112 ${function_ARGS}
112 ${function_ARGS}
113 )
113 )
114− find_program( HAVE_GCC gcc )
114+ find_program(DPKG dpkg-architecture)
115− if (NOT ${HAVE_GCC} STREQUAL "")
115+ if(DPKG)
116− exec_program( gcc ARGS "-dumpmachine" OUTPUT_VARIABLE ARCH_TRIPLET )
116+ exec_program(${DPKG} ARGS "-qDEB_BUILD_MULTIARCH" OUTPUT_VARIABLE ARCH_TRIPLET )
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
data/unity8-greeter-logrotate.confnew file+14
@@ -0,0 +1,14 @@
1+description "Unity 8 Greeter logrotate support"
2+author "Michael Terry <mterry@ubuntu.com>"
3+
4+start on unity8-greeter-started
5+task
6+
7+script
8+ # logrotate normally starts on startup and then sleeps for 60 seconds.
9+ # Otherwise, it skips that sleep. Since we can't emit the startup signal
10+ # for a unity8-greeter session, we have to trigger logrotate manually.
11+ # So we do the sleep ourselves in its stead.
12+ sleep 60
13+ initctl emit :sys:rotate-logs
14+end script
debian/changelog+132
@@ -1,3 +1,135 @@
1+unity8 (7.89+14.10.20140613-0ubuntu1) utopic; urgency=medium
2+
3+ [ Michael Terry ]
4+ * Revert split greeter for now. We will bring it back as an option
5+ for Desktop, but use a big hammer revert right now to get Touch back
6+ in shape.
7+
8+ [ CI bot ]
9+ * Fix build problems. Reviewed by: Michael Terry (LP: #1328850)
10+
11+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 13 Jun 2014 08:30:48 +0000
12+
13+unity8 (7.88+14.10.20140606-0ubuntu1) utopic; urgency=low
14+
15+ [ Michał Sawicz ]
16+ * Make lockscreen buttons translatable.
17+
18+ [ Albert Astals ]
19+ * Correctly mark these functions as overrides
20+ * Remove connections to non existant signal
21+ * Better test name
22+ * Improvements for headerless categories LVPWH: No section name -> no
23+ header LVPWH: New hasSectionHeader context property for delegates
24+ GSV: Add topMargin if no hasSectionHeader (LP: #1326415)
25+ * Make tryVerticalJournal, tryHorizontalJournal and tryOrganicGrid
26+ work again
27+
28+ [ Michael Zanetti ]
29+ * Don't crash when we get an invalid app from ApplicationManager (LP:
30+ #1309162)
31+
32+ [ Andrea Cimitan ]
33+ * Workaround for lp1324159 (LP: #1322233, #1324159)
34+
35+ [ CI bot ]
36+ * Resync trunk
37+
38+ [ Florian Boucault ]
39+ * Application startup: changed splash rectangle to be black instead of
40+ white and added a neat little animation. (LP: #1124265)
41+
42+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 06 Jun 2014 11:38:53 +0000
43+
44+unity8 (7.88+14.10.20140603.1-0ubuntu1) utopic; urgency=medium
45+
46+ [ Michael Terry ]
47+ * Bump version so ubuntu-touch-session can reference this one
48+
49+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 03 Jun 2014 20:31:00 +0000
50+
51+unity8 (7.87+14.10.20140603.1-0ubuntu1) utopic; urgency=low
52+
53+ [ CI bot ]
54+ * Resync trunk
55+
56+ [ Michał Sawicz ]
57+ * Move env setup past session init in greeter wrapper. (LP: #1325882)
58+
59+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 03 Jun 2014 10:33:11 +0000
60+
61+unity8 (7.87+14.10.20140530.1-0ubuntu3) utopic; urgency=medium
62+
63+ * no change rebuild
64+
65+ -- Oliver Grawert <ogra@ubuntu.com> Mon, 02 Jun 2014 16:19:10 +0200
66+
67+unity8 (7.87+14.10.20140530.1-0ubuntu2) utopic; urgency=medium
68+
69+ * drop dbus-x11 dependency of unity8-greeter, it makes us end up with
70+ multiple session dbus daemons which breaks many AP tests in the lab
71+
72+ -- Oliver Grawert <ogra@ubuntu.com> Mon, 02 Jun 2014 14:50:59 +0200
73+
74+unity8 (7.87+14.10.20140530.1-0ubuntu1) utopic; urgency=medium
75+
76+ [ Michael Terry ]
77+ * Bump version for Breaks due to unity8-greeter
78+ * In split mode, determine whether the application identifiers in
79+ AccountsService are click packages or not, so we know the correct
80+ url prefix to use.
81+ * Start logrotate in the greeter's session.
82+
83+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 30 May 2014 09:29:15 +0000
84+
85+unity8 (7.86+14.10.20140527-0ubuntu1) utopic; urgency=low
86+
87+ [ Andrea Cimitan ]
88+ * Passes to make tryCommand -qmljsdebugger=port:3768 to enable
89+ debug/profiling test apps
90+ * Fixes carousel shadow
91+
92+ [ Michał Sawicz ]
93+ * Use dpkg-architecture, not gcc, to determine the machine triplet.
94+
95+ [ Ying-Chun Liu ]
96+ * Fix ZoomableImage test failure. (LP: #1317254)
97+
98+ [ Albert Astals ]
99+ * We don't need iconutils in this mock
100+ * Don't reserve space for mascot if no mascot is specified (LP:
101+ #1319343)
102+ * CardHeader is no more, remove stale line in CMakeLists.txt
103+ * GenericScopeViewTest: Wait a bit more Otherwise sometimes we end
104+ getting up the wrong delegate (maybe one that will be garbage
105+ collected?) (LP: #1322279)
106+ * Fix crash in organicgridtest
107+
108+ [ Daniel d'Andrada ]
109+ * Remove Shell's underlay background image as it cannot be seen
110+ anymore Now that the Dash has its own, opaque, background, the
111+ underlay's background image can no longer be seen. So it's just a
112+ waste of resources to have it.
113+
114+ [ Michael Terry ]
115+ * Use the same animation when dismissing a greeter slide from the
116+ launcher as from a normal greeter drag. (LP: #1316513)
117+
118+ [ Michael Zanetti ]
119+ * enhance lockscreen add a retry indication label (e.g. 3 attempts
120+ left). add an additional label (e.g. phone number for multi sim).
121+ add a infoPopup (e.g. to display a warning for last retry). add min
122+ and max limit values. add tests for the above (LP: #1302050)
123+
124+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 27 May 2014 07:47:11 +0000
125+
126+unity8 (7.86+14.10.20140522-0ubuntu1) utopic; urgency=low
127+
128+ [ Albert Astals ]
129+ * Use Interface classes from unity-api
130+
131+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 22 May 2014 17:59:23 +0000
132+
1unity8 (7.86+14.10.20140519-0ubuntu1) utopic; urgency=low
133unity8 (7.86+14.10.20140519-0ubuntu1) utopic; urgency=low
2
134
3 [ Ubuntu daily release ]
135 [ Ubuntu daily release ]
debian/control+2
@@ -90,7 +90,9 @@ Recommends: unity-scope-click,
90 unity-scope-scopes,
90 unity-scope-scopes,
91Breaks: indicator-network (<< 0.5.1),
91Breaks: indicator-network (<< 0.5.1),
92 ubuntu-touch-session (<< 0.107),
92 ubuntu-touch-session (<< 0.107),
93+ unity8-greeter (<< 7.89),
93Replaces: ubuntu-touch-session (<< 0.82~),
94Replaces: ubuntu-touch-session (<< 0.82~),
95+ unity8-greeter (<< 7.89),
94Description: Unity 8 shell
96Description: Unity 8 shell
95 The Unity 8 shell is the primary user interface for Ubuntu devices.
97 The Unity 8 shell is the primary user interface for Ubuntu devices.
96
98
plugins/Dash/CardCreator.js+3−3
@@ -70,10 +70,9 @@ var kArtShapeHolderCode = 'Item { \n\
70 radius: "medium"; \n\
70 radius: "medium"; \n\
71 readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1; \n\
71 readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1; \n\
72 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect; \n\
72 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect; \n\
73− Component.onCompleted: updateWidthHeightBindings(); \n\
73+ Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; } \n\
74 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings(); \n\
74 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings(); \n\
75 visible: image.status == Image.Ready; \n\
75 visible: image.status == Image.Ready; \n\
76− borderSource: artShapeBorderSource; \n\
77 function updateWidthHeightBindings() { \n\
76 function updateWidthHeightBindings() { \n\
78 if (aspectSmallerThanImageAspect) { \n\
77 if (aspectSmallerThanImageAspect) { \n\
79 width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\
78 width = Qt.binding(function() { return !visible ? 0 : image.width }); \n\
@@ -281,7 +280,7 @@ function cardString(template, components) {
281 property var template; \n\
280 property var template; \n\
282 property var components; \n\
281 property var components; \n\
283 property var cardData; \n\
282 property var cardData; \n\
284− property var artShapeBorderSource; \n\
283+ property var artShapeBorderSource: undefined; \n\
285 property real fontScale: 1.0; \n\
284 property real fontScale: 1.0; \n\
286 property int headerAlignment: Text.AlignLeft; \n\
285 property int headerAlignment: Text.AlignLeft; \n\
287 property int fixedHeaderHeight: -1; \n\
286 property int fixedHeaderHeight: -1; \n\
@@ -307,6 +306,7 @@ function cardString(template, components) {
307 }
306 }
308
307
309 if (hasArt) {
308 if (hasArt) {
309+ code += 'onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; } \n';
310 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
310 code += 'readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);\n';
311
311
312 var widthCode, heightCode;
312 var widthCode, heightCode;
plugins/Dash/abstractdashview.cpp+3
@@ -176,6 +176,9 @@ void AbstractDashView::refill()
176
176
177bool AbstractDashView::addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous)
177bool AbstractDashView::addVisibleItems(qreal fillFromY, qreal fillToY, bool asynchronous)
178{
178{
179+ if (fillToY <= fillFromY)
180+ return false;
181+
179 if (!delegate())
182 if (!delegate())
180 return false;
183 return false;
181
184
plugins/Dash/listviewwithpageheader.cpp+39−28
@@ -138,6 +138,13 @@ void ListViewWithPageHeader::ListItem::setCulled(bool culled)
138 QQuickItemPrivate::get(m_sectionItem)->setCulled(culled);
138 QQuickItemPrivate::get(m_sectionItem)->setCulled(culled);
139}
139}
140
140
141+void ListViewWithPageHeader::ListItem::setSectionItem(QQuickItem *sectionItem)
142+{
143+ m_sectionItem = sectionItem;
144+ QQmlContext *context = QQmlEngine::contextForObject(m_item)->parentContext();
145+ context->setContextProperty(QLatin1String("hasSectionHeader"), QVariant::fromValue<bool>(sectionItem != nullptr));
146+}
147+
141ListViewWithPageHeader::ListViewWithPageHeader()
148ListViewWithPageHeader::ListViewWithPageHeader()
142 : m_delegateModel(nullptr)
149 : m_delegateModel(nullptr)
143 , m_asyncRequestedIndex(-1)
150 , m_asyncRequestedIndex(-1)
@@ -422,7 +429,7 @@ bool ListViewWithPageHeader::maximizeVisibleArea(int modelIndex, int itemHeight)
422
429
423 ListItem *listItem = itemAtIndex(modelIndex);
430 ListItem *listItem = itemAtIndex(modelIndex);
424 if (listItem) {
431 if (listItem) {
425− return maximizeVisibleArea(listItem, itemHeight + (listItem->m_sectionItem ? listItem->m_sectionItem->height() : 0));
432+ return maximizeVisibleArea(listItem, itemHeight + (listItem->sectionItem() ? listItem->sectionItem()->height() : 0));
426 }
433 }
427
434
428 return false;
435 return false;
@@ -440,7 +447,7 @@ bool ListViewWithPageHeader::maximizeVisibleArea(ListItem *listItem, int listIte
440 contentYAnimationType = ContentYAnimationMaximizeVisibleArea;
447 contentYAnimationType = ContentYAnimationMaximizeVisibleArea;
441 m_contentYAnimation->start();
448 m_contentYAnimation->start();
442 } else if ((listItemY < contentY() && listItemY + listItemHeight < contentY() + height()) ||
449 } else if ((listItemY < contentY() && listItemY + listItemHeight < contentY() + height()) ||
443− (m_topSectionItem && !listItem->m_sectionItem && listItemY - m_topSectionItem->height() < contentY() && listItemY + listItemHeight < contentY() + height()))
450+ (m_topSectionItem && !listItem->sectionItem() && listItemY - m_topSectionItem->height() < contentY() && listItemY + listItemHeight < contentY() + height()))
444 {
451 {
445 // we can scroll the list down to show more stuff
452 // we can scroll the list down to show more stuff
446 auto realVisibleListItemY = listItemY;
453 auto realVisibleListItemY = listItemY;
@@ -449,7 +456,7 @@ bool ListViewWithPageHeader::maximizeVisibleArea(ListItem *listItem, int listIte
449 // item we have to make sure to scroll it a bit more so that it is not underlapping
456 // item we have to make sure to scroll it a bit more so that it is not underlapping
450 // the top section sticky item
457 // the top section sticky item
451 bool topSectionShown = !QQuickItemPrivate::get(m_topSectionItem)->culled;
458 bool topSectionShown = !QQuickItemPrivate::get(m_topSectionItem)->culled;
452− if (topSectionShown && !listItem->m_sectionItem) {
459+ if (topSectionShown && !listItem->sectionItem()) {
453 realVisibleListItemY -= m_topSectionItem->height();
460 realVisibleListItemY -= m_topSectionItem->height();
454 }
461 }
455 }
462 }
@@ -645,7 +652,7 @@ void ListViewWithPageHeader::reallyReleaseItem(ListItem *listItem)
645 if (flags & QQmlDelegateModel::Destroyed) {
652 if (flags & QQmlDelegateModel::Destroyed) {
646 item->setParentItem(nullptr);
653 item->setParentItem(nullptr);
647 }
654 }
648− delete listItem->m_sectionItem;
655+ delete listItem->sectionItem();
649 delete listItem;
656 delete listItem;
650}
657}
651
658
@@ -672,6 +679,9 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyI
672 return nullptr;
679 return nullptr;
673
680
674 const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
681 const QString section = m_delegateModel->stringValue(modelIndex, m_sectionProperty);
682+ if (section.isEmpty())
683+ return nullptr;
684+
675 if (modelIndex > 0) {
685 if (modelIndex > 0) {
676 const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);
686 const QString prevSection = m_delegateModel->stringValue(modelIndex - 1, m_sectionProperty);
677 if (section == prevSection)
687 if (section == prevSection)
@@ -684,8 +694,8 @@ QQuickItem *ListViewWithPageHeader::getSectionItem(int modelIndex, bool alreadyI
684 // Steal the section header
694 // Steal the section header
685 ListItem *nextItem = itemAtIndex(modelIndex); // Not +1 since not yet inserted into m_visibleItems
695 ListItem *nextItem = itemAtIndex(modelIndex); // Not +1 since not yet inserted into m_visibleItems
686 if (nextItem) {
696 if (nextItem) {
687− QQuickItem *sectionItem = nextItem->m_sectionItem;
697+ QQuickItem *sectionItem = nextItem->sectionItem();
688− nextItem->m_sectionItem = nullptr;
698+ nextItem->setSectionItem(nullptr);
689 return sectionItem;
699 return sectionItem;
690 }
700 }
691 }
701 }
@@ -793,7 +803,7 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn
793// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;
803// qDebug() << "ListViewWithPageHeader::createItem::We have the item" << modelIndex << item;
794 ListItem *listItem = new ListItem;
804 ListItem *listItem = new ListItem;
795 listItem->m_item = item;
805 listItem->m_item = item;
796− listItem->m_sectionItem = getSectionItem(modelIndex, false /*Not yet inserted into m_visibleItems*/);
806+ listItem->setSectionItem(getSectionItem(modelIndex, false /*Not yet inserted into m_visibleItems*/));
797 QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Geometry);
807 QQuickItemPrivate::get(item)->addItemChangeListener(this, QQuickItemPrivate::Geometry);
798 ListItem *prevItem = itemAtIndex(modelIndex - 1);
808 ListItem *prevItem = itemAtIndex(modelIndex - 1);
799 bool lostItem = false; // Is an item that we requested async but because of model changes
809 bool lostItem = false; // Is an item that we requested async but because of model changes
@@ -832,8 +842,8 @@ ListViewWithPageHeader::ListItem *ListViewWithPageHeader::createItem(int modelIn
832 m_firstVisibleIndex = modelIndex;
842 m_firstVisibleIndex = modelIndex;
833 polish();
843 polish();
834 }
844 }
835− if (listItem->m_sectionItem) {
845+ if (listItem->sectionItem()) {
836− QQmlContext *context = QQmlEngine::contextForObject(listItem->m_sectionItem)->parentContext();
846+ QQmlContext *context = QQmlEngine::contextForObject(listItem->sectionItem())->parentContext();
837 context->setContextProperty(QLatin1String("delegateIndex"), modelIndex);
847 context->setContextProperty(QLatin1String("delegateIndex"), modelIndex);
838 }
848 }
839 adjustMinYExtent();
849 adjustMinYExtent();
@@ -861,6 +871,7 @@ void ListViewWithPageHeader::itemCreated(int modelIndex, QObject *object)
861 QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();
871 QQmlContext *context = QQmlEngine::contextForObject(item)->parentContext();
862 context->setContextProperty(QLatin1String("ListViewWithPageHeader"), this);
872 context->setContextProperty(QLatin1String("ListViewWithPageHeader"), this);
863 context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));
873 context->setContextProperty(QLatin1String("heightToClip"), QVariant::fromValue<int>(0));
874+ context->setContextProperty(QLatin1String("hasSectionHeader"), QVariant::fromValue<bool>(false));
864 if (modelIndex == m_asyncRequestedIndex) {
875 if (modelIndex == m_asyncRequestedIndex) {
865 createItem(modelIndex, false);
876 createItem(modelIndex, false);
866 refill();
877 refill();
@@ -915,11 +926,11 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
915 if (visibleIndex >= 0 && visibleIndex < m_visibleItems.count()) {
926 if (visibleIndex >= 0 && visibleIndex < m_visibleItems.count()) {
916 ListItem *item = m_visibleItems[visibleIndex];
927 ListItem *item = m_visibleItems[visibleIndex];
917 // Pass the section item down if needed
928 // Pass the section item down if needed
918− if (item->m_sectionItem && visibleIndex + 1 < m_visibleItems.count()) {
929+ if (item->sectionItem() && visibleIndex + 1 < m_visibleItems.count()) {
919 ListItem *nextItem = m_visibleItems[visibleIndex + 1];
930 ListItem *nextItem = m_visibleItems[visibleIndex + 1];
920− if (!nextItem->m_sectionItem) {
931+ if (!nextItem->sectionItem()) {
921− nextItem->m_sectionItem = item->m_sectionItem;
932+ nextItem->setSectionItem(item->sectionItem());
922− item->m_sectionItem = nullptr;
933+ item->setSectionItem(nullptr);
923 }
934 }
924 }
935 }
925 releaseItem(item);
936 releaseItem(item);
@@ -982,11 +993,11 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
982 // if we need adding a new section item
993 // if we need adding a new section item
983 if (m_sectionDelegate) {
994 if (m_sectionDelegate) {
984 ListItem *nextItem = itemAtIndex(modelIndex + 1);
995 ListItem *nextItem = itemAtIndex(modelIndex + 1);
985− if (nextItem && !nextItem->m_sectionItem) {
996+ if (nextItem && !nextItem->sectionItem()) {
986− nextItem->m_sectionItem = getSectionItem(modelIndex + 1, true /* alredy inserted into m_visibleItems*/);
997+ nextItem->setSectionItem(getSectionItem(modelIndex + 1, true /* alredy inserted into m_visibleItems*/));
987− if (growUp && nextItem->m_sectionItem) {
998+ if (growUp && nextItem->sectionItem()) {
988 ListItem *firstItem = m_visibleItems.first();
999 ListItem *firstItem = m_visibleItems.first();
989− firstItem->setY(firstItem->y() - nextItem->m_sectionItem->height());
1000+ firstItem->setY(firstItem->y() - nextItem->sectionItem()->height());
990 }
1001 }
991 }
1002 }
992 }
1003 }
@@ -1012,8 +1023,8 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
1012// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;
1023// qDebug() << "ListViewWithPageHeader::onModelUpdated Change" << change.index << change.count;
1013 for (int i = change.index; i < change.count; ++i) {
1024 for (int i = change.index; i < change.count; ++i) {
1014 ListItem *item = itemAtIndex(i);
1025 ListItem *item = itemAtIndex(i);
1015− if (item && item->m_sectionItem) {
1026+ if (item && item->sectionItem()) {
1016− QQmlContext *context = QQmlEngine::contextForObject(item->m_sectionItem)->parentContext();
1027+ QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();
1017 const QString sectionText = m_delegateModel->stringValue(i, m_sectionProperty);
1028 const QString sectionText = m_delegateModel->stringValue(i, m_sectionProperty);
1018 context->setContextProperty(QLatin1String("section"), sectionText);
1029 context->setContextProperty(QLatin1String("section"), sectionText);
1019 }
1030 }
@@ -1026,8 +1037,8 @@ void ListViewWithPageHeader::onModelUpdated(const QQmlChangeSet &changeSet, bool
1026
1037
1027 for (int i = 0; i < m_visibleItems.count(); ++i) {
1038 for (int i = 0; i < m_visibleItems.count(); ++i) {
1028 ListItem *item = m_visibleItems[i];
1039 ListItem *item = m_visibleItems[i];
1029− if (item->m_sectionItem) {
1040+ if (item->sectionItem()) {
1030− QQmlContext *context = QQmlEngine::contextForObject(item->m_sectionItem)->parentContext();
1041+ QQmlContext *context = QQmlEngine::contextForObject(item->sectionItem())->parentContext();
1031 context->setContextProperty(QLatin1String("delegateIndex"), m_firstVisibleIndex + i);
1042 context->setContextProperty(QLatin1String("delegateIndex"), m_firstVisibleIndex + i);
1032 }
1043 }
1033 }
1044 }
@@ -1156,18 +1167,18 @@ void ListViewWithPageHeader::layout()
1156 if (topSectionStickPos > pos) {
1167 if (topSectionStickPos > pos) {
1157 showStickySectionItem = true;
1168 showStickySectionItem = true;
1158 } else if (topSectionStickPos == pos) {
1169 } else if (topSectionStickPos == pos) {
1159− showStickySectionItem = !item->m_sectionItem;
1170+ showStickySectionItem = !item->sectionItem();
1160 } else {
1171 } else {
1161 showStickySectionItem = false;
1172 showStickySectionItem = false;
1162 }
1173 }
1163 if (!showStickySectionItem) {
1174 if (!showStickySectionItem) {
1164 QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
1175 QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
1165− if (item->m_sectionItem) {
1176+ if (item->sectionItem()) {
1166 // This seems it should happen since why would we cull the top section
1177 // This seems it should happen since why would we cull the top section
1167 // if the first visible item has no section header? This only happens briefly
1178 // if the first visible item has no section header? This only happens briefly
1168 // when increasing the height of a list that is at the bottom, the m_topSectionItem
1179 // when increasing the height of a list that is at the bottom, the m_topSectionItem
1169 // gets shown shortly in the next polish call
1180 // gets shown shortly in the next polish call
1170− QQuickItemPrivate::get(item->m_sectionItem)->setCulled(false);
1181+ QQuickItemPrivate::get(item->sectionItem())->setCulled(false);
1171 }
1182 }
1172 } else {
1183 } else {
1173 // Update the top sticky section header
1184 // Update the top sticky section header
@@ -1186,14 +1197,14 @@ void ListViewWithPageHeader::layout()
1186 delegateIndex--;
1197 delegateIndex--;
1187 }
1198 }
1188 context->setContextProperty(QLatin1String("delegateIndex"), delegateIndex);
1199 context->setContextProperty(QLatin1String("delegateIndex"), delegateIndex);
1189− if (item->m_sectionItem) {
1200+ if (item->sectionItem()) {
1190− QQuickItemPrivate::get(item->m_sectionItem)->setCulled(true);
1201+ QQuickItemPrivate::get(item->sectionItem())->setCulled(true);
1191 }
1202 }
1192 }
1203 }
1193 }
1204 }
1194 }
1205 }
1195 QQmlContext *context = QQmlEngine::contextForObject(item->m_item)->parentContext();
1206 QQmlContext *context = QQmlEngine::contextForObject(item->m_item)->parentContext();
1196− const qreal clipFrom = visibleFrom + (!item->m_sectionItem && m_topSectionItem && !QQuickItemPrivate::get(m_topSectionItem)->culled ? m_topSectionItem->height() : 0);
1207+ const qreal clipFrom = visibleFrom + (!item->sectionItem() && m_topSectionItem && !QQuickItemPrivate::get(m_topSectionItem)->culled ? m_topSectionItem->height() : 0);
1197 if (!cull && pos < clipFrom) {
1208 if (!cull && pos < clipFrom) {
1198 context->setContextProperty(QLatin1String("heightToClip"), clipFrom - pos);
1209 context->setContextProperty(QLatin1String("heightToClip"), clipFrom - pos);
1199 } else {
1210 } else {
@@ -1210,7 +1221,7 @@ void ListViewWithPageHeader::layout()
1210 if (firstReallyVisibleItem >= 0) {
1221 if (firstReallyVisibleItem >= 0) {
1211 for (int i = firstReallyVisibleItem - m_firstVisibleIndex + 1; i < m_visibleItems.count(); ++i) {
1222 for (int i = firstReallyVisibleItem - m_firstVisibleIndex + 1; i < m_visibleItems.count(); ++i) {
1212 ListItem *item = m_visibleItems[i];
1223 ListItem *item = m_visibleItems[i];
1213− if (item->m_sectionItem) {
1224+ if (item->sectionItem()) {
1214 if (m_topSectionItem->y() + m_topSectionItem->height() > item->y()) {
1225 if (m_topSectionItem->y() + m_topSectionItem->height() > item->y()) {
1215 m_topSectionItem->setY(item->y() - m_topSectionItem->height());
1226 m_topSectionItem->setY(item->y() - m_topSectionItem->height());
1216 }
1227 }
plugins/Dash/listviewwithpageheader.h+9−5
@@ -102,11 +102,11 @@ Q_SIGNALS:
102 void stickyHeaderHeightChanged();
102 void stickyHeaderHeightChanged();
103
103
104protected:
104protected:
105− void componentComplete();
105+ void componentComplete() override;
106− void viewportMoved(Qt::Orientations orient);
106+ void viewportMoved(Qt::Orientations orient) override;
107− qreal minYExtent() const;
107+ qreal minYExtent() const override;
108− void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry);
108+ void itemGeometryChanged(QQuickItem *item, const QRectF &newGeometry, const QRectF &oldGeometry) override;
109− void updatePolish();
109+ void updatePolish() override;
110
110
111private Q_SLOTS:
111private Q_SLOTS:
112 void itemCreated(int modelIndex, QObject *object);
112 void itemCreated(int modelIndex, QObject *object);
@@ -128,7 +128,11 @@ private:
128 bool culled() const;
128 bool culled() const;
129 void setCulled(bool culled);
129 void setCulled(bool culled);
130
130
131+ QQuickItem *sectionItem() const { return m_sectionItem; }
132+ void setSectionItem(QQuickItem *sectionItem);
133+
131 QQuickItem *m_item;
134 QQuickItem *m_item;
135+ private:
132 QQuickItem *m_sectionItem;
136 QQuickItem *m_sectionItem;
133 };
137 };
134
138
plugins/Unity/Launcher/launchermodel.cpp+22
@@ -23,6 +23,8 @@
23
23
24#include <unity/shell/application/ApplicationInfoInterface.h>
24#include <unity/shell/application/ApplicationInfoInterface.h>
25
25
26+#include <QDebug>
27+
26using namespace unity::shell::application;
28using namespace unity::shell::application;
27
29
28LauncherModel::LauncherModel(QObject *parent):
30LauncherModel::LauncherModel(QObject *parent):
@@ -199,6 +201,22 @@ void LauncherModel::setUser(const QString &username)
199 m_backend->setUser(username);
201 m_backend->setUser(username);
200}
202}
201
203
204+QString LauncherModel::getUrlForAppId(const QString &appId) const
205+{
206+ // appId is either an appId or a legacy app name. Let's find out which
207+ if (appId.isEmpty())
208+ return QString();
209+
210+ QString df = m_backend->desktopFile(appId + ".desktop");
211+ if (!df.isEmpty())
212+ return "application:///" + appId + ".desktop";
213+
214+ QStringList parts = appId.split('_');
215+ QString package = parts.value(0);
216+ QString app = parts.value(1, "first-listed-app");
217+ return "appid://" + package + "/" + app + "/current-user-version";
218+}
219+
202ApplicationManagerInterface *LauncherModel::applicationManager() const
220ApplicationManagerInterface *LauncherModel::applicationManager() const
203{
221{
204 return m_appManager;
222 return m_appManager;
@@ -291,6 +309,10 @@ void LauncherModel::applicationAdded(const QModelIndex &parent, int row)
291 Q_UNUSED(parent);
309 Q_UNUSED(parent);
292
310
293 ApplicationInfoInterface *app = m_appManager->get(row);
311 ApplicationInfoInterface *app = m_appManager->get(row);
312+ if (!app) {
313+ qWarning() << "LauncherModel received an applicationAdded signal, but there's no such application!";
314+ return;
315+ }
294
316
295 bool found = false;
317 bool found = false;
296 Q_FOREACH(LauncherItem *item, m_list) {
318 Q_FOREACH(LauncherItem *item, m_list) {
plugins/Unity/Launcher/launchermodel.h+1
@@ -51,6 +51,7 @@ public:
51 Q_INVOKABLE void requestRemove(const QString &appId);
51 Q_INVOKABLE void requestRemove(const QString &appId);
52 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
52 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
53 Q_INVOKABLE void setUser(const QString &username);
53 Q_INVOKABLE void setUser(const QString &username);
54+ Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
54
55
55 unity::shell::application::ApplicationManagerInterface* applicationManager() const;
56 unity::shell::application::ApplicationManagerInterface* applicationManager() const;
56 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
57 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *appManager);
po/am.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-01-18 19:28+0000\n"
11"PO-Revision-Date: 2014-01-18 19:28+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "መላኪያ"
114msgstr "መላኪያ"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "ሰላም %1"
131msgstr "ሰላም %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "ሰላም"
135msgstr "ሰላም"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "ማረጋገጫ"
147msgstr "ማረጋገጫ"
@@ -150,19 +162,19 @@ msgstr "አሁን ይናገሩ..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "በመናገር ላይ..."
163msgstr "በመናገር ላይ..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "የመግቢያ ቃል ማሳያ"
167msgstr "የመግቢያ ቃል ማሳያ"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "መፈለጊያ"
175msgstr "መፈለጊያ"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "እባክዎን ያስገቡ %1"
180msgstr "እባክዎን ያስገቡ %1"
po/ar.po+29−17
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-02-21 11:19+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -89,7 +89,7 @@ msgstr "شاهد أقل"
89
89
90#: qml/Dash/DashApps.qml:37
90#: qml/Dash/DashApps.qml:37
91msgid "Recent"
91msgid "Recent"
92−msgstr ""
92+msgstr "استُخدمت مؤخرًا"
93
93
94#: qml/Dash/PreviewListView.qml:52
94#: qml/Dash/PreviewListView.qml:52
95#, qt-format
95#, qt-format
@@ -104,35 +104,47 @@ msgstr "المزيد..."
104msgid "Less..."
104msgid "Less..."
105msgstr "أقل..."
105msgstr "أقل..."
106
106
107−#: qml/Dash/Previews/PreviewRatingInput.qml:81
107+#: qml/Dash/Previews/PreviewRatingInput.qml:82
108msgid "Rate this"
108msgid "Rate this"
109msgstr "قيّم ذلك"
109msgstr "قيّم ذلك"
110
110
111−#: qml/Dash/Previews/PreviewRatingInput.qml:126
111+#: qml/Dash/Previews/PreviewRatingInput.qml:128
112msgid "Add a review"
112msgid "Add a review"
113msgstr "أضف تعليق"
113msgstr "أضف تعليق"
114
114
115−#: qml/Dash/Previews/PreviewRatingInput.qml:166
115+#: qml/Dash/Previews/PreviewRatingInput.qml:168
116msgid "Send"
116msgid "Send"
117msgstr "أرسل"
117msgstr "أرسل"
118
118
119−#: qml/Greeter/Greeter.qml:151
119+#: qml/Greeter/Greeter.qml:157
120msgid "Swipe to unlock"
120msgid "Swipe to unlock"
121−msgstr ""
121+msgstr "اسحب لفتح القفل"
122
122
123−#: qml/Greeter/Lockscreen.qml:149
123+#: qml/Greeter/Lockscreen.qml:215
124msgid "Emergency Call"
124msgid "Emergency Call"
125msgstr "مكالمة طوارئ"
125msgstr "مكالمة طوارئ"
126
126
127+#: qml/Greeter/Lockscreen.qml:232
128+msgid "OK"
129+msgstr ""
130+
127−#: qml/Greeter/PassphraseLockscreen.qml:59
131+#: qml/Greeter/PassphraseLockscreen.qml:60
128#, qt-format
132#, qt-format
129msgid "Hello %1"
133msgid "Hello %1"
130msgstr "مرحبا %1"
134msgstr "مرحبا %1"
131
135
132−#: qml/Greeter/PassphraseLockscreen.qml:59
136+#: qml/Greeter/PassphraseLockscreen.qml:60
133msgid "Hello"
137msgid "Hello"
134msgstr "مرحبًا"
138msgstr "مرحبًا"
135
139
140+#: qml/Greeter/PinLockscreen.qml:198
141+msgid "CANCEL"
142+msgstr ""
143+
144+#: qml/Greeter/PinLockscreen.qml:216
145+msgid "DONE"
146+msgstr ""
147+
136#: qml/Hud/HudParametrizedActionsPage.qml:132
148#: qml/Hud/HudParametrizedActionsPage.qml:132
137msgid "Confirm"
149msgid "Confirm"
138msgstr "التأكيد"
150msgstr "التأكيد"
@@ -153,19 +165,19 @@ msgstr "تكلم الآن..."
153msgid "Speaking..."
165msgid "Speaking..."
154msgstr "تتكلم الآن..."
166msgstr "تتكلم الآن..."
155
167
156−#: qml/Notifications/NotificationMenuItemFactory.qml:91
168+#: qml/Notifications/NotificationMenuItemFactory.qml:92
157msgid "Show password"
169msgid "Show password"
158msgstr "عرض كلمة السر"
170msgstr "عرض كلمة السر"
159
171
160−#: qml/Notifications/NotificationMenuItemFactory.qml:103
172+#: qml/Notifications/NotificationMenuItemFactory.qml:104
161msgid "Please enter SIM PIN"
173msgid "Please enter SIM PIN"
162msgstr "من فضلك أدخِل رقم التعريف الشخصي لبطاقة SIM"
174msgstr "من فضلك أدخِل رقم التعريف الشخصي لبطاقة SIM"
163
175
164−#: qml/Panel/SearchIndicator.qml:27
176+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
165msgid "Search"
177msgid "Search"
166msgstr "ابحث"
178msgstr "ابحث"
167
179
168−#: qml/Shell.qml:348
180+#: qml/Shell.qml:334
169#, qt-format
181#, qt-format
170msgid "Please enter %1"
182msgid "Please enter %1"
171msgstr "من فضلك أدخِل %1"
183msgstr "من فضلك أدخِل %1"
po/ast.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-04-04 02:16+0000\n"
11"PO-Revision-Date: 2014-04-04 02:16+0000\n"
12"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
12"Last-Translator: Xuacu Saturio <xuacusk8@gmail.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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -105,35 +105,47 @@ msgstr "Más…"
105msgid "Less..."
105msgid "Less..."
106msgstr "Menos…"
106msgstr "Menos…"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:81
108+#: qml/Dash/Previews/PreviewRatingInput.qml:82
109msgid "Rate this"
109msgid "Rate this"
110msgstr "Valorar esto"
110msgstr "Valorar esto"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:126
112+#: qml/Dash/Previews/PreviewRatingInput.qml:128
113msgid "Add a review"
113msgid "Add a review"
114msgstr "Amestar una reseña"
114msgstr "Amestar una reseña"
115
115
116−#: qml/Dash/Previews/PreviewRatingInput.qml:166
116+#: qml/Dash/Previews/PreviewRatingInput.qml:168
117msgid "Send"
117msgid "Send"
118msgstr "Unviar"
118msgstr "Unviar"
119
119
120−#: qml/Greeter/Greeter.qml:151
120+#: qml/Greeter/Greeter.qml:157
121msgid "Swipe to unlock"
121msgid "Swipe to unlock"
122msgstr ""
122msgstr ""
123
123
124−#: qml/Greeter/Lockscreen.qml:149
124+#: qml/Greeter/Lockscreen.qml:215
125msgid "Emergency Call"
125msgid "Emergency Call"
126msgstr "Llamada d'emerxencia"
126msgstr "Llamada d'emerxencia"
127
127
128+#: qml/Greeter/Lockscreen.qml:232
129+msgid "OK"
130+msgstr ""
131+
128−#: qml/Greeter/PassphraseLockscreen.qml:59
132+#: qml/Greeter/PassphraseLockscreen.qml:60
129#, qt-format
133#, qt-format
130msgid "Hello %1"
134msgid "Hello %1"
131msgstr "Hola %1"
135msgstr "Hola %1"
132
136
133−#: qml/Greeter/PassphraseLockscreen.qml:59
137+#: qml/Greeter/PassphraseLockscreen.qml:60
134msgid "Hello"
138msgid "Hello"
135msgstr "Hola"
139msgstr "Hola"
136
140
141+#: qml/Greeter/PinLockscreen.qml:198
142+msgid "CANCEL"
143+msgstr ""
144+
145+#: qml/Greeter/PinLockscreen.qml:216
146+msgid "DONE"
147+msgstr ""
148+
137#: qml/Hud/HudParametrizedActionsPage.qml:132
149#: qml/Hud/HudParametrizedActionsPage.qml:132
138msgid "Confirm"
150msgid "Confirm"
139msgstr "Confirmar"
151msgstr "Confirmar"
@@ -154,19 +166,19 @@ msgstr "Fala agora…"
154msgid "Speaking..."
166msgid "Speaking..."
155msgstr "Falando…"
167msgstr "Falando…"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:91
169+#: qml/Notifications/NotificationMenuItemFactory.qml:92
158msgid "Show password"
170msgid "Show password"
159msgstr "Amosar contraseña"
171msgstr "Amosar contraseña"
160
172
161−#: qml/Notifications/NotificationMenuItemFactory.qml:103
173+#: qml/Notifications/NotificationMenuItemFactory.qml:104
162msgid "Please enter SIM PIN"
174msgid "Please enter SIM PIN"
163msgstr "Escriba'l PIN de la SIM"
175msgstr "Escriba'l PIN de la SIM"
164
176
165−#: qml/Panel/SearchIndicator.qml:27
177+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
166msgid "Search"
178msgid "Search"
167msgstr "Guetar"
179msgstr "Guetar"
168
180
169−#: qml/Shell.qml:348
181+#: qml/Shell.qml:334
170#, qt-format
182#, qt-format
171msgid "Please enter %1"
183msgid "Please enter %1"
172msgstr "Introduz %1"
184msgstr "Introduz %1"
po/az.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -102,35 +102,47 @@ msgstr ""
102msgid "Less..."
102msgid "Less..."
103msgstr ""
103msgstr ""
104
104
105−#: qml/Dash/Previews/PreviewRatingInput.qml:81
105+#: qml/Dash/Previews/PreviewRatingInput.qml:82
106msgid "Rate this"
106msgid "Rate this"
107msgstr "Qiymət ver"
107msgstr "Qiymət ver"
108
108
109−#: qml/Dash/Previews/PreviewRatingInput.qml:126
109+#: qml/Dash/Previews/PreviewRatingInput.qml:128
110msgid "Add a review"
110msgid "Add a review"
111msgstr "Rəy yaz"
111msgstr "Rəy yaz"
112
112
113−#: qml/Dash/Previews/PreviewRatingInput.qml:166
113+#: qml/Dash/Previews/PreviewRatingInput.qml:168
114msgid "Send"
114msgid "Send"
115msgstr "Göndər"
115msgstr "Göndər"
116
116
117−#: qml/Greeter/Greeter.qml:151
117+#: qml/Greeter/Greeter.qml:157
118msgid "Swipe to unlock"
118msgid "Swipe to unlock"
119msgstr ""
119msgstr ""
120
120
121−#: qml/Greeter/Lockscreen.qml:149
121+#: qml/Greeter/Lockscreen.qml:215
122msgid "Emergency Call"
122msgid "Emergency Call"
123msgstr "Zərurət zəngi"
123msgstr "Zərurət zəngi"
124
124
125+#: qml/Greeter/Lockscreen.qml:232
126+msgid "OK"
127+msgstr ""
128+
125−#: qml/Greeter/PassphraseLockscreen.qml:59
129+#: qml/Greeter/PassphraseLockscreen.qml:60
126#, qt-format
130#, qt-format
127msgid "Hello %1"
131msgid "Hello %1"
128msgstr "Xoş gördük %1"
132msgstr "Xoş gördük %1"
129
133
130−#: qml/Greeter/PassphraseLockscreen.qml:59
134+#: qml/Greeter/PassphraseLockscreen.qml:60
131msgid "Hello"
135msgid "Hello"
132msgstr "Xoş gördük"
136msgstr "Xoş gördük"
133
137
138+#: qml/Greeter/PinLockscreen.qml:198
139+msgid "CANCEL"
140+msgstr ""
141+
142+#: qml/Greeter/PinLockscreen.qml:216
143+msgid "DONE"
144+msgstr ""
145+
134#: qml/Hud/HudParametrizedActionsPage.qml:132
146#: qml/Hud/HudParametrizedActionsPage.qml:132
135msgid "Confirm"
147msgid "Confirm"
136msgstr "Təsdiqlə"
148msgstr "Təsdiqlə"
@@ -151,19 +163,19 @@ msgstr "Danışın..."
151msgid "Speaking..."
163msgid "Speaking..."
152msgstr "Danışır..."
164msgstr "Danışır..."
153
165
154−#: qml/Notifications/NotificationMenuItemFactory.qml:91
166+#: qml/Notifications/NotificationMenuItemFactory.qml:92
155msgid "Show password"
167msgid "Show password"
156msgstr "Parolu göstər"
168msgstr "Parolu göstər"
157
169
158−#: qml/Notifications/NotificationMenuItemFactory.qml:103
170+#: qml/Notifications/NotificationMenuItemFactory.qml:104
159msgid "Please enter SIM PIN"
171msgid "Please enter SIM PIN"
160msgstr ""
172msgstr ""
161
173
162−#: qml/Panel/SearchIndicator.qml:27
174+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
163msgid "Search"
175msgid "Search"
164msgstr "Axtar"
176msgstr "Axtar"
165
177
166−#: qml/Shell.qml:348
178+#: qml/Shell.qml:334
167#, qt-format
179#, qt-format
168msgid "Please enter %1"
180msgid "Please enter %1"
169msgstr "Xahiş edirik daxil edin: %1"
181msgstr "Xahiş edirik daxil edin: %1"
po/bg.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -108,35 +108,47 @@ msgstr ""
108msgid "Less..."
108msgid "Less..."
109msgstr "По-малко..."
109msgstr "По-малко..."
110
110
111−#: qml/Dash/Previews/PreviewRatingInput.qml:81
111+#: qml/Dash/Previews/PreviewRatingInput.qml:82
112msgid "Rate this"
112msgid "Rate this"
113msgstr "Оценете това"
113msgstr "Оценете това"
114
114
115−#: qml/Dash/Previews/PreviewRatingInput.qml:126
115+#: qml/Dash/Previews/PreviewRatingInput.qml:128
116msgid "Add a review"
116msgid "Add a review"
117msgstr "Добави отзив"
117msgstr "Добави отзив"
118
118
119−#: qml/Dash/Previews/PreviewRatingInput.qml:166
119+#: qml/Dash/Previews/PreviewRatingInput.qml:168
120msgid "Send"
120msgid "Send"
121msgstr "Изпрати"
121msgstr "Изпрати"
122
122
123−#: qml/Greeter/Greeter.qml:151
123+#: qml/Greeter/Greeter.qml:157
124msgid "Swipe to unlock"
124msgid "Swipe to unlock"
125msgstr ""
125msgstr ""
126
126
127−#: qml/Greeter/Lockscreen.qml:149
127+#: qml/Greeter/Lockscreen.qml:215
128msgid "Emergency Call"
128msgid "Emergency Call"
129msgstr "Спешно повикване"
129msgstr "Спешно повикване"
130
130
131+#: qml/Greeter/Lockscreen.qml:232
132+msgid "OK"
133+msgstr ""
134+
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132#, qt-format
136#, qt-format
133msgid "Hello %1"
137msgid "Hello %1"
134msgstr "Здравей, %1"
138msgstr "Здравей, %1"
135
139
136−#: qml/Greeter/PassphraseLockscreen.qml:59
140+#: qml/Greeter/PassphraseLockscreen.qml:60
137msgid "Hello"
141msgid "Hello"
138msgstr "Здравей"
142msgstr "Здравей"
139
143
144+#: qml/Greeter/PinLockscreen.qml:198
145+msgid "CANCEL"
146+msgstr ""
147+
148+#: qml/Greeter/PinLockscreen.qml:216
149+msgid "DONE"
150+msgstr ""
151+
140#: qml/Hud/HudParametrizedActionsPage.qml:132
152#: qml/Hud/HudParametrizedActionsPage.qml:132
141msgid "Confirm"
153msgid "Confirm"
142msgstr "Потвърди"
154msgstr "Потвърди"
@@ -157,19 +169,19 @@ msgstr "Говорете сега..."
157msgid "Speaking..."
169msgid "Speaking..."
158msgstr "Говорете..."
170msgstr "Говорете..."
159
171
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
172+#: qml/Notifications/NotificationMenuItemFactory.qml:92
161msgid "Show password"
173msgid "Show password"
162msgstr "Покажи паролата"
174msgstr "Покажи паролата"
163
175
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
176+#: qml/Notifications/NotificationMenuItemFactory.qml:104
165msgid "Please enter SIM PIN"
177msgid "Please enter SIM PIN"
166msgstr ""
178msgstr ""
167
179
168−#: qml/Panel/SearchIndicator.qml:27
180+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
169msgid "Search"
181msgid "Search"
170msgstr "Търсене"
182msgstr "Търсене"
171
183
172−#: qml/Shell.qml:348
184+#: qml/Shell.qml:334
173#, qt-format
185#, qt-format
174msgid "Please enter %1"
186msgid "Please enter %1"
175msgstr "Моля, въведете %1"
187msgstr "Моля, въведете %1"
po/br.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-04-15 18:15+0000\n"
11"PO-Revision-Date: 2014-04-15 18:15+0000\n"
12"Last-Translator: Rouxel <vincent.rouxel@mailoo.org>\n"
12"Last-Translator: Rouxel <vincent.rouxel@mailoo.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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/bs.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/ca.po+33−19
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-14 08:15+0000\n"
11+"PO-Revision-Date: 2014-06-13 07:47+0000\n"
12−"Last-Translator: Adolfo Jayme <fitoschido@gmail.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-05-16 06:52+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-14 06:46+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17045)\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
@@ -77,6 +77,8 @@ msgid ""
77"You have now mastered the edge gestures and can start using the "
77"You have now mastered the edge gestures and can start using the "
78"phone<br><br>Tap on the screen to start"
78"phone<br><br>Tap on the screen to start"
79msgstr ""
79msgstr ""
80+"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"
80
82
81#: qml/Components/PageHeader.qml:365
83#: qml/Components/PageHeader.qml:365
82msgid "Recent searches"
84msgid "Recent searches"
@@ -92,7 +94,7 @@ msgstr "Mostra'n menys"
92
94
93#: qml/Dash/DashApps.qml:37
95#: qml/Dash/DashApps.qml:37
94msgid "Recent"
96msgid "Recent"
95−msgstr ""
97+msgstr "Recents"
96
98
97#: qml/Dash/PreviewListView.qml:52
99#: qml/Dash/PreviewListView.qml:52
98#, qt-format
100#, qt-format
@@ -107,35 +109,47 @@ msgstr "Més..."
107msgid "Less..."
109msgid "Less..."
108msgstr "Menys..."
110msgstr "Menys..."
109
111
110−#: qml/Dash/Previews/PreviewRatingInput.qml:81
112+#: qml/Dash/Previews/PreviewRatingInput.qml:82
111msgid "Rate this"
113msgid "Rate this"
112−msgstr ""
114+msgstr "Puntueu-ho"
113
115
114−#: qml/Dash/Previews/PreviewRatingInput.qml:126
116+#: qml/Dash/Previews/PreviewRatingInput.qml:128
115msgid "Add a review"
117msgid "Add a review"
116msgstr "Afegiu una ressenya"
118msgstr "Afegiu una ressenya"
117
119
118−#: qml/Dash/Previews/PreviewRatingInput.qml:166
120+#: qml/Dash/Previews/PreviewRatingInput.qml:168
119msgid "Send"
121msgid "Send"
120msgstr "Envia"
122msgstr "Envia"
121
123
122−#: qml/Greeter/Greeter.qml:151
124+#: qml/Greeter/Greeter.qml:157
123msgid "Swipe to unlock"
125msgid "Swipe to unlock"
124−msgstr ""
126+msgstr "Feu lliscar el dit per desbloquejar"
125
127
126−#: qml/Greeter/Lockscreen.qml:149
128+#: qml/Greeter/Lockscreen.qml:215
127msgid "Emergency Call"
129msgid "Emergency Call"
128msgstr "Trucada d'emergència"
130msgstr "Trucada d'emergència"
129
131
132+#: qml/Greeter/Lockscreen.qml:232
133+msgid "OK"
134+msgstr "D'acord"
135+
130−#: qml/Greeter/PassphraseLockscreen.qml:59
136+#: qml/Greeter/PassphraseLockscreen.qml:60
131#, qt-format
137#, qt-format
132msgid "Hello %1"
138msgid "Hello %1"
133msgstr "Hola %1"
139msgstr "Hola %1"
134
140
135−#: qml/Greeter/PassphraseLockscreen.qml:59
141+#: qml/Greeter/PassphraseLockscreen.qml:60
136msgid "Hello"
142msgid "Hello"
137msgstr "Hola"
143msgstr "Hola"
138
144
145+#: qml/Greeter/PinLockscreen.qml:198
146+msgid "CANCEL"
147+msgstr "Cancel·la"
148+
149+#: qml/Greeter/PinLockscreen.qml:216
150+msgid "DONE"
151+msgstr "Fet"
152+
139#: qml/Hud/HudParametrizedActionsPage.qml:132
153#: qml/Hud/HudParametrizedActionsPage.qml:132
140msgid "Confirm"
154msgid "Confirm"
141msgstr "Confirma"
155msgstr "Confirma"
@@ -156,19 +170,19 @@ msgstr "Parleu..."
156msgid "Speaking..."
170msgid "Speaking..."
157msgstr "S'està parlant..."
171msgstr "S'està parlant..."
158
172
159−#: qml/Notifications/NotificationMenuItemFactory.qml:91
173+#: qml/Notifications/NotificationMenuItemFactory.qml:92
160msgid "Show password"
174msgid "Show password"
161msgstr "Mostra la contrasenya"
175msgstr "Mostra la contrasenya"
162
176
163−#: qml/Notifications/NotificationMenuItemFactory.qml:103
177+#: qml/Notifications/NotificationMenuItemFactory.qml:104
164msgid "Please enter SIM PIN"
178msgid "Please enter SIM PIN"
165msgstr "Introduïu el PIN de la targeta SIM"
179msgstr "Introduïu el PIN de la targeta SIM"
166
180
167−#: qml/Panel/SearchIndicator.qml:27
181+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
168msgid "Search"
182msgid "Search"
169msgstr "Cerca"
183msgstr "Cerca"
170
184
171−#: qml/Shell.qml:348
185+#: qml/Shell.qml:334
172#, qt-format
186#, qt-format
173msgid "Please enter %1"
187msgid "Please enter %1"
174msgstr "Introduïu %1"
188msgstr "Introduïu %1"
po/ckb.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "پلە دابنی بۆی"
106msgstr "پلە دابنی بۆی"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "پێداچوونەوە زۆر بکە"
110msgstr "پێداچوونەوە زۆر بکە"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "ناردن"
114msgstr "ناردن"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "هێڵی فریاگوزاری"
122msgstr "هێڵی فریاگوزاری"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "سڵاو %1"
131msgstr "سڵاو %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "سڵاو"
135msgstr "سڵاو"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "پشتڕاستکردنەوە"
147msgstr "پشتڕاستکردنەوە"
@@ -150,19 +162,19 @@ msgstr "ئێستا قسە بکە"
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "قسە دەکات..."
163msgstr "قسە دەکات..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "تێپەڕەوشە پیشان بدە"
167msgstr "تێپەڕەوشە پیشان بدە"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "گەڕان"
175msgstr "گەڕان"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "تکایە %1 بنووسە"
180msgstr "تکایە %1 بنووسە"
po/cs.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "Ohodnoťte to"
106msgstr "Ohodnoťte to"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "Přidat recenzi"
110msgstr "Přidat recenzi"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "Odeslat"
114msgstr "Odeslat"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "Tísňové volání"
122msgstr "Tísňové volání"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "Ahoj %1"
131msgstr "Ahoj %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "Ahoj"
135msgstr "Ahoj"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Potvrdit"
147msgstr "Potvrdit"
@@ -150,19 +162,19 @@ msgstr "Mluvte..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Mluvte..."
163msgstr "Mluvte..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "Zobrazit heslo"
167msgstr "Zobrazit heslo"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Hledat"
175msgstr "Hledat"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "Zadejte prosím %1"
180msgstr "Zadejte prosím %1"
po/da.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-01-14 20:16+0000\n"
11"PO-Revision-Date: 2014-01-14 20:16+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
13"Language-Team: Danish <da@li.org>\n"
13"Language-Team: Danish <da@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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/de.po+49−34
@@ -7,24 +7,24 @@ 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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-01-15 11:01+0000\n"
11+"PO-Revision-Date: 2014-06-06 19:34+0000\n"
12−"Last-Translator: Dennis Baudys <Unknown>\n"
12+"Last-Translator: Phillip Sz <Unknown>\n"
13"Language-Team: German <de@li.org>\n"
13"Language-Team: German <de@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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 "Lock to Launcher"
22msgid "Lock to Launcher"
23−msgstr ""
23+msgstr "Im Starter sperren"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unlock from Launcher"
26msgid "Unlock from Launcher"
27−msgstr ""
27+msgstr "Aus dem Starter entsperren"
28
28
29#: qml/Components/EdgeDemoOverlay.qml:151
29#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
30msgid "Skip intro"
@@ -32,19 +32,20 @@ msgstr "Einführung überspringen"
32
32
33#: qml/Components/EdgeDemo.qml:113
33#: qml/Components/EdgeDemo.qml:113
34msgid "Right edge"
34msgid "Right edge"
35−msgstr "Rechter Rand"
35+msgstr "Rechter Bildschirmrand"
36
36
37#: qml/Components/EdgeDemo.qml:114
37#: qml/Components/EdgeDemo.qml:114
38msgid "Try swiping from the right edge to unlock the phone"
38msgid "Try swiping from the right edge to unlock the phone"
39−msgstr "Vom rechten Rand her wischen, um das Gerät zu entsperren"
39+msgstr "Vom rechten Bildschirmrand her wischen, um das Gerät zu entsperren"
40
40
41#: qml/Components/EdgeDemo.qml:145
41#: qml/Components/EdgeDemo.qml:145
42msgid "Top edge"
42msgid "Top edge"
43−msgstr "Oberer Rand"
43+msgstr "Oberer Bildschirmrand"
44
44
45#: qml/Components/EdgeDemo.qml:146
45#: qml/Components/EdgeDemo.qml:146
46msgid "Try swiping from the top edge to access the indicators"
46msgid "Try swiping from the top edge to access the indicators"
47+msgstr ""
47−msgstr "Vom oberen Rand her wischen, um die Statusmeldungen anzuzeigen"
48+"Vom oberen Bildschirmrand her wischen, um die Statusmeldungen anzuzeigen"
48
49
49#: qml/Components/EdgeDemo.qml:171
50#: qml/Components/EdgeDemo.qml:171
50msgid "Close"
51msgid "Close"
@@ -52,7 +53,7 @@ msgstr "Schließen"
52
53
53#: qml/Components/EdgeDemo.qml:172
54#: qml/Components/EdgeDemo.qml:172
54msgid "Swipe up again to close the settings screen"
55msgid "Swipe up again to close the settings screen"
55−msgstr "Nochmals nach oben wischen, um das Einstellungsmenü zu schließen"
56+msgstr "Wischen Sie erneut nach oben, um das Einstellungsmenü zu schließen"
56
57
57#: qml/Components/EdgeDemo.qml:199
58#: qml/Components/EdgeDemo.qml:199
58msgid "Left edge"
59msgid "Left edge"
@@ -61,8 +62,8 @@ msgstr "Linker Rand"
61#: qml/Components/EdgeDemo.qml:200
62#: qml/Components/EdgeDemo.qml:200
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgid "Swipe from the left to reveal the launcher for quick access to apps"
63msgstr ""
64msgstr ""
64−"Von links wischen, um die Seitenleiste für den Anwendungs-Schnellzugriff "
65+"Wischen Sie von links nach rechts, um die Seitenleiste für den Anwendungs-"
65−"aufzurufen"
66+"Schnellzugriff aufzurufen"
66
67
67#: qml/Components/EdgeDemo.qml:227
68#: qml/Components/EdgeDemo.qml:227
68msgid "Well done"
69msgid "Well done"
@@ -73,65 +74,79 @@ msgid ""
73"You have now mastered the edge gestures and can start using the "
74"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
75"phone<br><br>Tap on the screen to start"
75msgstr ""
76msgstr ""
77+"Sie haben nun die Kantengesten erfolgreich erlernt und können das Telefon "
78+"nun nutzen<br><br>Zum Starten auf den Bildschirm tippen"
76
79
77#: qml/Components/PageHeader.qml:365
80#: qml/Components/PageHeader.qml:365
78msgid "Recent searches"
81msgid "Recent searches"
79−msgstr "Letzte Suchbegriffe"
82+msgstr "Zuletzt verwendete Suchbegriffe"
80
83
81#: qml/Components/SeeMore.qml:35
84#: qml/Components/SeeMore.qml:35
82msgid "See more"
85msgid "See more"
83−msgstr ""
86+msgstr "Mehr ansehen"
84
87
85#: qml/Components/SeeMore.qml:58
88#: qml/Components/SeeMore.qml:58
86msgid "See less"
89msgid "See less"
87−msgstr ""
90+msgstr "Weniger ansehen"
88
91
89#: qml/Dash/DashApps.qml:37
92#: qml/Dash/DashApps.qml:37
90msgid "Recent"
93msgid "Recent"
91−msgstr ""
94+msgstr "Kürzlich"
92
95
93#: qml/Dash/PreviewListView.qml:52
96#: qml/Dash/PreviewListView.qml:52
94#, qt-format
97#, qt-format
95msgid "%1 Preview"
98msgid "%1 Preview"
96−msgstr ""
99+msgstr "%1 Vorschau"
97
100
98#: qml/Dash/Previews/PreviewActionCombo.qml:34
101#: qml/Dash/Previews/PreviewActionCombo.qml:34
99msgid "More..."
102msgid "More..."
100−msgstr ""
103+msgstr "Mehr …"
101
104
102#: qml/Dash/Previews/PreviewActionCombo.qml:34
105#: qml/Dash/Previews/PreviewActionCombo.qml:34
103msgid "Less..."
106msgid "Less..."
104−msgstr ""
107+msgstr "Weniger …"
105
108
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
109+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
110msgid "Rate this"
108msgstr "Bewerten"
111msgstr "Bewerten"
109
112
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
113+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
114msgid "Add a review"
112msgstr "Bewertung hinzufügen"
115msgstr "Bewertung hinzufügen"
113
116
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
117+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
118msgid "Send"
116msgstr "Senden"
119msgstr "Senden"
117
120
118−#: qml/Greeter/Greeter.qml:151
121+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
122msgid "Swipe to unlock"
120−msgstr ""
123+msgstr "Wischen zum Entsperren"
121
124
122−#: qml/Greeter/Lockscreen.qml:149
125+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
126msgid "Emergency Call"
124msgstr "Notruf"
127msgstr "Notruf"
125
128
129+#: qml/Greeter/Lockscreen.qml:232
130+msgid "OK"
131+msgstr ""
132+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
134#, qt-format
128msgid "Hello %1"
135msgid "Hello %1"
129msgstr "Hallo %1"
136msgstr "Hallo %1"
130
137
131−#: qml/Greeter/PassphraseLockscreen.qml:59
138+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
139msgid "Hello"
133msgstr "Hallo"
140msgstr "Hallo"
134
141
142+#: qml/Greeter/PinLockscreen.qml:198
143+msgid "CANCEL"
144+msgstr ""
145+
146+#: qml/Greeter/PinLockscreen.qml:216
147+msgid "DONE"
148+msgstr ""
149+
135#: qml/Hud/HudParametrizedActionsPage.qml:132
150#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
151msgid "Confirm"
137msgstr "Bestätigen"
152msgstr "Bestätigen"
@@ -152,19 +167,19 @@ msgstr "Sprechen Sie jetzt …"
152msgid "Speaking..."
167msgid "Speaking..."
153msgstr "Sprechen Sie …"
168msgstr "Sprechen Sie …"
154
169
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
170+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
171msgid "Show password"
157msgstr "Passwort anzeigen"
172msgstr "Passwort anzeigen"
158
173
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
174+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
175msgid "Please enter SIM PIN"
161−msgstr ""
176+msgstr "Bitte die PIN der SIM eingeben"
162
177
163−#: qml/Panel/SearchIndicator.qml:27
178+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
179msgid "Search"
165msgstr "Suchen"
180msgstr "Suchen"
166
181
167−#: qml/Shell.qml:348
182+#: qml/Shell.qml:334
168#, qt-format
183#, qt-format
169msgid "Please enter %1"
184msgid "Please enter %1"
170msgstr "Bitte geben Sie %1 ein"
185msgstr "Bitte geben Sie %1 ein"
po/el.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-02-26 09:58+0000\n"
11"PO-Revision-Date: 2014-02-26 09:58+0000\n"
12"Last-Translator: j3lc <x_nikos@yahoo.gr>\n"
12"Last-Translator: j3lc <x_nikos@yahoo.gr>\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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -105,35 +105,47 @@ msgstr ""
105msgid "Less..."
105msgid "Less..."
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:81
108+#: qml/Dash/Previews/PreviewRatingInput.qml:82
109msgid "Rate this"
109msgid "Rate this"
110msgstr "Βαθμολογήστε το"
110msgstr "Βαθμολογήστε το"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:126
112+#: qml/Dash/Previews/PreviewRatingInput.qml:128
113msgid "Add a review"
113msgid "Add a review"
114msgstr "Προσθέστε την αξιολόγησή σας"
114msgstr "Προσθέστε την αξιολόγησή σας"
115
115
116−#: qml/Dash/Previews/PreviewRatingInput.qml:166
116+#: qml/Dash/Previews/PreviewRatingInput.qml:168
117msgid "Send"
117msgid "Send"
118msgstr "Αποστολή"
118msgstr "Αποστολή"
119
119
120−#: qml/Greeter/Greeter.qml:151
120+#: qml/Greeter/Greeter.qml:157
121msgid "Swipe to unlock"
121msgid "Swipe to unlock"
122msgstr ""
122msgstr ""
123
123
124−#: qml/Greeter/Lockscreen.qml:149
124+#: qml/Greeter/Lockscreen.qml:215
125msgid "Emergency Call"
125msgid "Emergency Call"
126msgstr "Κλήση έκτακτης ανάγκης"
126msgstr "Κλήση έκτακτης ανάγκης"
127
127
128+#: qml/Greeter/Lockscreen.qml:232
129+msgid "OK"
130+msgstr ""
131+
128−#: qml/Greeter/PassphraseLockscreen.qml:59
132+#: qml/Greeter/PassphraseLockscreen.qml:60
129#, qt-format
133#, qt-format
130msgid "Hello %1"
134msgid "Hello %1"
131msgstr "Γεια σας %1"
135msgstr "Γεια σας %1"
132
136
133−#: qml/Greeter/PassphraseLockscreen.qml:59
137+#: qml/Greeter/PassphraseLockscreen.qml:60
134msgid "Hello"
138msgid "Hello"
135msgstr "Γεια σας"
139msgstr "Γεια σας"
136
140
141+#: qml/Greeter/PinLockscreen.qml:198
142+msgid "CANCEL"
143+msgstr ""
144+
145+#: qml/Greeter/PinLockscreen.qml:216
146+msgid "DONE"
147+msgstr ""
148+
137#: qml/Hud/HudParametrizedActionsPage.qml:132
149#: qml/Hud/HudParametrizedActionsPage.qml:132
138msgid "Confirm"
150msgid "Confirm"
139msgstr "Επιβεβαίωση"
151msgstr "Επιβεβαίωση"
@@ -154,19 +166,19 @@ msgstr "Μιλήστε τώρα..."
154msgid "Speaking..."
166msgid "Speaking..."
155msgstr "Ομιλία..."
167msgstr "Ομιλία..."
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:91
169+#: qml/Notifications/NotificationMenuItemFactory.qml:92
158msgid "Show password"
170msgid "Show password"
159msgstr "Εμφάνιση κωδικού"
171msgstr "Εμφάνιση κωδικού"
160
172
161−#: qml/Notifications/NotificationMenuItemFactory.qml:103
173+#: qml/Notifications/NotificationMenuItemFactory.qml:104
162msgid "Please enter SIM PIN"
174msgid "Please enter SIM PIN"
163msgstr "Παρακαλώ εισάγετε το PIN της κάρτας SIM"
175msgstr "Παρακαλώ εισάγετε το PIN της κάρτας SIM"
164
176
165−#: qml/Panel/SearchIndicator.qml:27
177+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
166msgid "Search"
178msgid "Search"
167msgstr "Αναζήτηση"
179msgstr "Αναζήτηση"
168
180
169−#: qml/Shell.qml:348
181+#: qml/Shell.qml:334
170#, qt-format
182#, qt-format
171msgid "Please enter %1"
183msgid "Please enter %1"
172msgstr "Πληκτρολογήστε %1"
184msgstr "Πληκτρολογήστε %1"
po/en_AU.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2013-09-28 07:46+0000\n"
11"PO-Revision-Date: 2013-09-28 07:46+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "Rate this"
106msgstr "Rate this"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "Add a review"
110msgstr "Add a review"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "Send"
114msgstr "Send"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "Emergency Call"
122msgstr "Emergency Call"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "Hello %1"
131msgstr "Hello %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "Hello"
135msgstr "Hello"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Confirm"
147msgstr "Confirm"
@@ -150,19 +162,19 @@ msgstr "Speak Now..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Speaking..."
163msgstr "Speaking..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Search"
175msgstr "Search"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "Please enter %1"
180msgstr "Please enter %1"
po/en_GB.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-03-07 13:27+0000\n"
11"PO-Revision-Date: 2014-03-07 13:27+0000\n"
12"Last-Translator: Andi Chandler <Unknown>\n"
12"Last-Translator: Andi Chandler <Unknown>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
13"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -103,35 +103,47 @@ msgstr "More..."
103msgid "Less..."
103msgid "Less..."
104msgstr "Less..."
104msgstr "Less..."
105
105
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
106+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
107msgid "Rate this"
108msgstr "Rate this"
108msgstr "Rate this"
109
109
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
110+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
111msgid "Add a review"
112msgstr "Add a review"
112msgstr "Add a review"
113
113
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
114+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
115msgid "Send"
116msgstr "Send"
116msgstr "Send"
117
117
118−#: qml/Greeter/Greeter.qml:151
118+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
119msgid "Swipe to unlock"
120msgstr ""
120msgstr ""
121
121
122−#: qml/Greeter/Lockscreen.qml:149
122+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
123msgid "Emergency Call"
124msgstr "Emergency Call"
124msgstr "Emergency Call"
125
125
126+#: qml/Greeter/Lockscreen.qml:232
127+msgid "OK"
128+msgstr ""
129+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
130+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
131#, qt-format
128msgid "Hello %1"
132msgid "Hello %1"
129msgstr "Hello %1"
133msgstr "Hello %1"
130
134
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
136msgid "Hello"
133msgstr "Hello"
137msgstr "Hello"
134
138
139+#: qml/Greeter/PinLockscreen.qml:198
140+msgid "CANCEL"
141+msgstr ""
142+
143+#: qml/Greeter/PinLockscreen.qml:216
144+msgid "DONE"
145+msgstr ""
146+
135#: qml/Hud/HudParametrizedActionsPage.qml:132
147#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
148msgid "Confirm"
137msgstr "Confirm"
149msgstr "Confirm"
@@ -152,19 +164,19 @@ msgstr "Speak Now..."
152msgid "Speaking..."
164msgid "Speaking..."
153msgstr "Speaking..."
165msgstr "Speaking..."
154
166
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
167+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
168msgid "Show password"
157msgstr "Show password"
169msgstr "Show password"
158
170
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
171+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
172msgid "Please enter SIM PIN"
161msgstr "Please enter SIM PIN"
173msgstr "Please enter SIM PIN"
162
174
163−#: qml/Panel/SearchIndicator.qml:27
175+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
176msgid "Search"
165msgstr "Search"
177msgstr "Search"
166
178
167−#: qml/Shell.qml:348
179+#: qml/Shell.qml:334
168#, qt-format
180#, qt-format
169msgid "Please enter %1"
181msgid "Please enter %1"
170msgstr "Please enter %1"
182msgstr "Please enter %1"
po/eo.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/es.po+30−18
@@ -7,24 +7,24 @@ 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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-15 15:38+0000\n"
11+"PO-Revision-Date: 2014-06-02 06:28+0000\n"
12−"Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
12+"Last-Translator: benjisp94 <benjisp94@gmail.com>\n"
13"Language-Team: Spanish <es@li.org>\n"
13"Language-Team: Spanish <es@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-05-16 06:52+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17031)\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 "Lock to Launcher"
22msgid "Lock to Launcher"
23−msgstr "Mantener en el lanzador"
23+msgstr "Fijar al lanzador"
24
24
25#: plugins/Unity/Launcher/launcheritem.cpp:73
25#: plugins/Unity/Launcher/launcheritem.cpp:73
26msgid "Unlock from Launcher"
26msgid "Unlock from Launcher"
27−msgstr "No mantener en el lanzador"
27+msgstr "Quitar del lanzador"
28
28
29#: qml/Components/EdgeDemoOverlay.qml:151
29#: qml/Components/EdgeDemoOverlay.qml:151
30msgid "Skip intro"
30msgid "Skip intro"
@@ -106,35 +106,47 @@ msgstr "Más…"
106msgid "Less..."
106msgid "Less..."
107msgstr "Menos…"
107msgstr "Menos…"
108
108
109−#: qml/Dash/Previews/PreviewRatingInput.qml:81
109+#: qml/Dash/Previews/PreviewRatingInput.qml:82
110msgid "Rate this"
110msgid "Rate this"
111msgstr "Valorar esto"
111msgstr "Valorar esto"
112
112
113−#: qml/Dash/Previews/PreviewRatingInput.qml:126
113+#: qml/Dash/Previews/PreviewRatingInput.qml:128
114msgid "Add a review"
114msgid "Add a review"
115msgstr "Añadir una reseña"
115msgstr "Añadir una reseña"
116
116
117−#: qml/Dash/Previews/PreviewRatingInput.qml:166
117+#: qml/Dash/Previews/PreviewRatingInput.qml:168
118msgid "Send"
118msgid "Send"
119msgstr "Enviar"
119msgstr "Enviar"
120
120
121−#: qml/Greeter/Greeter.qml:151
121+#: qml/Greeter/Greeter.qml:157
122msgid "Swipe to unlock"
122msgid "Swipe to unlock"
123msgstr "Deslice para desbloquear"
123msgstr "Deslice para desbloquear"
124
124
125−#: qml/Greeter/Lockscreen.qml:149
125+#: qml/Greeter/Lockscreen.qml:215
126msgid "Emergency Call"
126msgid "Emergency Call"
127msgstr "Llamada de emergencia"
127msgstr "Llamada de emergencia"
128
128
129+#: qml/Greeter/Lockscreen.qml:232
130+msgid "OK"
131+msgstr ""
132+
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130#, qt-format
134#, qt-format
131msgid "Hello %1"
135msgid "Hello %1"
132msgstr "Hola, %1"
136msgstr "Hola, %1"
133
137
134−#: qml/Greeter/PassphraseLockscreen.qml:59
138+#: qml/Greeter/PassphraseLockscreen.qml:60
135msgid "Hello"
139msgid "Hello"
136msgstr "Hola"
140msgstr "Hola"
137
141
142+#: qml/Greeter/PinLockscreen.qml:198
143+msgid "CANCEL"
144+msgstr ""
145+
146+#: qml/Greeter/PinLockscreen.qml:216
147+msgid "DONE"
148+msgstr ""
149+
138#: qml/Hud/HudParametrizedActionsPage.qml:132
150#: qml/Hud/HudParametrizedActionsPage.qml:132
139msgid "Confirm"
151msgid "Confirm"
140msgstr "Confirmar"
152msgstr "Confirmar"
@@ -155,19 +167,19 @@ msgstr "Hable ahora…"
155msgid "Speaking..."
167msgid "Speaking..."
156msgstr "Hablando…"
168msgstr "Hablando…"
157
169
158−#: qml/Notifications/NotificationMenuItemFactory.qml:91
170+#: qml/Notifications/NotificationMenuItemFactory.qml:92
159msgid "Show password"
171msgid "Show password"
160msgstr "Mostrar contraseña"
172msgstr "Mostrar contraseña"
161
173
162−#: qml/Notifications/NotificationMenuItemFactory.qml:103
174+#: qml/Notifications/NotificationMenuItemFactory.qml:104
163msgid "Please enter SIM PIN"
175msgid "Please enter SIM PIN"
164msgstr "Escriba el PIN de la SIM"
176msgstr "Escriba el PIN de la SIM"
165
177
166−#: qml/Panel/SearchIndicator.qml:27
178+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
167msgid "Search"
179msgid "Search"
168msgstr "Buscar"
180msgstr "Buscar"
169
181
170−#: qml/Shell.qml:348
182+#: qml/Shell.qml:334
171#, qt-format
183#, qt-format
172msgid "Please enter %1"
184msgid "Please enter %1"
173msgstr "Introduzca %1"
185msgstr "Introduzca %1"
po/eu.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-03-30 12:44+0000\n"
11"PO-Revision-Date: 2014-03-30 12:44+0000\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
12"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"
13"Language-Team: Basque <eu@li.org>\n"
13"Language-Team: Basque <eu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -105,35 +105,47 @@ msgstr "Gehiago..."
105msgid "Less..."
105msgid "Less..."
106msgstr "Gutxiago..."
106msgstr "Gutxiago..."
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:81
108+#: qml/Dash/Previews/PreviewRatingInput.qml:82
109msgid "Rate this"
109msgid "Rate this"
110msgstr "Puntuatu hau"
110msgstr "Puntuatu hau"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:126
112+#: qml/Dash/Previews/PreviewRatingInput.qml:128
113msgid "Add a review"
113msgid "Add a review"
114msgstr "Gehitu kritika"
114msgstr "Gehitu kritika"
115
115
116−#: qml/Dash/Previews/PreviewRatingInput.qml:166
116+#: qml/Dash/Previews/PreviewRatingInput.qml:168
117msgid "Send"
117msgid "Send"
118msgstr "Bidali"
118msgstr "Bidali"
119
119
120−#: qml/Greeter/Greeter.qml:151
120+#: qml/Greeter/Greeter.qml:157
121msgid "Swipe to unlock"
121msgid "Swipe to unlock"
122msgstr ""
122msgstr ""
123
123
124−#: qml/Greeter/Lockscreen.qml:149
124+#: qml/Greeter/Lockscreen.qml:215
125msgid "Emergency Call"
125msgid "Emergency Call"
126msgstr "Larrialdi-deia"
126msgstr "Larrialdi-deia"
127
127
128+#: qml/Greeter/Lockscreen.qml:232
129+msgid "OK"
130+msgstr ""
131+
128−#: qml/Greeter/PassphraseLockscreen.qml:59
132+#: qml/Greeter/PassphraseLockscreen.qml:60
129#, qt-format
133#, qt-format
130msgid "Hello %1"
134msgid "Hello %1"
131msgstr "Kaixo %1"
135msgstr "Kaixo %1"
132
136
133−#: qml/Greeter/PassphraseLockscreen.qml:59
137+#: qml/Greeter/PassphraseLockscreen.qml:60
134msgid "Hello"
138msgid "Hello"
135msgstr "Kaixo"
139msgstr "Kaixo"
136
140
141+#: qml/Greeter/PinLockscreen.qml:198
142+msgid "CANCEL"
143+msgstr ""
144+
145+#: qml/Greeter/PinLockscreen.qml:216
146+msgid "DONE"
147+msgstr ""
148+
137#: qml/Hud/HudParametrizedActionsPage.qml:132
149#: qml/Hud/HudParametrizedActionsPage.qml:132
138msgid "Confirm"
150msgid "Confirm"
139msgstr "Baieztatu"
151msgstr "Baieztatu"
@@ -154,19 +166,19 @@ msgstr "Hitz egin orain..."
154msgid "Speaking..."
166msgid "Speaking..."
155msgstr "Hitz egiten..."
167msgstr "Hitz egiten..."
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:91
169+#: qml/Notifications/NotificationMenuItemFactory.qml:92
158msgid "Show password"
170msgid "Show password"
159msgstr "Erakutsi pasahitza"
171msgstr "Erakutsi pasahitza"
160
172
161−#: qml/Notifications/NotificationMenuItemFactory.qml:103
173+#: qml/Notifications/NotificationMenuItemFactory.qml:104
162msgid "Please enter SIM PIN"
174msgid "Please enter SIM PIN"
163msgstr "Sartu SIMaren PINa"
175msgstr "Sartu SIMaren PINa"
164
176
165−#: qml/Panel/SearchIndicator.qml:27
177+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
166msgid "Search"
178msgid "Search"
167msgstr "Bilatu"
179msgstr "Bilatu"
168
180
169−#: qml/Shell.qml:348
181+#: qml/Shell.qml:334
170#, qt-format
182#, qt-format
171msgid "Please enter %1"
183msgid "Please enter %1"
172msgstr "Sartu %1"
184msgstr "Sartu %1"
po/fa.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2013-10-31 19:02+0000\n"
11"PO-Revision-Date: 2013-10-31 19:02+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/fi.po+27−15
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-15 13:06+0000\n"
11+"PO-Revision-Date: 2014-06-14 10:23+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-05-16 06:52+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-16 06:29+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17045)\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
@@ -103,35 +103,47 @@ msgstr "Lisää..."
103msgid "Less..."
103msgid "Less..."
104msgstr "Vähemmän..."
104msgstr "Vähemmän..."
105
105
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
106+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
107msgid "Rate this"
108msgstr "Arvioi tämä"
108msgstr "Arvioi tämä"
109
109
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
110+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
111msgid "Add a review"
112msgstr "Lisää arvostelu"
112msgstr "Lisää arvostelu"
113
113
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
114+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
115msgid "Send"
116msgstr "Lähetä"
116msgstr "Lähetä"
117
117
118−#: qml/Greeter/Greeter.qml:151
118+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
119msgid "Swipe to unlock"
120msgstr "Avaa pyyhkäisemällä"
120msgstr "Avaa pyyhkäisemällä"
121
121
122−#: qml/Greeter/Lockscreen.qml:149
122+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
123msgid "Emergency Call"
124msgstr "Hätäpuhelu"
124msgstr "Hätäpuhelu"
125
125
126+#: qml/Greeter/Lockscreen.qml:232
127+msgid "OK"
128+msgstr "OK"
129+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
130+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
131#, qt-format
128msgid "Hello %1"
132msgid "Hello %1"
129msgstr "Hei %1!"
133msgstr "Hei %1!"
130
134
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
136msgid "Hello"
133msgstr "Hei"
137msgstr "Hei"
134
138
139+#: qml/Greeter/PinLockscreen.qml:198
140+msgid "CANCEL"
141+msgstr "PERU"
142+
143+#: qml/Greeter/PinLockscreen.qml:216
144+msgid "DONE"
145+msgstr "VALMIS"
146+
135#: qml/Hud/HudParametrizedActionsPage.qml:132
147#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
148msgid "Confirm"
137msgstr "Hyväksy"
149msgstr "Hyväksy"
@@ -152,19 +164,19 @@ msgstr "Puhu nyt..."
152msgid "Speaking..."
164msgid "Speaking..."
153msgstr "Puhutaan..."
165msgstr "Puhutaan..."
154
166
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
167+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
168msgid "Show password"
157msgstr "Näytä salasana"
169msgstr "Näytä salasana"
158
170
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
171+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
172msgid "Please enter SIM PIN"
161msgstr "Anna SIM-kortin PIN-koodi"
173msgstr "Anna SIM-kortin PIN-koodi"
162
174
163−#: qml/Panel/SearchIndicator.qml:27
175+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
176msgid "Search"
165msgstr "Hae"
177msgstr "Hae"
166
178
167−#: qml/Shell.qml:348
179+#: qml/Shell.qml:334
168#, qt-format
180#, qt-format
169msgid "Please enter %1"
181msgid "Please enter %1"
170msgstr "Kirjoita %1"
182msgstr "Kirjoita %1"
po/fo.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Vátta"
147msgstr "Vátta"
@@ -150,19 +162,19 @@ msgstr "Snakka nú..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Snakkar..."
163msgstr "Snakkar..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Leita"
175msgstr "Leita"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/fr.po+28−16
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-08 17:29+0000\n"
11+"PO-Revision-Date: 2014-06-08 20:45+0000\n"
12−"Last-Translator: Sébastien Maes <nautilussebastien@gmail.com>\n"
12+"Last-Translator: Pierre Slamich <pierre.slamich@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-05-10 08:01+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-09 06:33+0000\n"
18−"X-Generator: Launchpad (build 16996)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -110,35 +110,47 @@ msgstr "Plus..."
110msgid "Less..."
110msgid "Less..."
111msgstr "Moins..."
111msgstr "Moins..."
112
112
113−#: qml/Dash/Previews/PreviewRatingInput.qml:81
113+#: qml/Dash/Previews/PreviewRatingInput.qml:82
114msgid "Rate this"
114msgid "Rate this"
115msgstr "Evaluez ceci"
115msgstr "Evaluez ceci"
116
116
117−#: qml/Dash/Previews/PreviewRatingInput.qml:126
117+#: qml/Dash/Previews/PreviewRatingInput.qml:128
118msgid "Add a review"
118msgid "Add a review"
119msgstr "Ajouter un avis"
119msgstr "Ajouter un avis"
120
120
121−#: qml/Dash/Previews/PreviewRatingInput.qml:166
121+#: qml/Dash/Previews/PreviewRatingInput.qml:168
122msgid "Send"
122msgid "Send"
123msgstr "Envoyer"
123msgstr "Envoyer"
124
124
125−#: qml/Greeter/Greeter.qml:151
125+#: qml/Greeter/Greeter.qml:157
126msgid "Swipe to unlock"
126msgid "Swipe to unlock"
127msgstr "Faites glisser pour déverrouiller"
127msgstr "Faites glisser pour déverrouiller"
128
128
129−#: qml/Greeter/Lockscreen.qml:149
129+#: qml/Greeter/Lockscreen.qml:215
130msgid "Emergency Call"
130msgid "Emergency Call"
131msgstr "Appel d'urgence"
131msgstr "Appel d'urgence"
132
132
133+#: qml/Greeter/Lockscreen.qml:232
134+msgid "OK"
135+msgstr "OK"
136+
133−#: qml/Greeter/PassphraseLockscreen.qml:59
137+#: qml/Greeter/PassphraseLockscreen.qml:60
134#, qt-format
138#, qt-format
135msgid "Hello %1"
139msgid "Hello %1"
136msgstr "Bonjour %1"
140msgstr "Bonjour %1"
137
141
138−#: qml/Greeter/PassphraseLockscreen.qml:59
142+#: qml/Greeter/PassphraseLockscreen.qml:60
139msgid "Hello"
143msgid "Hello"
140msgstr "Bonjour"
144msgstr "Bonjour"
141
145
146+#: qml/Greeter/PinLockscreen.qml:198
147+msgid "CANCEL"
148+msgstr "ANNULER"
149+
150+#: qml/Greeter/PinLockscreen.qml:216
151+msgid "DONE"
152+msgstr "TERMINÉ"
153+
142#: qml/Hud/HudParametrizedActionsPage.qml:132
154#: qml/Hud/HudParametrizedActionsPage.qml:132
143msgid "Confirm"
155msgid "Confirm"
144msgstr "Confirmez"
156msgstr "Confirmez"
@@ -159,19 +171,19 @@ msgstr "Parlez maintenant…"
159msgid "Speaking..."
171msgid "Speaking..."
160msgstr "En cours d'écoute..."
172msgstr "En cours d'écoute..."
161
173
162−#: qml/Notifications/NotificationMenuItemFactory.qml:91
174+#: qml/Notifications/NotificationMenuItemFactory.qml:92
163msgid "Show password"
175msgid "Show password"
164msgstr "Afficher le mot de passe"
176msgstr "Afficher le mot de passe"
165
177
166−#: qml/Notifications/NotificationMenuItemFactory.qml:103
178+#: qml/Notifications/NotificationMenuItemFactory.qml:104
167msgid "Please enter SIM PIN"
179msgid "Please enter SIM PIN"
168msgstr "Veuillez entrer le code PIN de votre carte SIM"
180msgstr "Veuillez entrer le code PIN de votre carte SIM"
169
181
170−#: qml/Panel/SearchIndicator.qml:27
182+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
171msgid "Search"
183msgid "Search"
172msgstr "Rechercher"
184msgstr "Rechercher"
173
185
174−#: qml/Shell.qml:348
186+#: qml/Shell.qml:334
175#, qt-format
187#, qt-format
176msgid "Please enter %1"
188msgid "Please enter %1"
177msgstr "Veuillez saisir %1"
189msgstr "Veuillez saisir %1"
po/gd.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-05-17 21:08+0000\n"
11"PO-Revision-Date: 2014-05-17 21:08+0000\n"
12"Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"
12"Last-Translator: Akerbeltz <fios@akerbeltz.org>\n"
13"Language-Team: Gaelic; Scottish <gd@li.org>\n"
13"Language-Team: Gaelic; Scottish <gd@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-05-18 05:57+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -109,35 +109,47 @@ msgstr "Barrachd..."
109msgid "Less..."
109msgid "Less..."
110msgstr "Nas lugha..."
110msgstr "Nas lugha..."
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:81
112+#: qml/Dash/Previews/PreviewRatingInput.qml:82
113msgid "Rate this"
113msgid "Rate this"
114msgstr "Rangaich seo"
114msgstr "Rangaich seo"
115
115
116−#: qml/Dash/Previews/PreviewRatingInput.qml:126
116+#: qml/Dash/Previews/PreviewRatingInput.qml:128
117msgid "Add a review"
117msgid "Add a review"
118msgstr "Cuir lèirmheas ris"
118msgstr "Cuir lèirmheas ris"
119
119
120−#: qml/Dash/Previews/PreviewRatingInput.qml:166
120+#: qml/Dash/Previews/PreviewRatingInput.qml:168
121msgid "Send"
121msgid "Send"
122msgstr "Cuir"
122msgstr "Cuir"
123
123
124−#: qml/Greeter/Greeter.qml:151
124+#: qml/Greeter/Greeter.qml:157
125msgid "Swipe to unlock"
125msgid "Swipe to unlock"
126msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"
126msgstr "Dèan grad-shlaighdeadh gus a' ghlas a thoirt dheth"
127
127
128−#: qml/Greeter/Lockscreen.qml:149
128+#: qml/Greeter/Lockscreen.qml:215
129msgid "Emergency Call"
129msgid "Emergency Call"
130msgstr "Gairm èiginn"
130msgstr "Gairm èiginn"
131
131
132+#: qml/Greeter/Lockscreen.qml:232
133+msgid "OK"
134+msgstr ""
135+
132−#: qml/Greeter/PassphraseLockscreen.qml:59
136+#: qml/Greeter/PassphraseLockscreen.qml:60
133#, qt-format
137#, qt-format
134msgid "Hello %1"
138msgid "Hello %1"
135msgstr "Shin thu, %1"
139msgstr "Shin thu, %1"
136
140
137−#: qml/Greeter/PassphraseLockscreen.qml:59
141+#: qml/Greeter/PassphraseLockscreen.qml:60
138msgid "Hello"
142msgid "Hello"
139msgstr "Shin thu"
143msgstr "Shin thu"
140
144
145+#: qml/Greeter/PinLockscreen.qml:198
146+msgid "CANCEL"
147+msgstr ""
148+
149+#: qml/Greeter/PinLockscreen.qml:216
150+msgid "DONE"
151+msgstr ""
152+
141#: qml/Hud/HudParametrizedActionsPage.qml:132
153#: qml/Hud/HudParametrizedActionsPage.qml:132
142msgid "Confirm"
154msgid "Confirm"
143msgstr "Dearbhaich"
155msgstr "Dearbhaich"
@@ -158,19 +170,19 @@ msgstr "Can rud a-nis..."
158msgid "Speaking..."
170msgid "Speaking..."
159msgstr "A' bruidhinn..."
171msgstr "A' bruidhinn..."
160
172
161−#: qml/Notifications/NotificationMenuItemFactory.qml:91
173+#: qml/Notifications/NotificationMenuItemFactory.qml:92
162msgid "Show password"
174msgid "Show password"
163msgstr "Seall am facal-faire"
175msgstr "Seall am facal-faire"
164
176
165−#: qml/Notifications/NotificationMenuItemFactory.qml:103
177+#: qml/Notifications/NotificationMenuItemFactory.qml:104
166msgid "Please enter SIM PIN"
178msgid "Please enter SIM PIN"
167msgstr "Cuir a-steach SIM PIN"
179msgstr "Cuir a-steach SIM PIN"
168
180
169−#: qml/Panel/SearchIndicator.qml:27
181+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
170msgid "Search"
182msgid "Search"
171msgstr "Lorg"
183msgstr "Lorg"
172
184
173−#: qml/Shell.qml:348
185+#: qml/Shell.qml:334
174#, qt-format
186#, qt-format
175msgid "Please enter %1"
187msgid "Please enter %1"
176msgstr "Cuir a-steach %1"
188msgstr "Cuir a-steach %1"
po/gl.po+30−18
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-03 07:31+0000\n"
11+"PO-Revision-Date: 2014-06-07 13:26+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-05-06 07:34+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-08 05:56+0000\n"
18−"X-Generator: Launchpad (build 16996)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -36,7 +36,7 @@ msgstr "Bordo dereito"
36
36
37#: qml/Components/EdgeDemo.qml:114
37#: qml/Components/EdgeDemo.qml:114
38msgid "Try swiping from the right edge to unlock the phone"
38msgid "Try swiping from the right edge to unlock the phone"
39−msgstr "Probe o arrastre desde o bordo dereito para desbloquear o teléfono"
39+msgstr "Probe a esvarar desde o bordo dereito para desbloquear o teléfono"
40
40
41#: qml/Components/EdgeDemo.qml:145
41#: qml/Components/EdgeDemo.qml:145
42msgid "Top edge"
42msgid "Top edge"
@@ -71,7 +71,7 @@ msgid ""
71"You have now mastered the edge gestures and can start using the "
71"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
72"phone<br><br>Tap on the screen to start"
73msgstr ""
73msgstr ""
74−"Agora xa domina os xestos do bordo e pode comezar a usar o "
74+"Agora xa domina os xestos dos bordos e pode comezar a usar o "
75"teléfono<br><br>Toque na pantalla para comezar"
75"teléfono<br><br>Toque na pantalla para comezar"
76
76
77#: qml/Components/PageHeader.qml:365
77#: qml/Components/PageHeader.qml:365
@@ -103,35 +103,47 @@ msgstr "Máis…"
103msgid "Less..."
103msgid "Less..."
104msgstr "Menos..."
104msgstr "Menos..."
105
105
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
106+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
107msgid "Rate this"
108msgstr "Valore isto"
108msgstr "Valore isto"
109
109
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
110+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
111msgid "Add a review"
112msgstr "Engadir unha opinión"
112msgstr "Engadir unha opinión"
113
113
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
114+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
115msgid "Send"
116msgstr "Enviar"
116msgstr "Enviar"
117
117
118−#: qml/Greeter/Greeter.qml:151
118+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
119msgid "Swipe to unlock"
120msgstr "Esvare para desbloquear"
120msgstr "Esvare para desbloquear"
121
121
122−#: qml/Greeter/Lockscreen.qml:149
122+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
123msgid "Emergency Call"
124msgstr "Chamada de emerxencia"
124msgstr "Chamada de emerxencia"
125
125
126+#: qml/Greeter/Lockscreen.qml:232
127+msgid "OK"
128+msgstr "Aceptar"
129+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
130+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
131#, qt-format
128msgid "Hello %1"
132msgid "Hello %1"
129msgstr "Ola %1"
133msgstr "Ola %1"
130
134
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
136msgid "Hello"
133msgstr "Ola"
137msgstr "Ola"
134
138
139+#: qml/Greeter/PinLockscreen.qml:198
140+msgid "CANCEL"
141+msgstr "CANCELAR"
142+
143+#: qml/Greeter/PinLockscreen.qml:216
144+msgid "DONE"
145+msgstr "FEITO"
146+
135#: qml/Hud/HudParametrizedActionsPage.qml:132
147#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
148msgid "Confirm"
137msgstr "Confirmar"
149msgstr "Confirmar"
@@ -142,7 +154,7 @@ msgstr "Escriba ou diga unha orde"
142
154
143#: qml/Hud/Hud.qml:84
155#: qml/Hud/Hud.qml:84
144msgid "Loading. Please Wait..."
156msgid "Loading. Please Wait..."
145−msgstr "Cargando. Agarde…"
157+msgstr "Cargando, agarde…"
146
158
147#: qml/Hud/Hud.qml:89
159#: qml/Hud/Hud.qml:89
148msgid "Speak Now..."
160msgid "Speak Now..."
@@ -152,19 +164,19 @@ msgstr "Fale agora…"
152msgid "Speaking..."
164msgid "Speaking..."
153msgstr "Falando…"
165msgstr "Falando…"
154
166
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
167+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
168msgid "Show password"
157msgstr "Mostrar contrasinal"
169msgstr "Mostrar contrasinal"
158
170
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
171+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
172msgid "Please enter SIM PIN"
161msgstr "Introduza o PIN da SIM"
173msgstr "Introduza o PIN da SIM"
162
174
163−#: qml/Panel/SearchIndicator.qml:27
175+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
176msgid "Search"
165msgstr "Buscar"
177msgstr "Buscar"
166
178
167−#: qml/Shell.qml:348
179+#: qml/Shell.qml:334
168#, qt-format
180#, qt-format
169msgid "Please enter %1"
181msgid "Please enter %1"
170msgstr "Introduza %1"
182msgstr "Introduza %1"
po/he.po+27−15
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-15 21:19+0000\n"
11+"PO-Revision-Date: 2014-06-09 07:49+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-05-16 06:52+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-10 06:50+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -103,35 +103,47 @@ msgstr "עוד…"
103msgid "Less..."
103msgid "Less..."
104msgstr "פחות…"
104msgstr "פחות…"
105
105
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
106+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
107msgid "Rate this"
108msgstr "דירוג היישום"
108msgstr "דירוג היישום"
109
109
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
110+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
111msgid "Add a review"
112msgstr "הוספת סקירה"
112msgstr "הוספת סקירה"
113
113
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
114+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
115msgid "Send"
116msgstr "שליחה"
116msgstr "שליחה"
117
117
118−#: qml/Greeter/Greeter.qml:151
118+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
119msgid "Swipe to unlock"
120msgstr "יש להחליק לפתיחה"
120msgstr "יש להחליק לפתיחה"
121
121
122−#: qml/Greeter/Lockscreen.qml:149
122+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
123msgid "Emergency Call"
124msgstr "שיחת חירום"
124msgstr "שיחת חירום"
125
125
126+#: qml/Greeter/Lockscreen.qml:232
127+msgid "OK"
128+msgstr "אישור"
129+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
130+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
131#, qt-format
128msgid "Hello %1"
132msgid "Hello %1"
129msgstr "שלום %1"
133msgstr "שלום %1"
130
134
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
136msgid "Hello"
133msgstr "שלום"
137msgstr "שלום"
134
138
139+#: qml/Greeter/PinLockscreen.qml:198
140+msgid "CANCEL"
141+msgstr "ביטול"
142+
143+#: qml/Greeter/PinLockscreen.qml:216
144+msgid "DONE"
145+msgstr "בוצע"
146+
135#: qml/Hud/HudParametrizedActionsPage.qml:132
147#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
148msgid "Confirm"
137msgstr "אישור"
149msgstr "אישור"
@@ -152,19 +164,19 @@ msgstr "יש לדבר כעת..."
152msgid "Speaking..."
164msgid "Speaking..."
153msgstr "הדיבור מושמע…"
165msgstr "הדיבור מושמע…"
154
166
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
167+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
168msgid "Show password"
157msgstr "הצגת הססמה"
169msgstr "הצגת הססמה"
158
170
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
171+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
172msgid "Please enter SIM PIN"
161msgstr "נא להזין את קוד ה־<U+200F>SIM"
173msgstr "נא להזין את קוד ה־<U+200F>SIM"
162
174
163−#: qml/Panel/SearchIndicator.qml:27
175+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
176msgid "Search"
165msgstr "חיפוש"
177msgstr "חיפוש"
166
178
167−#: qml/Shell.qml:348
179+#: qml/Shell.qml:334
168#, qt-format
180#, qt-format
169msgid "Please enter %1"
181msgid "Please enter %1"
170msgstr "נא להזין %1"
182msgstr "נא להזין %1"
po/hi.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "समीक्षा दे"
110msgstr "समीक्षा दे"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "भेजें"
114msgstr "भेजें"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "आपातकालीन कॉल"
122msgstr "आपातकालीन कॉल"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "नमस्ते"
135msgstr "नमस्ते"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr "अब बात करें"
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "अब बोल रहे हैं"
163msgstr "अब बोल रहे हैं"
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "खोजें"
175msgstr "खोजें"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/hr.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Potvrdi"
147msgstr "Potvrdi"
@@ -150,19 +162,19 @@ msgstr "Recite..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Govor..."
163msgstr "Govor..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Pretraživanje"
175msgstr "Pretraživanje"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/hu.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-01-14 23:02+0000\n"
11"PO-Revision-Date: 2014-01-14 23:02+0000\n"
12"Last-Translator: Kristóf Kiszel <Unknown>\n"
12"Last-Translator: Kristóf Kiszel <Unknown>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
13"Language-Team: Hungarian <hu@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -103,35 +103,47 @@ msgstr ""
103msgid "Less..."
103msgid "Less..."
104msgstr ""
104msgstr ""
105
105
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
106+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
107msgid "Rate this"
108msgstr "Osztályzás"
108msgstr "Osztályzás"
109
109
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
110+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
111msgid "Add a review"
112msgstr "Értékelés hozzáadása"
112msgstr "Értékelés hozzáadása"
113
113
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
114+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
115msgid "Send"
116msgstr "Küldés"
116msgstr "Küldés"
117
117
118−#: qml/Greeter/Greeter.qml:151
118+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
119msgid "Swipe to unlock"
120msgstr ""
120msgstr ""
121
121
122−#: qml/Greeter/Lockscreen.qml:149
122+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
123msgid "Emergency Call"
124msgstr "Vészhívás"
124msgstr "Vészhívás"
125
125
126+#: qml/Greeter/Lockscreen.qml:232
127+msgid "OK"
128+msgstr ""
129+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
130+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
131#, qt-format
128msgid "Hello %1"
132msgid "Hello %1"
129msgstr "Szia %1"
133msgstr "Szia %1"
130
134
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
136msgid "Hello"
133msgstr "Szia"
137msgstr "Szia"
134
138
139+#: qml/Greeter/PinLockscreen.qml:198
140+msgid "CANCEL"
141+msgstr ""
142+
143+#: qml/Greeter/PinLockscreen.qml:216
144+msgid "DONE"
145+msgstr ""
146+
135#: qml/Hud/HudParametrizedActionsPage.qml:132
147#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
148msgid "Confirm"
137msgstr "Megerősítés"
149msgstr "Megerősítés"
@@ -152,19 +164,19 @@ msgstr "Most beszéljen…"
152msgid "Speaking..."
164msgid "Speaking..."
153msgstr "Beszéd…"
165msgstr "Beszéd…"
154
166
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
167+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
168msgid "Show password"
157msgstr "Jelszó megjelenítése"
169msgstr "Jelszó megjelenítése"
158
170
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
171+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
172msgid "Please enter SIM PIN"
161msgstr ""
173msgstr ""
162
174
163−#: qml/Panel/SearchIndicator.qml:27
175+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
176msgid "Search"
165msgstr "Keresés"
177msgstr "Keresés"
166
178
167−#: qml/Shell.qml:348
179+#: qml/Shell.qml:334
168#, qt-format
180#, qt-format
169msgid "Please enter %1"
181msgid "Please enter %1"
170msgstr "Adja meg a következőt: %1"
182msgstr "Adja meg a következőt: %1"
po/hy.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Հաստատել"
147msgstr "Հաստատել"
@@ -150,19 +162,19 @@ msgstr "Խոսի՛ր"
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Խոսում եմ..."
163msgstr "Խոսում եմ..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Որոնում"
175msgstr "Որոնում"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/id.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/is.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2013-09-18 16:22+0000\n"
11"PO-Revision-Date: 2013-09-18 16:22+0000\n"
12"Last-Translator: Andri Thorlacius <Unknown>\n"
12"Last-Translator: Andri Thorlacius <Unknown>\n"
13"Language-Team: Icelandic <is@li.org>\n"
13"Language-Team: Icelandic <is@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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -102,35 +102,47 @@ msgstr ""
102msgid "Less..."
102msgid "Less..."
103msgstr ""
103msgstr ""
104
104
105−#: qml/Dash/Previews/PreviewRatingInput.qml:81
105+#: qml/Dash/Previews/PreviewRatingInput.qml:82
106msgid "Rate this"
106msgid "Rate this"
107msgstr "Gefa þessu einkunn"
107msgstr "Gefa þessu einkunn"
108
108
109−#: qml/Dash/Previews/PreviewRatingInput.qml:126
109+#: qml/Dash/Previews/PreviewRatingInput.qml:128
110msgid "Add a review"
110msgid "Add a review"
111msgstr "Gefa umsögn"
111msgstr "Gefa umsögn"
112
112
113−#: qml/Dash/Previews/PreviewRatingInput.qml:166
113+#: qml/Dash/Previews/PreviewRatingInput.qml:168
114msgid "Send"
114msgid "Send"
115msgstr "Senda"
115msgstr "Senda"
116
116
117−#: qml/Greeter/Greeter.qml:151
117+#: qml/Greeter/Greeter.qml:157
118msgid "Swipe to unlock"
118msgid "Swipe to unlock"
119msgstr ""
119msgstr ""
120
120
121−#: qml/Greeter/Lockscreen.qml:149
121+#: qml/Greeter/Lockscreen.qml:215
122msgid "Emergency Call"
122msgid "Emergency Call"
123msgstr "Neyðarsímtal"
123msgstr "Neyðarsímtal"
124
124
125+#: qml/Greeter/Lockscreen.qml:232
126+msgid "OK"
127+msgstr ""
128+
125−#: qml/Greeter/PassphraseLockscreen.qml:59
129+#: qml/Greeter/PassphraseLockscreen.qml:60
126#, qt-format
130#, qt-format
127msgid "Hello %1"
131msgid "Hello %1"
128msgstr "Hæ %1"
132msgstr "Hæ %1"
129
133
130−#: qml/Greeter/PassphraseLockscreen.qml:59
134+#: qml/Greeter/PassphraseLockscreen.qml:60
131msgid "Hello"
135msgid "Hello"
132msgstr "Hæ"
136msgstr "Hæ"
133
137
138+#: qml/Greeter/PinLockscreen.qml:198
139+msgid "CANCEL"
140+msgstr ""
141+
142+#: qml/Greeter/PinLockscreen.qml:216
143+msgid "DONE"
144+msgstr ""
145+
134#: qml/Hud/HudParametrizedActionsPage.qml:132
146#: qml/Hud/HudParametrizedActionsPage.qml:132
135msgid "Confirm"
147msgid "Confirm"
136msgstr "Staðfesta"
148msgstr "Staðfesta"
@@ -151,19 +163,19 @@ msgstr "Talaðu Núna..."
151msgid "Speaking..."
163msgid "Speaking..."
152msgstr "Tala..."
164msgstr "Tala..."
153
165
154−#: qml/Notifications/NotificationMenuItemFactory.qml:91
166+#: qml/Notifications/NotificationMenuItemFactory.qml:92
155msgid "Show password"
167msgid "Show password"
156msgstr ""
168msgstr ""
157
169
158−#: qml/Notifications/NotificationMenuItemFactory.qml:103
170+#: qml/Notifications/NotificationMenuItemFactory.qml:104
159msgid "Please enter SIM PIN"
171msgid "Please enter SIM PIN"
160msgstr ""
172msgstr ""
161
173
162−#: qml/Panel/SearchIndicator.qml:27
174+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
163msgid "Search"
175msgid "Search"
164msgstr "Leita"
176msgstr "Leita"
165
177
166−#: qml/Shell.qml:348
178+#: qml/Shell.qml:334
167#, qt-format
179#, qt-format
168msgid "Please enter %1"
180msgid "Please enter %1"
169msgstr ""
181msgstr ""
po/it.po+38−24
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-01-22 09:15+0000\n"
11+"PO-Revision-Date: 2014-06-10 12:08+0000\n"
12−"Last-Translator: Domenico <domenico.verde125@live.it>\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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-11 06:37+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -76,6 +76,8 @@ msgid ""
76"You have now mastered the edge gestures and can start using the "
76"You have now mastered the edge gestures and can start using the "
77"phone<br><br>Tap on the screen to start"
77"phone<br><br>Tap on the screen to start"
78msgstr ""
78msgstr ""
79+"L'apprendimento dei gesti è stato completato. È ora possibile iniziare a "
80+"usare il telefono.<br><br>Toccare lo schermo per iniziare"
79
81
80#: qml/Components/PageHeader.qml:365
82#: qml/Components/PageHeader.qml:365
81msgid "Recent searches"
83msgid "Recent searches"
@@ -83,58 +85,70 @@ msgstr "Ricerche recenti"
83
85
84#: qml/Components/SeeMore.qml:35
86#: qml/Components/SeeMore.qml:35
85msgid "See more"
87msgid "See more"
86−msgstr ""
88+msgstr "Mostra di più"
87
89
88#: qml/Components/SeeMore.qml:58
90#: qml/Components/SeeMore.qml:58
89msgid "See less"
91msgid "See less"
90−msgstr ""
92+msgstr "Mostra meno"
91
93
92#: qml/Dash/DashApps.qml:37
94#: qml/Dash/DashApps.qml:37
93msgid "Recent"
95msgid "Recent"
94−msgstr ""
96+msgstr "Recenti"
95
97
96#: qml/Dash/PreviewListView.qml:52
98#: qml/Dash/PreviewListView.qml:52
97#, qt-format
99#, qt-format
98msgid "%1 Preview"
100msgid "%1 Preview"
99−msgstr ""
101+msgstr "Anteprime: %1"
100
102
101#: qml/Dash/Previews/PreviewActionCombo.qml:34
103#: qml/Dash/Previews/PreviewActionCombo.qml:34
102msgid "More..."
104msgid "More..."
103−msgstr ""
105+msgstr "Altro..."
104
106
105#: qml/Dash/Previews/PreviewActionCombo.qml:34
107#: qml/Dash/Previews/PreviewActionCombo.qml:34
106msgid "Less..."
108msgid "Less..."
107−msgstr ""
109+msgstr "Meno..."
108
110
109−#: qml/Dash/Previews/PreviewRatingInput.qml:81
111+#: qml/Dash/Previews/PreviewRatingInput.qml:82
110msgid "Rate this"
112msgid "Rate this"
111msgstr "Valuta"
113msgstr "Valuta"
112
114
113−#: qml/Dash/Previews/PreviewRatingInput.qml:126
115+#: qml/Dash/Previews/PreviewRatingInput.qml:128
114msgid "Add a review"
116msgid "Add a review"
115msgstr "Aggiungi una recensione"
117msgstr "Aggiungi una recensione"
116
118
117−#: qml/Dash/Previews/PreviewRatingInput.qml:166
119+#: qml/Dash/Previews/PreviewRatingInput.qml:168
118msgid "Send"
120msgid "Send"
119msgstr "Invia"
121msgstr "Invia"
120
122
121−#: qml/Greeter/Greeter.qml:151
123+#: qml/Greeter/Greeter.qml:157
122msgid "Swipe to unlock"
124msgid "Swipe to unlock"
123−msgstr ""
125+msgstr "Scorrere per sbloccare"
124
126
125−#: qml/Greeter/Lockscreen.qml:149
127+#: qml/Greeter/Lockscreen.qml:215
126msgid "Emergency Call"
128msgid "Emergency Call"
127msgstr "Chiamata di emergenza"
129msgstr "Chiamata di emergenza"
128
130
131+#: qml/Greeter/Lockscreen.qml:232
132+msgid "OK"
133+msgstr "OK"
134+
129−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
130#, qt-format
136#, qt-format
131msgid "Hello %1"
137msgid "Hello %1"
132msgstr "Ciao %1"
138msgstr "Ciao %1"
133
139
134−#: qml/Greeter/PassphraseLockscreen.qml:59
140+#: qml/Greeter/PassphraseLockscreen.qml:60
135msgid "Hello"
141msgid "Hello"
136msgstr "Ciao"
142msgstr "Ciao"
137
143
144+#: qml/Greeter/PinLockscreen.qml:198
145+msgid "CANCEL"
146+msgstr "Annulla"
147+
148+#: qml/Greeter/PinLockscreen.qml:216
149+msgid "DONE"
150+msgstr "Fatto"
151+
138#: qml/Hud/HudParametrizedActionsPage.qml:132
152#: qml/Hud/HudParametrizedActionsPage.qml:132
139msgid "Confirm"
153msgid "Confirm"
140msgstr "Conferma"
154msgstr "Conferma"
@@ -155,19 +169,19 @@ msgstr "Parla ora..."
155msgid "Speaking..."
169msgid "Speaking..."
156msgstr "Sto parlando..."
170msgstr "Sto parlando..."
157
171
158−#: qml/Notifications/NotificationMenuItemFactory.qml:91
172+#: qml/Notifications/NotificationMenuItemFactory.qml:92
159msgid "Show password"
173msgid "Show password"
160msgstr "Mostra password"
174msgstr "Mostra password"
161
175
162−#: qml/Notifications/NotificationMenuItemFactory.qml:103
176+#: qml/Notifications/NotificationMenuItemFactory.qml:104
163msgid "Please enter SIM PIN"
177msgid "Please enter SIM PIN"
164−msgstr ""
178+msgstr "Inserire il codice PIN"
165
179
166−#: qml/Panel/SearchIndicator.qml:27
180+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
167msgid "Search"
181msgid "Search"
168msgstr "Cerca"
182msgstr "Cerca"
169
183
170−#: qml/Shell.qml:348
184+#: qml/Shell.qml:334
171#, qt-format
185#, qt-format
172msgid "Please enter %1"
186msgid "Please enter %1"
173msgstr "Inserire %1"
187msgstr "Inserire %1"
po/ja.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-01-18 07:01+0000\n"
11"PO-Revision-Date: 2014-01-18 07:01+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "送信"
114msgstr "送信"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "こんにちは"
135msgstr "こんにちは"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "確認"
147msgstr "確認"
@@ -150,19 +162,19 @@ msgstr "音声入力を開始..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "パスワードを表示"
167msgstr "パスワードを表示"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "検索"
175msgstr "検索"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/km.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-05-19 01:42+0000\n"
11"PO-Revision-Date: 2014-05-19 01:42+0000\n"
12"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
12"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\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-05-19 06:25+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -105,35 +105,47 @@ msgstr "ច្រើនជាង​..."
105msgid "Less..."
105msgid "Less..."
106msgstr "តិច​ជាង..."
106msgstr "តិច​ជាង..."
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:81
108+#: qml/Dash/Previews/PreviewRatingInput.qml:82
109msgid "Rate this"
109msgid "Rate this"
110msgstr "វាយតម្លៃ​វា"
110msgstr "វាយតម្លៃ​វា"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:126
112+#: qml/Dash/Previews/PreviewRatingInput.qml:128
113msgid "Add a review"
113msgid "Add a review"
114msgstr "បន្ថែម​ការ​ពិនិត្យ"
114msgstr "បន្ថែម​ការ​ពិនិត្យ"
115
115
116−#: qml/Dash/Previews/PreviewRatingInput.qml:166
116+#: qml/Dash/Previews/PreviewRatingInput.qml:168
117msgid "Send"
117msgid "Send"
118msgstr "ផ្ញើ"
118msgstr "ផ្ញើ"
119
119
120−#: qml/Greeter/Greeter.qml:151
120+#: qml/Greeter/Greeter.qml:157
121msgid "Swipe to unlock"
121msgid "Swipe to unlock"
122msgstr "អូស​ដើម្បី​ដោះសោ"
122msgstr "អូស​ដើម្បី​ដោះសោ"
123
123
124−#: qml/Greeter/Lockscreen.qml:149
124+#: qml/Greeter/Lockscreen.qml:215
125msgid "Emergency Call"
125msgid "Emergency Call"
126msgstr "ការ​ហៅ​ពេល​អាសន្ន"
126msgstr "ការ​ហៅ​ពេល​អាសន្ន"
127
127
128+#: qml/Greeter/Lockscreen.qml:232
129+msgid "OK"
130+msgstr ""
131+
128−#: qml/Greeter/PassphraseLockscreen.qml:59
132+#: qml/Greeter/PassphraseLockscreen.qml:60
129#, qt-format
133#, qt-format
130msgid "Hello %1"
134msgid "Hello %1"
131msgstr "សួស្ដី %1"
135msgstr "សួស្ដី %1"
132
136
133−#: qml/Greeter/PassphraseLockscreen.qml:59
137+#: qml/Greeter/PassphraseLockscreen.qml:60
134msgid "Hello"
138msgid "Hello"
135msgstr "សួស្តី"
139msgstr "សួស្តី"
136
140
141+#: qml/Greeter/PinLockscreen.qml:198
142+msgid "CANCEL"
143+msgstr ""
144+
145+#: qml/Greeter/PinLockscreen.qml:216
146+msgid "DONE"
147+msgstr ""
148+
137#: qml/Hud/HudParametrizedActionsPage.qml:132
149#: qml/Hud/HudParametrizedActionsPage.qml:132
138msgid "Confirm"
150msgid "Confirm"
139msgstr "បញ្ជាក់"
151msgstr "បញ្ជាក់"
@@ -154,19 +166,19 @@ msgstr "និយាយ​ឥឡូវ..."
154msgid "Speaking..."
166msgid "Speaking..."
155msgstr "កំពុង​និយាយ..."
167msgstr "កំពុង​និយាយ..."
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:91
169+#: qml/Notifications/NotificationMenuItemFactory.qml:92
158msgid "Show password"
170msgid "Show password"
159msgstr "បង្ហាញ​ពាក្យ​សម្ងាត់"
171msgstr "បង្ហាញ​ពាក្យ​សម្ងាត់"
160
172
161−#: qml/Notifications/NotificationMenuItemFactory.qml:103
173+#: qml/Notifications/NotificationMenuItemFactory.qml:104
162msgid "Please enter SIM PIN"
174msgid "Please enter SIM PIN"
163msgstr "បញ្ចូល​កូដ PIN របស់​ស៊ីមកាត"
175msgstr "បញ្ចូល​កូដ PIN របស់​ស៊ីមកាត"
164
176
165−#: qml/Panel/SearchIndicator.qml:27
177+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
166msgid "Search"
178msgid "Search"
167msgstr "ស្វែង​រក"
179msgstr "ស្វែង​រក"
168
180
169−#: qml/Shell.qml:348
181+#: qml/Shell.qml:334
170#, qt-format
182#, qt-format
171msgid "Please enter %1"
183msgid "Please enter %1"
172msgstr "សូម​បញ្ចូល %1"
184msgstr "សូម​បញ្ចូល %1"
po/kn.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "ಖಚಿತಪಡಿಸು"
147msgstr "ಖಚಿತಪಡಿಸು"
@@ -150,19 +162,19 @@ msgstr "ಈಗ ಮಾತನಾಡಿ ..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"
163msgstr "ಮಾತನಾಡುತಿದ್ದೀರಿ"
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "ಹುಡುಕು"
175msgstr "ಹುಡುಕು"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/ko.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2013-10-10 07:04+0000\n"
11"PO-Revision-Date: 2013-10-10 07:04+0000\n"
12"Last-Translator: Kim Boram <boramism@gmail.com>\n"
12"Last-Translator: Kim Boram <boramism@gmail.com>\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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "검색"
175msgstr "검색"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/ky.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Аныктоо"
147msgstr "Аныктоо"
@@ -150,19 +162,19 @@ msgstr "Азыр сүйлөңүз..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Сүйлөнүүдө..."
163msgstr "Сүйлөнүүдө..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Издөө"
175msgstr "Издөө"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/lo.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "ສົ່ງ"
114msgstr "ສົ່ງ"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "ສະບາຍດີ %1"
131msgstr "ສະບາຍດີ %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "ສະບາຍດີ"
135msgstr "ສະບາຍດີ"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "ຢືນຢັນ"
147msgstr "ຢືນຢັນ"
@@ -150,19 +162,19 @@ msgstr "ເວົ້າໂລດ"
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "ກໍາລັງເວົ້າ"
163msgstr "ກໍາລັງເວົ້າ"
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "ຊອກຫາ"
175msgstr "ຊອກຫາ"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "ກະລູນາປ້ອນ %1"
180msgstr "ກະລູນາປ້ອນ %1"
po/lt.po+33−21
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-01-15 12:42+0000\n"
11+"PO-Revision-Date: 2014-05-19 17:15+0000\n"
12−"Last-Translator: Gediminas Paulauskas <menesis@pov.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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -89,7 +89,7 @@ msgstr ""
89
89
90#: qml/Dash/DashApps.qml:37
90#: qml/Dash/DashApps.qml:37
91msgid "Recent"
91msgid "Recent"
92−msgstr ""
92+msgstr "Paskiausieji"
93
93
94#: qml/Dash/PreviewListView.qml:52
94#: qml/Dash/PreviewListView.qml:52
95#, qt-format
95#, qt-format
@@ -98,41 +98,53 @@ msgstr ""
98
98
99#: qml/Dash/Previews/PreviewActionCombo.qml:34
99#: qml/Dash/Previews/PreviewActionCombo.qml:34
100msgid "More..."
100msgid "More..."
101−msgstr ""
101+msgstr "Daugiau..."
102
102
103#: qml/Dash/Previews/PreviewActionCombo.qml:34
103#: qml/Dash/Previews/PreviewActionCombo.qml:34
104msgid "Less..."
104msgid "Less..."
105−msgstr ""
105+msgstr "Mažiau..."
106
106
107−#: qml/Dash/Previews/PreviewRatingInput.qml:81
107+#: qml/Dash/Previews/PreviewRatingInput.qml:82
108msgid "Rate this"
108msgid "Rate this"
109msgstr "Įvertinkite tai"
109msgstr "Įvertinkite tai"
110
110
111−#: qml/Dash/Previews/PreviewRatingInput.qml:126
111+#: qml/Dash/Previews/PreviewRatingInput.qml:128
112msgid "Add a review"
112msgid "Add a review"
113msgstr "Pridėkite apžvalgą"
113msgstr "Pridėkite apžvalgą"
114
114
115−#: qml/Dash/Previews/PreviewRatingInput.qml:166
115+#: qml/Dash/Previews/PreviewRatingInput.qml:168
116msgid "Send"
116msgid "Send"
117msgstr "Siųsti"
117msgstr "Siųsti"
118
118
119−#: qml/Greeter/Greeter.qml:151
119+#: qml/Greeter/Greeter.qml:157
120msgid "Swipe to unlock"
120msgid "Swipe to unlock"
121−msgstr ""
121+msgstr "Braukite ir atrakinsite"
122
122
123−#: qml/Greeter/Lockscreen.qml:149
123+#: qml/Greeter/Lockscreen.qml:215
124msgid "Emergency Call"
124msgid "Emergency Call"
125msgstr "Pagalbos skambutis"
125msgstr "Pagalbos skambutis"
126
126
127+#: qml/Greeter/Lockscreen.qml:232
128+msgid "OK"
129+msgstr ""
130+
127−#: qml/Greeter/PassphraseLockscreen.qml:59
131+#: qml/Greeter/PassphraseLockscreen.qml:60
128#, qt-format
132#, qt-format
129msgid "Hello %1"
133msgid "Hello %1"
130msgstr "Laba diena, %1"
134msgstr "Laba diena, %1"
131
135
132−#: qml/Greeter/PassphraseLockscreen.qml:59
136+#: qml/Greeter/PassphraseLockscreen.qml:60
133msgid "Hello"
137msgid "Hello"
134msgstr "Sveiki"
138msgstr "Sveiki"
135
139
140+#: qml/Greeter/PinLockscreen.qml:198
141+msgid "CANCEL"
142+msgstr ""
143+
144+#: qml/Greeter/PinLockscreen.qml:216
145+msgid "DONE"
146+msgstr ""
147+
136#: qml/Hud/HudParametrizedActionsPage.qml:132
148#: qml/Hud/HudParametrizedActionsPage.qml:132
137msgid "Confirm"
149msgid "Confirm"
138msgstr "Patvirtinti"
150msgstr "Patvirtinti"
@@ -153,19 +165,19 @@ msgstr "Kalbėkite..."
153msgid "Speaking..."
165msgid "Speaking..."
154msgstr "Kalbama..."
166msgstr "Kalbama..."
155
167
156−#: qml/Notifications/NotificationMenuItemFactory.qml:91
168+#: qml/Notifications/NotificationMenuItemFactory.qml:92
157msgid "Show password"
169msgid "Show password"
158msgstr "Rodyti slaptažodį"
170msgstr "Rodyti slaptažodį"
159
171
160−#: qml/Notifications/NotificationMenuItemFactory.qml:103
172+#: qml/Notifications/NotificationMenuItemFactory.qml:104
161msgid "Please enter SIM PIN"
173msgid "Please enter SIM PIN"
162−msgstr ""
174+msgstr "Įveskite SIM kortelės PIN kodą"
163
175
164−#: qml/Panel/SearchIndicator.qml:27
176+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
165msgid "Search"
177msgid "Search"
166msgstr "Paieška"
178msgstr "Paieška"
167
179
168−#: qml/Shell.qml:348
180+#: qml/Shell.qml:334
169#, qt-format
181#, qt-format
170msgid "Please enter %1"
182msgid "Please enter %1"
171msgstr "Prašom įvesti %1"
183msgstr "Prašom įvesti %1"
po/lv.po+30−18
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-07 18:17+0000\n"
11+"PO-Revision-Date: 2014-05-31 14:54+0000\n"
12"Last-Translator: Jānis-Marks Gailis <jeanmarc.gailis@gmail.com>\n"
12"Last-Translator: Jānis-Marks Gailis <jeanmarc.gailis@gmail.com>\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-05-10 08:01+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16996)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -64,7 +64,7 @@ msgstr ""
64
64
65#: qml/Components/EdgeDemo.qml:227
65#: qml/Components/EdgeDemo.qml:227
66msgid "Well done"
66msgid "Well done"
67−msgstr ""
67+msgstr "Ļoti labi!"
68
68
69#: qml/Components/EdgeDemo.qml:228
69#: qml/Components/EdgeDemo.qml:228
70msgid ""
70msgid ""
@@ -91,7 +91,7 @@ msgstr "Nesens"
91#: qml/Dash/PreviewListView.qml:52
91#: qml/Dash/PreviewListView.qml:52
92#, qt-format
92#, qt-format
93msgid "%1 Preview"
93msgid "%1 Preview"
94−msgstr ""
94+msgstr "%1 Priekšstats"
95
95
96#: qml/Dash/Previews/PreviewActionCombo.qml:34
96#: qml/Dash/Previews/PreviewActionCombo.qml:34
97msgid "More..."
97msgid "More..."
@@ -101,35 +101,47 @@ msgstr "Vairāk..."
101msgid "Less..."
101msgid "Less..."
102msgstr "Mazāk..."
102msgstr "Mazāk..."
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "Novērtēt šo"
106msgstr "Novērtēt šo"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "Komentēt"
110msgstr "Komentēt"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "Sūtīt"
114msgstr "Sūtīt"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "Neatliekamās Palīdzības zvans"
122msgstr "Neatliekamās Palīdzības zvans"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "Sveiki, %1"
131msgstr "Sveiki, %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "Sveiki"
135msgstr "Sveiki"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Apstiprināt"
147msgstr "Apstiprināt"
@@ -150,19 +162,19 @@ msgstr "Runajiet Tagad"
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Runa..."
163msgstr "Runa..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "Rādīt paroli"
167msgstr "Rādīt paroli"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159−msgstr ""
171+msgstr "Lūdzu ievadiet SIM PIN"
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Meklēt"
175msgstr "Meklēt"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "Lūdzu ievadiet %1"
180msgstr "Lūdzu ievadiet %1"
po/ml.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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: Stym alfaZ <Unknown>\n"
12"Last-Translator: Stym alfaZ <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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -103,35 +103,47 @@ msgstr ""
103msgid "Less..."
103msgid "Less..."
104msgstr ""
104msgstr ""
105
105
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
106+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
107msgid "Rate this"
108msgstr "ഇത് അവലോകനം ചെയ്യുക"
108msgstr "ഇത് അവലോകനം ചെയ്യുക"
109
109
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
110+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
111msgid "Add a review"
112msgstr "ഒരു അവലോകനം ചേര്‍ക്കുക"
112msgstr "ഒരു അവലോകനം ചേര്‍ക്കുക"
113
113
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
114+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
115msgid "Send"
116msgstr "അയയ്‌ക്കുക"
116msgstr "അയയ്‌ക്കുക"
117
117
118−#: qml/Greeter/Greeter.qml:151
118+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
119msgid "Swipe to unlock"
120msgstr ""
120msgstr ""
121
121
122−#: qml/Greeter/Lockscreen.qml:149
122+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
123msgid "Emergency Call"
124msgstr "അടിയന്തിര വിളി"
124msgstr "അടിയന്തിര വിളി"
125
125
126+#: qml/Greeter/Lockscreen.qml:232
127+msgid "OK"
128+msgstr ""
129+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
130+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
131#, qt-format
128msgid "Hello %1"
132msgid "Hello %1"
129msgstr "ഹലോ %1"
133msgstr "ഹലോ %1"
130
134
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
136msgid "Hello"
133msgstr "ഹലോ"
137msgstr "ഹലോ"
134
138
139+#: qml/Greeter/PinLockscreen.qml:198
140+msgid "CANCEL"
141+msgstr ""
142+
143+#: qml/Greeter/PinLockscreen.qml:216
144+msgid "DONE"
145+msgstr ""
146+
135#: qml/Hud/HudParametrizedActionsPage.qml:132
147#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
148msgid "Confirm"
137msgstr "സ്ഥിരീകരിക്കുക"
149msgstr "സ്ഥിരീകരിക്കുക"
@@ -152,19 +164,19 @@ msgstr "ഇപ്പോള്‍ സംസാരിക്കുക..."
152msgid "Speaking..."
164msgid "Speaking..."
153msgstr "സംസാരിക്കുന്നു..."
165msgstr "സംസാരിക്കുന്നു..."
154
166
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
167+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
168msgid "Show password"
157msgstr "രഹസ്യവാക്ക് കാണിക്കുക"
169msgstr "രഹസ്യവാക്ക് കാണിക്കുക"
158
170
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
171+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
172msgid "Please enter SIM PIN"
161msgstr ""
173msgstr ""
162
174
163−#: qml/Panel/SearchIndicator.qml:27
175+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
176msgid "Search"
165msgstr "തിരയുക"
177msgstr "തിരയുക"
166
178
167−#: qml/Shell.qml:348
179+#: qml/Shell.qml:334
168#, qt-format
180#, qt-format
169msgid "Please enter %1"
181msgid "Please enter %1"
170msgstr "ദയവായി %1 നല്‍കുക"
182msgstr "ദയവായി %1 നല്‍കുക"
po/mr.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/ms.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "Kadar ini"
106msgstr "Kadar ini"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "Tambah ulasan"
110msgstr "Tambah ulasan"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "Hantar"
114msgstr "Hantar"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "panggilan Kecemasan"
122msgstr "panggilan Kecemasan"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "Hai %1"
131msgstr "Hai %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "Hello"
135msgstr "Hello"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Sahkan"
147msgstr "Sahkan"
@@ -150,19 +162,19 @@ msgstr "Cakap Sekarang..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Bercakap..."
163msgstr "Bercakap..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "Tunjuk kata laluan"
167msgstr "Tunjuk kata laluan"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Gelintar"
175msgstr "Gelintar"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "Sila masukkan %1"
180msgstr "Sila masukkan %1"
po/my.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "ဒီဟာကိုအမှတ်ပေးမည်"
106msgstr "ဒီဟာကိုအမှတ်ပေးမည်"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "ပို့မည်"
114msgstr "ပို့မည်"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "အရေးပေါ်ခေါ်မည်"
122msgstr "အရေးပေါ်ခေါ်မည်"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "ဟဲလို %1"
131msgstr "ဟဲလို %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "ဟဲလို"
135msgstr "ဟဲလို"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "အတည်ပြုပါ"
147msgstr "အတည်ပြုပါ"
@@ -150,19 +162,19 @@ msgstr "ယခုပြောပါ"
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "ပြောနေသည်"
163msgstr "ပြောနေသည်"
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "စကားဝှက်ကိုပြ"
167msgstr "စကားဝှက်ကိုပြ"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "ရှာဖွေ"
175msgstr "ရှာဖွေ"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "%1ကိုရိုက်ထည့်ပါ"
180msgstr "%1ကိုရိုက်ထည့်ပါ"
po/nb.po+28−16
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-15 17:12+0000\n"
11+"PO-Revision-Date: 2014-06-11 06:36+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-05-16 06:52+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-12 06:35+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17041)\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
@@ -76,7 +76,7 @@ msgstr ""
76
76
77#: qml/Components/PageHeader.qml:365
77#: qml/Components/PageHeader.qml:365
78msgid "Recent searches"
78msgid "Recent searches"
79−msgstr "Siste søk"
79+msgstr "Nylige søk"
80
80
81#: qml/Components/SeeMore.qml:35
81#: qml/Components/SeeMore.qml:35
82msgid "See more"
82msgid "See more"
@@ -103,35 +103,47 @@ msgstr "Mer …"
103msgid "Less..."
103msgid "Less..."
104msgstr "Mindre …"
104msgstr "Mindre …"
105
105
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
106+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
107msgid "Rate this"
108msgstr "Vurder dette"
108msgstr "Vurder dette"
109
109
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
110+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
111msgid "Add a review"
112msgstr "Skriv en anmeldelse"
112msgstr "Skriv en anmeldelse"
113
113
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
114+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
115msgid "Send"
116msgstr "Send"
116msgstr "Send"
117
117
118−#: qml/Greeter/Greeter.qml:151
118+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
119msgid "Swipe to unlock"
120msgstr "Sveip for å låse opp"
120msgstr "Sveip for å låse opp"
121
121
122−#: qml/Greeter/Lockscreen.qml:149
122+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
123msgid "Emergency Call"
124msgstr "Nødanrop"
124msgstr "Nødanrop"
125
125
126+#: qml/Greeter/Lockscreen.qml:232
127+msgid "OK"
128+msgstr "OK"
129+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
130+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
131#, qt-format
128msgid "Hello %1"
132msgid "Hello %1"
129msgstr "Hei, %1"
133msgstr "Hei, %1"
130
134
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
136msgid "Hello"
133msgstr "Hei"
137msgstr "Hei"
134
138
139+#: qml/Greeter/PinLockscreen.qml:198
140+msgid "CANCEL"
141+msgstr "AVBRYT"
142+
143+#: qml/Greeter/PinLockscreen.qml:216
144+msgid "DONE"
145+msgstr "FERDIG"
146+
135#: qml/Hud/HudParametrizedActionsPage.qml:132
147#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
148msgid "Confirm"
137msgstr "Bekreft"
149msgstr "Bekreft"
@@ -152,19 +164,19 @@ msgstr "Snakk nå …"
152msgid "Speaking..."
164msgid "Speaking..."
153msgstr "Snakker …"
165msgstr "Snakker …"
154
166
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
167+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
168msgid "Show password"
157msgstr "Vis passord"
169msgstr "Vis passord"
158
170
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
171+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
172msgid "Please enter SIM PIN"
161msgstr "Skriv inn PIN-koden til SIM-kortet"
173msgstr "Skriv inn PIN-koden til SIM-kortet"
162
174
163−#: qml/Panel/SearchIndicator.qml:27
175+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
176msgid "Search"
165msgstr "Søk"
177msgstr "Søk"
166
178
167−#: qml/Shell.qml:348
179+#: qml/Shell.qml:334
168#, qt-format
180#, qt-format
169msgid "Please enter %1"
181msgid "Please enter %1"
170msgstr "Skriv inn %1"
182msgstr "Skriv inn %1"
po/nl.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-01-15 16:42+0000\n"
11"PO-Revision-Date: 2014-01-15 16:42+0000\n"
12"Last-Translator: Hannie Dumoleyn <Unknown>\n"
12"Last-Translator: Hannie Dumoleyn <Unknown>\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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "Beoordeel dit"
106msgstr "Beoordeel dit"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "Voeg recensie toe"
110msgstr "Voeg recensie toe"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "Versturen"
114msgstr "Versturen"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "Noodoproep"
122msgstr "Noodoproep"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "Hallo %1"
131msgstr "Hallo %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "Hallo"
135msgstr "Hallo"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Bevestigen"
147msgstr "Bevestigen"
@@ -150,19 +162,19 @@ msgstr "Nu inspreken…"
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Inspreken…"
163msgstr "Inspreken…"
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "Wachtwoord tonen"
167msgstr "Wachtwoord tonen"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Zoeken"
175msgstr "Zoeken"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "Voer %1 in"
180msgstr "Voer %1 in"
po/pl.po+38−24
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-01-10 11:38+0000\n"
11+"PO-Revision-Date: 2014-05-27 15:20+0000\n"
12−"Last-Translator: Michał Sawicz <michal.sawicz@canonical.com>\n"
12+"Last-Translator: GTriderXC <gtriderxc@yahoo.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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -73,6 +73,8 @@ msgid ""
73"You have now mastered the edge gestures and can start using the "
73"You have now mastered the edge gestures and can start using the "
74"phone<br><br>Tap on the screen to start"
74"phone<br><br>Tap on the screen to start"
75msgstr ""
75msgstr ""
76+"Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "
77+"pracy.<br><br>Dotknij ekranu by rozpocząć"
76
78
77#: qml/Components/PageHeader.qml:365
79#: qml/Components/PageHeader.qml:365
78msgid "Recent searches"
80msgid "Recent searches"
@@ -80,58 +82,70 @@ msgstr "Ostatnie wyszukiwania"
80
82
81#: qml/Components/SeeMore.qml:35
83#: qml/Components/SeeMore.qml:35
82msgid "See more"
84msgid "See more"
83−msgstr ""
85+msgstr "Zobacz więcej"
84
86
85#: qml/Components/SeeMore.qml:58
87#: qml/Components/SeeMore.qml:58
86msgid "See less"
88msgid "See less"
87−msgstr ""
89+msgstr "Zobacz mniej"
88
90
89#: qml/Dash/DashApps.qml:37
91#: qml/Dash/DashApps.qml:37
90msgid "Recent"
92msgid "Recent"
91−msgstr ""
93+msgstr "Ostatnio używane"
92
94
93#: qml/Dash/PreviewListView.qml:52
95#: qml/Dash/PreviewListView.qml:52
94#, qt-format
96#, qt-format
95msgid "%1 Preview"
97msgid "%1 Preview"
96−msgstr ""
98+msgstr "%1 Podgląd"
97
99
98#: qml/Dash/Previews/PreviewActionCombo.qml:34
100#: qml/Dash/Previews/PreviewActionCombo.qml:34
99msgid "More..."
101msgid "More..."
100−msgstr ""
102+msgstr "Więcej..."
101
103
102#: qml/Dash/Previews/PreviewActionCombo.qml:34
104#: qml/Dash/Previews/PreviewActionCombo.qml:34
103msgid "Less..."
105msgid "Less..."
104−msgstr ""
106+msgstr "Mniej..."
105
107
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
108+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
109msgid "Rate this"
108msgstr "Oceń to"
110msgstr "Oceń to"
109
111
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
112+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
113msgid "Add a review"
112msgstr "Dodaj recenzję"
114msgstr "Dodaj recenzję"
113
115
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
116+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
117msgid "Send"
116msgstr "Wyślij"
118msgstr "Wyślij"
117
119
118−#: qml/Greeter/Greeter.qml:151
120+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
121msgid "Swipe to unlock"
120−msgstr ""
122+msgstr "Przeciągnij aby odblokować"
121
123
122−#: qml/Greeter/Lockscreen.qml:149
124+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
125msgid "Emergency Call"
124msgstr "Telefon ratunkowy"
126msgstr "Telefon ratunkowy"
125
127
128+#: qml/Greeter/Lockscreen.qml:232
129+msgid "OK"
130+msgstr ""
131+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
132+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
133#, qt-format
128msgid "Hello %1"
134msgid "Hello %1"
129msgstr "Witaj %1"
135msgstr "Witaj %1"
130
136
131−#: qml/Greeter/PassphraseLockscreen.qml:59
137+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
138msgid "Hello"
133msgstr "Witaj"
139msgstr "Witaj"
134
140
141+#: qml/Greeter/PinLockscreen.qml:198
142+msgid "CANCEL"
143+msgstr ""
144+
145+#: qml/Greeter/PinLockscreen.qml:216
146+msgid "DONE"
147+msgstr ""
148+
135#: qml/Hud/HudParametrizedActionsPage.qml:132
149#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
150msgid "Confirm"
137msgstr "Potwierdź"
151msgstr "Potwierdź"
@@ -152,19 +166,19 @@ msgstr "Mów teraz..."
152msgid "Speaking..."
166msgid "Speaking..."
153msgstr "Rozpoznanie..."
167msgstr "Rozpoznanie..."
154
168
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
169+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
170msgid "Show password"
157msgstr "Wyświetl hasło"
171msgstr "Wyświetl hasło"
158
172
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
173+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
174msgid "Please enter SIM PIN"
161−msgstr ""
175+msgstr "Wprowadź kod PIN karty SIM"
162
176
163−#: qml/Panel/SearchIndicator.qml:27
177+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
178msgid "Search"
165msgstr "Szukaj"
179msgstr "Szukaj"
166
180
167−#: qml/Shell.qml:348
181+#: qml/Shell.qml:334
168#, qt-format
182#, qt-format
169msgid "Please enter %1"
183msgid "Please enter %1"
170msgstr "Wprowadź %1"
184msgstr "Wprowadź %1"
po/pt.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-01-14 19:18+0000\n"
11"PO-Revision-Date: 2014-01-14 19:18+0000\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/pt_BR.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-05-15 14:31+0000\n"
11"PO-Revision-Date: 2014-05-15 14:31+0000\n"
12"Last-Translator: Rafael Neri <Unknown>\n"
12"Last-Translator: Rafael Neri <Unknown>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-05-16 06:52+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -105,35 +105,47 @@ msgstr "Mais..."
105msgid "Less..."
105msgid "Less..."
106msgstr "Menos..."
106msgstr "Menos..."
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:81
108+#: qml/Dash/Previews/PreviewRatingInput.qml:82
109msgid "Rate this"
109msgid "Rate this"
110msgstr "Avaliar isto"
110msgstr "Avaliar isto"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:126
112+#: qml/Dash/Previews/PreviewRatingInput.qml:128
113msgid "Add a review"
113msgid "Add a review"
114msgstr "Adicionar uma análise"
114msgstr "Adicionar uma análise"
115
115
116−#: qml/Dash/Previews/PreviewRatingInput.qml:166
116+#: qml/Dash/Previews/PreviewRatingInput.qml:168
117msgid "Send"
117msgid "Send"
118msgstr "Enviar"
118msgstr "Enviar"
119
119
120−#: qml/Greeter/Greeter.qml:151
120+#: qml/Greeter/Greeter.qml:157
121msgid "Swipe to unlock"
121msgid "Swipe to unlock"
122msgstr "Deslizar para desbloquear"
122msgstr "Deslizar para desbloquear"
123
123
124−#: qml/Greeter/Lockscreen.qml:149
124+#: qml/Greeter/Lockscreen.qml:215
125msgid "Emergency Call"
125msgid "Emergency Call"
126msgstr "Chamada de emergência"
126msgstr "Chamada de emergência"
127
127
128+#: qml/Greeter/Lockscreen.qml:232
129+msgid "OK"
130+msgstr ""
131+
128−#: qml/Greeter/PassphraseLockscreen.qml:59
132+#: qml/Greeter/PassphraseLockscreen.qml:60
129#, qt-format
133#, qt-format
130msgid "Hello %1"
134msgid "Hello %1"
131msgstr "Olá %1"
135msgstr "Olá %1"
132
136
133−#: qml/Greeter/PassphraseLockscreen.qml:59
137+#: qml/Greeter/PassphraseLockscreen.qml:60
134msgid "Hello"
138msgid "Hello"
135msgstr "Olá"
139msgstr "Olá"
136
140
141+#: qml/Greeter/PinLockscreen.qml:198
142+msgid "CANCEL"
143+msgstr ""
144+
145+#: qml/Greeter/PinLockscreen.qml:216
146+msgid "DONE"
147+msgstr ""
148+
137#: qml/Hud/HudParametrizedActionsPage.qml:132
149#: qml/Hud/HudParametrizedActionsPage.qml:132
138msgid "Confirm"
150msgid "Confirm"
139msgstr "Confirmar"
151msgstr "Confirmar"
@@ -154,19 +166,19 @@ msgstr "Fale agora..."
154msgid "Speaking..."
166msgid "Speaking..."
155msgstr "Falando..."
167msgstr "Falando..."
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:91
169+#: qml/Notifications/NotificationMenuItemFactory.qml:92
158msgid "Show password"
170msgid "Show password"
159msgstr "Exibir senha"
171msgstr "Exibir senha"
160
172
161−#: qml/Notifications/NotificationMenuItemFactory.qml:103
173+#: qml/Notifications/NotificationMenuItemFactory.qml:104
162msgid "Please enter SIM PIN"
174msgid "Please enter SIM PIN"
163msgstr "Por favor, digite o PIN do cartão SIM"
175msgstr "Por favor, digite o PIN do cartão SIM"
164
176
165−#: qml/Panel/SearchIndicator.qml:27
177+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
166msgid "Search"
178msgid "Search"
167msgstr "Pesquisar"
179msgstr "Pesquisar"
168
180
169−#: qml/Shell.qml:348
181+#: qml/Shell.qml:334
170#, qt-format
182#, qt-format
171msgid "Please enter %1"
183msgid "Please enter %1"
172msgstr "Por favor, digite %1"
184msgstr "Por favor, digite %1"
po/ro.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2013-06-27 07:53+0000\n"
11"PO-Revision-Date: 2013-06-27 07:53+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: 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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Confirmați"
147msgstr "Confirmați"
@@ -150,19 +162,19 @@ msgstr "Vorbiți acum..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Vorbire..."
163msgstr "Vorbire..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Căutare"
175msgstr "Căutare"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/ru.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-05-15 12:57+0000\n"
11"PO-Revision-Date: 2014-05-15 12:57+0000\n"
12"Last-Translator: Zonov Roman <Unknown>\n"
12"Last-Translator: Zonov Roman <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-05-16 06:52+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -108,35 +108,47 @@ msgstr "Ещё..."
108msgid "Less..."
108msgid "Less..."
109msgstr "Меньше..."
109msgstr "Меньше..."
110
110
111−#: qml/Dash/Previews/PreviewRatingInput.qml:81
111+#: qml/Dash/Previews/PreviewRatingInput.qml:82
112msgid "Rate this"
112msgid "Rate this"
113msgstr "Оцените это"
113msgstr "Оцените это"
114
114
115−#: qml/Dash/Previews/PreviewRatingInput.qml:126
115+#: qml/Dash/Previews/PreviewRatingInput.qml:128
116msgid "Add a review"
116msgid "Add a review"
117msgstr "Добавьте отзыв"
117msgstr "Добавьте отзыв"
118
118
119−#: qml/Dash/Previews/PreviewRatingInput.qml:166
119+#: qml/Dash/Previews/PreviewRatingInput.qml:168
120msgid "Send"
120msgid "Send"
121msgstr "Отправить"
121msgstr "Отправить"
122
122
123−#: qml/Greeter/Greeter.qml:151
123+#: qml/Greeter/Greeter.qml:157
124msgid "Swipe to unlock"
124msgid "Swipe to unlock"
125msgstr "Смахните, чтобы разблокировать"
125msgstr "Смахните, чтобы разблокировать"
126
126
127−#: qml/Greeter/Lockscreen.qml:149
127+#: qml/Greeter/Lockscreen.qml:215
128msgid "Emergency Call"
128msgid "Emergency Call"
129msgstr "Экстренный вызов"
129msgstr "Экстренный вызов"
130
130
131+#: qml/Greeter/Lockscreen.qml:232
132+msgid "OK"
133+msgstr ""
134+
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132#, qt-format
136#, qt-format
133msgid "Hello %1"
137msgid "Hello %1"
134msgstr "Привет, %1"
138msgstr "Привет, %1"
135
139
136−#: qml/Greeter/PassphraseLockscreen.qml:59
140+#: qml/Greeter/PassphraseLockscreen.qml:60
137msgid "Hello"
141msgid "Hello"
138msgstr "Привет"
142msgstr "Привет"
139
143
144+#: qml/Greeter/PinLockscreen.qml:198
145+msgid "CANCEL"
146+msgstr ""
147+
148+#: qml/Greeter/PinLockscreen.qml:216
149+msgid "DONE"
150+msgstr ""
151+
140#: qml/Hud/HudParametrizedActionsPage.qml:132
152#: qml/Hud/HudParametrizedActionsPage.qml:132
141msgid "Confirm"
153msgid "Confirm"
142msgstr "Подтвердить"
154msgstr "Подтвердить"
@@ -157,19 +169,19 @@ msgstr "Говорите..."
157msgid "Speaking..."
169msgid "Speaking..."
158msgstr "Говорите..."
170msgstr "Говорите..."
159
171
160−#: qml/Notifications/NotificationMenuItemFactory.qml:91
172+#: qml/Notifications/NotificationMenuItemFactory.qml:92
161msgid "Show password"
173msgid "Show password"
162msgstr "Показать пароль"
174msgstr "Показать пароль"
163
175
164−#: qml/Notifications/NotificationMenuItemFactory.qml:103
176+#: qml/Notifications/NotificationMenuItemFactory.qml:104
165msgid "Please enter SIM PIN"
177msgid "Please enter SIM PIN"
166msgstr "Введите PIN код"
178msgstr "Введите PIN код"
167
179
168−#: qml/Panel/SearchIndicator.qml:27
180+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
169msgid "Search"
181msgid "Search"
170msgstr "Поиск"
182msgstr "Поиск"
171
183
172−#: qml/Shell.qml:348
184+#: qml/Shell.qml:334
173#, qt-format
185#, qt-format
174msgid "Please enter %1"
186msgid "Please enter %1"
175msgstr "Пожалуйста, введите %1"
187msgstr "Пожалуйста, введите %1"
po/shn.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/si.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/sl.po+30−18
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-02-21 16:38+0000\n"
11+"PO-Revision-Date: 2014-05-22 14:07+0000\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
12"Last-Translator: Damir Jerovšek <Unknown>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
13"Language-Team: Slovenian <sl@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -90,12 +90,12 @@ msgstr "Pokaži manj"
90
90
91#: qml/Dash/DashApps.qml:37
91#: qml/Dash/DashApps.qml:37
92msgid "Recent"
92msgid "Recent"
93−msgstr ""
93+msgstr "Nedavno"
94
94
95#: qml/Dash/PreviewListView.qml:52
95#: qml/Dash/PreviewListView.qml:52
96#, qt-format
96#, qt-format
97msgid "%1 Preview"
97msgid "%1 Preview"
98−msgstr ""
98+msgstr "%1 predogled"
99
99
100#: qml/Dash/Previews/PreviewActionCombo.qml:34
100#: qml/Dash/Previews/PreviewActionCombo.qml:34
101msgid "More..."
101msgid "More..."
@@ -105,35 +105,47 @@ msgstr "Več ..."
105msgid "Less..."
105msgid "Less..."
106msgstr "Manj ..."
106msgstr "Manj ..."
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:81
108+#: qml/Dash/Previews/PreviewRatingInput.qml:82
109msgid "Rate this"
109msgid "Rate this"
110msgstr "Ocenite"
110msgstr "Ocenite"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:126
112+#: qml/Dash/Previews/PreviewRatingInput.qml:128
113msgid "Add a review"
113msgid "Add a review"
114msgstr "Dodaj oceno"
114msgstr "Dodaj oceno"
115
115
116−#: qml/Dash/Previews/PreviewRatingInput.qml:166
116+#: qml/Dash/Previews/PreviewRatingInput.qml:168
117msgid "Send"
117msgid "Send"
118msgstr "Pošlji"
118msgstr "Pošlji"
119
119
120−#: qml/Greeter/Greeter.qml:151
120+#: qml/Greeter/Greeter.qml:157
121msgid "Swipe to unlock"
121msgid "Swipe to unlock"
122−msgstr ""
122+msgstr "Podrsajte za odklenitev"
123
123
124−#: qml/Greeter/Lockscreen.qml:149
124+#: qml/Greeter/Lockscreen.qml:215
125msgid "Emergency Call"
125msgid "Emergency Call"
126msgstr "Klic v sili"
126msgstr "Klic v sili"
127
127
128+#: qml/Greeter/Lockscreen.qml:232
129+msgid "OK"
130+msgstr ""
131+
128−#: qml/Greeter/PassphraseLockscreen.qml:59
132+#: qml/Greeter/PassphraseLockscreen.qml:60
129#, qt-format
133#, qt-format
130msgid "Hello %1"
134msgid "Hello %1"
131msgstr "Pozdravljeni, %1"
135msgstr "Pozdravljeni, %1"
132
136
133−#: qml/Greeter/PassphraseLockscreen.qml:59
137+#: qml/Greeter/PassphraseLockscreen.qml:60
134msgid "Hello"
138msgid "Hello"
135msgstr "Pozdravljeni"
139msgstr "Pozdravljeni"
136
140
141+#: qml/Greeter/PinLockscreen.qml:198
142+msgid "CANCEL"
143+msgstr ""
144+
145+#: qml/Greeter/PinLockscreen.qml:216
146+msgid "DONE"
147+msgstr ""
148+
137#: qml/Hud/HudParametrizedActionsPage.qml:132
149#: qml/Hud/HudParametrizedActionsPage.qml:132
138msgid "Confirm"
150msgid "Confirm"
139msgstr "Potrdi"
151msgstr "Potrdi"
@@ -154,19 +166,19 @@ msgstr "Govorite zdaj ..."
154msgid "Speaking..."
166msgid "Speaking..."
155msgstr "Govorjenje ..."
167msgstr "Govorjenje ..."
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:91
169+#: qml/Notifications/NotificationMenuItemFactory.qml:92
158msgid "Show password"
170msgid "Show password"
159msgstr "Pokaži geslo"
171msgstr "Pokaži geslo"
160
172
161−#: qml/Notifications/NotificationMenuItemFactory.qml:103
173+#: qml/Notifications/NotificationMenuItemFactory.qml:104
162msgid "Please enter SIM PIN"
174msgid "Please enter SIM PIN"
163msgstr "Vnesite PIN kartice SIM"
175msgstr "Vnesite PIN kartice SIM"
164
176
165−#: qml/Panel/SearchIndicator.qml:27
177+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
166msgid "Search"
178msgid "Search"
167msgstr "Iskanje"
179msgstr "Iskanje"
168
180
169−#: qml/Shell.qml:348
181+#: qml/Shell.qml:334
170#, qt-format
182#, qt-format
171msgid "Please enter %1"
183msgid "Please enter %1"
172msgstr "Vnesite %1"
184msgstr "Vnesite %1"
po/sq.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:43+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -102,35 +102,47 @@ msgstr ""
102msgid "Less..."
102msgid "Less..."
103msgstr ""
103msgstr ""
104
104
105−#: qml/Dash/Previews/PreviewRatingInput.qml:81
105+#: qml/Dash/Previews/PreviewRatingInput.qml:82
106msgid "Rate this"
106msgid "Rate this"
107msgstr "Vlerësoje këtë"
107msgstr "Vlerësoje këtë"
108
108
109−#: qml/Dash/Previews/PreviewRatingInput.qml:126
109+#: qml/Dash/Previews/PreviewRatingInput.qml:128
110msgid "Add a review"
110msgid "Add a review"
111msgstr "Shto një rishikim"
111msgstr "Shto një rishikim"
112
112
113−#: qml/Dash/Previews/PreviewRatingInput.qml:166
113+#: qml/Dash/Previews/PreviewRatingInput.qml:168
114msgid "Send"
114msgid "Send"
115msgstr ""
115msgstr ""
116
116
117−#: qml/Greeter/Greeter.qml:151
117+#: qml/Greeter/Greeter.qml:157
118msgid "Swipe to unlock"
118msgid "Swipe to unlock"
119msgstr ""
119msgstr ""
120
120
121−#: qml/Greeter/Lockscreen.qml:149
121+#: qml/Greeter/Lockscreen.qml:215
122msgid "Emergency Call"
122msgid "Emergency Call"
123msgstr ""
123msgstr ""
124
124
125+#: qml/Greeter/Lockscreen.qml:232
126+msgid "OK"
127+msgstr ""
128+
125−#: qml/Greeter/PassphraseLockscreen.qml:59
129+#: qml/Greeter/PassphraseLockscreen.qml:60
126#, qt-format
130#, qt-format
127msgid "Hello %1"
131msgid "Hello %1"
128msgstr ""
132msgstr ""
129
133
130−#: qml/Greeter/PassphraseLockscreen.qml:59
134+#: qml/Greeter/PassphraseLockscreen.qml:60
131msgid "Hello"
135msgid "Hello"
132msgstr ""
136msgstr ""
133
137
138+#: qml/Greeter/PinLockscreen.qml:198
139+msgid "CANCEL"
140+msgstr ""
141+
142+#: qml/Greeter/PinLockscreen.qml:216
143+msgid "DONE"
144+msgstr ""
145+
134#: qml/Hud/HudParametrizedActionsPage.qml:132
146#: qml/Hud/HudParametrizedActionsPage.qml:132
135msgid "Confirm"
147msgid "Confirm"
136msgstr ""
148msgstr ""
@@ -151,19 +163,19 @@ msgstr ""
151msgid "Speaking..."
163msgid "Speaking..."
152msgstr ""
164msgstr ""
153
165
154−#: qml/Notifications/NotificationMenuItemFactory.qml:91
166+#: qml/Notifications/NotificationMenuItemFactory.qml:92
155msgid "Show password"
167msgid "Show password"
156msgstr ""
168msgstr ""
157
169
158−#: qml/Notifications/NotificationMenuItemFactory.qml:103
170+#: qml/Notifications/NotificationMenuItemFactory.qml:104
159msgid "Please enter SIM PIN"
171msgid "Please enter SIM PIN"
160msgstr ""
172msgstr ""
161
173
162−#: qml/Panel/SearchIndicator.qml:27
174+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
163msgid "Search"
175msgid "Search"
164msgstr ""
176msgstr ""
165
177
166−#: qml/Shell.qml:348
178+#: qml/Shell.qml:334
167#, qt-format
179#, qt-format
168msgid "Please enter %1"
180msgid "Please enter %1"
169msgstr ""
181msgstr ""
po/sr.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Потврди"
147msgstr "Потврди"
@@ -150,19 +162,19 @@ msgstr "Изговорите сада..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "Говор..."
163msgstr "Говор..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Претрага"
175msgstr "Претрага"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/sv.po+42−30
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2013-06-26 22:36+0000\n"
11+"PO-Revision-Date: 2014-06-07 19:14+0000\n"
12−"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
12+"Last-Translator: mikasjoman <Unknown>\n"
13"Language-Team: Swedish <sv@li.org>\n"
13"Language-Team: Swedish <sv@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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-08 05:56+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -32,15 +32,15 @@ msgstr ""
32
32
33#: qml/Components/EdgeDemo.qml:113
33#: qml/Components/EdgeDemo.qml:113
34msgid "Right edge"
34msgid "Right edge"
35−msgstr ""
35+msgstr "Högerkant"
36
36
37#: qml/Components/EdgeDemo.qml:114
37#: qml/Components/EdgeDemo.qml:114
38msgid "Try swiping from the right edge to unlock the phone"
38msgid "Try swiping from the right edge to unlock the phone"
39−msgstr ""
39+msgstr "Dra med fingret från höger för att låsa upp telefonen"
40
40
41#: qml/Components/EdgeDemo.qml:145
41#: qml/Components/EdgeDemo.qml:145
42msgid "Top edge"
42msgid "Top edge"
43−msgstr ""
43+msgstr "Överkant"
44
44
45#: qml/Components/EdgeDemo.qml:146
45#: qml/Components/EdgeDemo.qml:146
46msgid "Try swiping from the top edge to access the indicators"
46msgid "Try swiping from the top edge to access the indicators"
@@ -48,7 +48,7 @@ msgstr ""
48
48
49#: qml/Components/EdgeDemo.qml:171
49#: qml/Components/EdgeDemo.qml:171
50msgid "Close"
50msgid "Close"
51−msgstr ""
51+msgstr "Stäng"
52
52
53#: qml/Components/EdgeDemo.qml:172
53#: qml/Components/EdgeDemo.qml:172
54msgid "Swipe up again to close the settings screen"
54msgid "Swipe up again to close the settings screen"
@@ -56,7 +56,7 @@ msgstr ""
56
56
57#: qml/Components/EdgeDemo.qml:199
57#: qml/Components/EdgeDemo.qml:199
58msgid "Left edge"
58msgid "Left edge"
59−msgstr ""
59+msgstr "Vänsterkant"
60
60
61#: qml/Components/EdgeDemo.qml:200
61#: qml/Components/EdgeDemo.qml:200
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
62msgid "Swipe from the left to reveal the launcher for quick access to apps"
@@ -101,68 +101,80 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110−msgstr ""
110+msgstr "Lägg till en recension"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122+msgstr "Nödsamtal"
123+
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
122msgstr ""
126msgstr ""
123
127
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135−msgstr ""
147+msgstr "Bekräfta"
136
148
137#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
149#: qml/Hud/Hud.qml:61 qml/Hud/Hud.qml:99 qml/Hud/Hud.qml:372
138msgid "Type or say a command"
150msgid "Type or say a command"
139−msgstr ""
151+msgstr "Skriv eller tala in ett kommando"
140
152
141#: qml/Hud/Hud.qml:84
153#: qml/Hud/Hud.qml:84
142msgid "Loading. Please Wait..."
154msgid "Loading. Please Wait..."
143−msgstr ""
155+msgstr "Laddar. Var god vänta..."
144
156
145#: qml/Hud/Hud.qml:89
157#: qml/Hud/Hud.qml:89
146msgid "Speak Now..."
158msgid "Speak Now..."
147−msgstr ""
159+msgstr "Tala nu..."
148
160
149#: qml/Hud/Hud.qml:94
161#: qml/Hud/Hud.qml:94
150msgid "Speaking..."
162msgid "Speaking..."
151−msgstr ""
163+msgstr "Talar..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155−msgstr ""
167+msgstr "Visa lösenord"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163−msgstr ""
175+msgstr "Sök"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168−msgstr ""
180+msgstr "Vänligen fyll i %1"
po/sw.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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 Mlabwa <Unknown>\n"
12"Last-Translator: Damas Mlabwa <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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "Tuma"
114msgstr "Tuma"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "Thibitisha"
147msgstr "Thibitisha"
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "Tafuta"
175msgstr "Tafuta"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/ta.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -104,35 +104,47 @@ msgstr ""
104msgid "Less..."
104msgid "Less..."
105msgstr ""
105msgstr ""
106
106
107−#: qml/Dash/Previews/PreviewRatingInput.qml:81
107+#: qml/Dash/Previews/PreviewRatingInput.qml:82
108msgid "Rate this"
108msgid "Rate this"
109msgstr "இதை மதிப்பிடு"
109msgstr "இதை மதிப்பிடு"
110
110
111−#: qml/Dash/Previews/PreviewRatingInput.qml:126
111+#: qml/Dash/Previews/PreviewRatingInput.qml:128
112msgid "Add a review"
112msgid "Add a review"
113msgstr "ஒரு பரிசீலனையை சேர்"
113msgstr "ஒரு பரிசீலனையை சேர்"
114
114
115−#: qml/Dash/Previews/PreviewRatingInput.qml:166
115+#: qml/Dash/Previews/PreviewRatingInput.qml:168
116msgid "Send"
116msgid "Send"
117msgstr "அனுப்பு"
117msgstr "அனுப்பு"
118
118
119−#: qml/Greeter/Greeter.qml:151
119+#: qml/Greeter/Greeter.qml:157
120msgid "Swipe to unlock"
120msgid "Swipe to unlock"
121msgstr ""
121msgstr ""
122
122
123−#: qml/Greeter/Lockscreen.qml:149
123+#: qml/Greeter/Lockscreen.qml:215
124msgid "Emergency Call"
124msgid "Emergency Call"
125msgstr "அவசர அழைப்பு"
125msgstr "அவசர அழைப்பு"
126
126
127+#: qml/Greeter/Lockscreen.qml:232
128+msgid "OK"
129+msgstr ""
130+
127−#: qml/Greeter/PassphraseLockscreen.qml:59
131+#: qml/Greeter/PassphraseLockscreen.qml:60
128#, qt-format
132#, qt-format
129msgid "Hello %1"
133msgid "Hello %1"
130msgstr "வணக்கம் %1"
134msgstr "வணக்கம் %1"
131
135
132−#: qml/Greeter/PassphraseLockscreen.qml:59
136+#: qml/Greeter/PassphraseLockscreen.qml:60
133msgid "Hello"
137msgid "Hello"
134msgstr "வணக்கம்"
138msgstr "வணக்கம்"
135
139
140+#: qml/Greeter/PinLockscreen.qml:198
141+msgid "CANCEL"
142+msgstr ""
143+
144+#: qml/Greeter/PinLockscreen.qml:216
145+msgid "DONE"
146+msgstr ""
147+
136#: qml/Hud/HudParametrizedActionsPage.qml:132
148#: qml/Hud/HudParametrizedActionsPage.qml:132
137msgid "Confirm"
149msgid "Confirm"
138msgstr "உறுதிப்படுத்து"
150msgstr "உறுதிப்படுத்து"
@@ -153,19 +165,19 @@ msgstr "இப்பொது பேசு..."
153msgid "Speaking..."
165msgid "Speaking..."
154msgstr "பேசுகிறது..."
166msgstr "பேசுகிறது..."
155
167
156−#: qml/Notifications/NotificationMenuItemFactory.qml:91
168+#: qml/Notifications/NotificationMenuItemFactory.qml:92
157msgid "Show password"
169msgid "Show password"
158msgstr ""
170msgstr ""
159
171
160−#: qml/Notifications/NotificationMenuItemFactory.qml:103
172+#: qml/Notifications/NotificationMenuItemFactory.qml:104
161msgid "Please enter SIM PIN"
173msgid "Please enter SIM PIN"
162msgstr ""
174msgstr ""
163
175
164−#: qml/Panel/SearchIndicator.qml:27
176+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
165msgid "Search"
177msgid "Search"
166msgstr "தெடு"
178msgstr "தெடு"
167
179
168−#: qml/Shell.qml:348
180+#: qml/Shell.qml:334
169#, qt-format
181#, qt-format
170msgid "Please enter %1"
182msgid "Please enter %1"
171msgstr "தயவுச்செய்து %1 உள்ளிடு"
183msgstr "தயவுச்செய்து %1 உள்ளிடு"
po/te.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2013-06-27 09:57+0000\n"
11"PO-Revision-Date: 2013-06-27 09:57+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: 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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/tr.po+31−19
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-03-05 08:54+0000\n"
11+"PO-Revision-Date: 2014-05-19 12:52+0000\n"
12−"Last-Translator: Muhammed Yüce <muhammedyuceee@gmail.com>\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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -89,12 +89,12 @@ msgstr "Daha azını gör"
89
89
90#: qml/Dash/DashApps.qml:37
90#: qml/Dash/DashApps.qml:37
91msgid "Recent"
91msgid "Recent"
92−msgstr ""
92+msgstr "En son"
93
93
94#: qml/Dash/PreviewListView.qml:52
94#: qml/Dash/PreviewListView.qml:52
95#, qt-format
95#, qt-format
96msgid "%1 Preview"
96msgid "%1 Preview"
97−msgstr ""
97+msgstr "%1 Önizlemesi"
98
98
99#: qml/Dash/Previews/PreviewActionCombo.qml:34
99#: qml/Dash/Previews/PreviewActionCombo.qml:34
100msgid "More..."
100msgid "More..."
@@ -104,35 +104,47 @@ msgstr "Daha fazlası..."
104msgid "Less..."
104msgid "Less..."
105msgstr "Daha az.."
105msgstr "Daha az.."
106
106
107−#: qml/Dash/Previews/PreviewRatingInput.qml:81
107+#: qml/Dash/Previews/PreviewRatingInput.qml:82
108msgid "Rate this"
108msgid "Rate this"
109msgstr "Oyla"
109msgstr "Oyla"
110
110
111−#: qml/Dash/Previews/PreviewRatingInput.qml:126
111+#: qml/Dash/Previews/PreviewRatingInput.qml:128
112msgid "Add a review"
112msgid "Add a review"
113msgstr "Bir inceleme ekle"
113msgstr "Bir inceleme ekle"
114
114
115−#: qml/Dash/Previews/PreviewRatingInput.qml:166
115+#: qml/Dash/Previews/PreviewRatingInput.qml:168
116msgid "Send"
116msgid "Send"
117msgstr "Gönder"
117msgstr "Gönder"
118
118
119−#: qml/Greeter/Greeter.qml:151
119+#: qml/Greeter/Greeter.qml:157
120msgid "Swipe to unlock"
120msgid "Swipe to unlock"
121−msgstr ""
121+msgstr "Açmak için kaydırın"
122
122
123−#: qml/Greeter/Lockscreen.qml:149
123+#: qml/Greeter/Lockscreen.qml:215
124msgid "Emergency Call"
124msgid "Emergency Call"
125msgstr "Acil Arama"
125msgstr "Acil Arama"
126
126
127+#: qml/Greeter/Lockscreen.qml:232
128+msgid "OK"
129+msgstr ""
130+
127−#: qml/Greeter/PassphraseLockscreen.qml:59
131+#: qml/Greeter/PassphraseLockscreen.qml:60
128#, qt-format
132#, qt-format
129msgid "Hello %1"
133msgid "Hello %1"
130msgstr "Merhaba %1"
134msgstr "Merhaba %1"
131
135
132−#: qml/Greeter/PassphraseLockscreen.qml:59
136+#: qml/Greeter/PassphraseLockscreen.qml:60
133msgid "Hello"
137msgid "Hello"
134msgstr "Merhaba"
138msgstr "Merhaba"
135
139
140+#: qml/Greeter/PinLockscreen.qml:198
141+msgid "CANCEL"
142+msgstr ""
143+
144+#: qml/Greeter/PinLockscreen.qml:216
145+msgid "DONE"
146+msgstr ""
147+
136#: qml/Hud/HudParametrizedActionsPage.qml:132
148#: qml/Hud/HudParametrizedActionsPage.qml:132
137msgid "Confirm"
149msgid "Confirm"
138msgstr "Onayla"
150msgstr "Onayla"
@@ -153,19 +165,19 @@ msgstr "Şimdi Konuşun..."
153msgid "Speaking..."
165msgid "Speaking..."
154msgstr "Konuşuyor..."
166msgstr "Konuşuyor..."
155
167
156−#: qml/Notifications/NotificationMenuItemFactory.qml:91
168+#: qml/Notifications/NotificationMenuItemFactory.qml:92
157msgid "Show password"
169msgid "Show password"
158msgstr "Parolayı göster"
170msgstr "Parolayı göster"
159
171
160−#: qml/Notifications/NotificationMenuItemFactory.qml:103
172+#: qml/Notifications/NotificationMenuItemFactory.qml:104
161msgid "Please enter SIM PIN"
173msgid "Please enter SIM PIN"
162msgstr "Lütfen SIM PIN'inizi girin"
174msgstr "Lütfen SIM PIN'inizi girin"
163
175
164−#: qml/Panel/SearchIndicator.qml:27
176+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
165msgid "Search"
177msgid "Search"
166msgstr "Ara"
178msgstr "Ara"
167
179
168−#: qml/Shell.qml:348
180+#: qml/Shell.qml:334
169#, qt-format
181#, qt-format
170msgid "Please enter %1"
182msgid "Please enter %1"
171msgstr "Lütfen %1 girin"
183msgstr "Lütfen %1 girin"
po/ug.po+35−23
@@ -1,21 +1,21 @@
1# Uyghur translation for unity
1# Uyghur translation for unity
2# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
2# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
3# This file is distributed under the same license as the unity package.
3# This file is distributed under the same license as the unity package.
4−# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
4+# Gheyret Kenji <gheyret@gmail.com>, 2013.
5#
5#
6msgid ""
6msgid ""
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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-04-22 05:46+0000\n"
11+"PO-Revision-Date: 2014-06-13 21:07+0000\n"
12−"Last-Translator: abdurahman <Unknown>\n"
12+"Last-Translator: Gheyret T.Kenji <Unknown>\n"
13−"Language-Team: Uyghur <ug@li.org>\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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-14 06:46+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17045)\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
@@ -71,7 +71,7 @@ msgid ""
71"You have now mastered the edge gestures and can start using the "
71"You have now mastered the edge gestures and can start using the "
72"phone<br><br>Tap on the screen to start"
72"phone<br><br>Tap on the screen to start"
73msgstr ""
73msgstr ""
74−"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگەللەپ "
74+"ئېكراننى چېكىپ باشلاڭ<br><br>سىز ھازىر گىرۋەك بارماق ئىشارەتلىرىنى ئىگىلەپ "
75"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
75"بولدىڭىز،ئەمدى تېلېفوننى ئىشلىتىشنى باشلىسىڭىز بولىدۇ"
76
76
77#: qml/Components/PageHeader.qml:365
77#: qml/Components/PageHeader.qml:365
@@ -93,7 +93,7 @@ msgstr "يېقىنقى"
93#: qml/Dash/PreviewListView.qml:52
93#: qml/Dash/PreviewListView.qml:52
94#, qt-format
94#, qt-format
95msgid "%1 Preview"
95msgid "%1 Preview"
96−msgstr "%1 ئالدىن كۆرۈپ بىقىش"
96+msgstr "%1 ئالدىن كۆرۈپ بېقىش"
97
97
98#: qml/Dash/Previews/PreviewActionCombo.qml:34
98#: qml/Dash/Previews/PreviewActionCombo.qml:34
99msgid "More..."
99msgid "More..."
@@ -103,34 +103,46 @@ msgstr "تېخىمۇ كۆپ…"
103msgid "Less..."
103msgid "Less..."
104msgstr "ئازراق..."
104msgstr "ئازراق..."
105
105
106−#: qml/Dash/Previews/PreviewRatingInput.qml:81
106+#: qml/Dash/Previews/PreviewRatingInput.qml:82
107msgid "Rate this"
107msgid "Rate this"
108msgstr "بۇنى باھالاڭ"
108msgstr "بۇنى باھالاڭ"
109
109
110−#: qml/Dash/Previews/PreviewRatingInput.qml:126
110+#: qml/Dash/Previews/PreviewRatingInput.qml:128
111msgid "Add a review"
111msgid "Add a review"
112msgstr "باھا قوشۇش"
112msgstr "باھا قوشۇش"
113
113
114−#: qml/Dash/Previews/PreviewRatingInput.qml:166
114+#: qml/Dash/Previews/PreviewRatingInput.qml:168
115msgid "Send"
115msgid "Send"
116msgstr "ئەۋەت"
116msgstr "ئەۋەت"
117
117
118−#: qml/Greeter/Greeter.qml:151
118+#: qml/Greeter/Greeter.qml:157
119msgid "Swipe to unlock"
119msgid "Swipe to unlock"
120−msgstr ""
120+msgstr "سىيرىسىڭىز قۇلۇپسىزلىنىدۇ"
121
121
122−#: qml/Greeter/Lockscreen.qml:149
122+#: qml/Greeter/Lockscreen.qml:215
123msgid "Emergency Call"
123msgid "Emergency Call"
124msgstr "جىددىي تېلېفون"
124msgstr "جىددىي تېلېفون"
125
125
126+#: qml/Greeter/Lockscreen.qml:232
127+msgid "OK"
128+msgstr "تامام"
129+
126−#: qml/Greeter/PassphraseLockscreen.qml:59
130+#: qml/Greeter/PassphraseLockscreen.qml:60
127#, qt-format
131#, qt-format
128msgid "Hello %1"
132msgid "Hello %1"
129msgstr "سالام %1"
133msgstr "سالام %1"
130
134
131−#: qml/Greeter/PassphraseLockscreen.qml:59
135+#: qml/Greeter/PassphraseLockscreen.qml:60
132msgid "Hello"
136msgid "Hello"
133−msgstr "سالام"
137+msgstr "ئەسسالامۇئەلەيكۇم"
138+
139+#: qml/Greeter/PinLockscreen.qml:198
140+msgid "CANCEL"
141+msgstr "ۋاز كەچ"
142+
143+#: qml/Greeter/PinLockscreen.qml:216
144+msgid "DONE"
145+msgstr "تامام"
134
146
135#: qml/Hud/HudParametrizedActionsPage.qml:132
147#: qml/Hud/HudParametrizedActionsPage.qml:132
136msgid "Confirm"
148msgid "Confirm"
@@ -152,19 +164,19 @@ msgstr "ئەمدى سۆزلەڭ…"
152msgid "Speaking..."
164msgid "Speaking..."
153msgstr "سۆزلەۋاتىسىز…"
165msgstr "سۆزلەۋاتىسىز…"
154
166
155−#: qml/Notifications/NotificationMenuItemFactory.qml:91
167+#: qml/Notifications/NotificationMenuItemFactory.qml:92
156msgid "Show password"
168msgid "Show password"
157msgstr "ئىم كۆرسەت"
169msgstr "ئىم كۆرسەت"
158
170
159−#: qml/Notifications/NotificationMenuItemFactory.qml:103
171+#: qml/Notifications/NotificationMenuItemFactory.qml:104
160msgid "Please enter SIM PIN"
172msgid "Please enter SIM PIN"
161−msgstr "پارولىنى كىرگۈزۈڭPINكارتىڭىزنىڭ SIM"
173+msgstr "سىم(SIM) كارتىڭىزنىڭ PIN نومۇرىنى كىرگۈزۈڭ"
162
174
163−#: qml/Panel/SearchIndicator.qml:27
175+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
164msgid "Search"
176msgid "Search"
165msgstr "ئىزدە"
177msgstr "ئىزدە"
166
178
167−#: qml/Shell.qml:348
179+#: qml/Shell.qml:334
168#, qt-format
180#, qt-format
169msgid "Please enter %1"
181msgid "Please enter %1"
170msgstr "%1 نى كىرگۈزۈڭ"
182msgstr "%1 نى كىرگۈزۈڭ"
po/uk.po+27−15
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-15 12:00+0000\n"
11+"PO-Revision-Date: 2014-06-08 19:09+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-05-16 06:52+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-09 06:33+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -106,35 +106,47 @@ msgstr "Більше…"
106msgid "Less..."
106msgid "Less..."
107msgstr "Менше..."
107msgstr "Менше..."
108
108
109−#: qml/Dash/Previews/PreviewRatingInput.qml:81
109+#: qml/Dash/Previews/PreviewRatingInput.qml:82
110msgid "Rate this"
110msgid "Rate this"
111msgstr "Оцінити"
111msgstr "Оцінити"
112
112
113−#: qml/Dash/Previews/PreviewRatingInput.qml:126
113+#: qml/Dash/Previews/PreviewRatingInput.qml:128
114msgid "Add a review"
114msgid "Add a review"
115msgstr "Додати рецензію"
115msgstr "Додати рецензію"
116
116
117−#: qml/Dash/Previews/PreviewRatingInput.qml:166
117+#: qml/Dash/Previews/PreviewRatingInput.qml:168
118msgid "Send"
118msgid "Send"
119msgstr "Надіслати"
119msgstr "Надіслати"
120
120
121−#: qml/Greeter/Greeter.qml:151
121+#: qml/Greeter/Greeter.qml:157
122msgid "Swipe to unlock"
122msgid "Swipe to unlock"
123msgstr "Проведіть пальцем, щоб розблокувати"
123msgstr "Проведіть пальцем, щоб розблокувати"
124
124
125−#: qml/Greeter/Lockscreen.qml:149
125+#: qml/Greeter/Lockscreen.qml:215
126msgid "Emergency Call"
126msgid "Emergency Call"
127msgstr "Терміновий виклик"
127msgstr "Терміновий виклик"
128
128
129+#: qml/Greeter/Lockscreen.qml:232
130+msgid "OK"
131+msgstr "Гаразд"
132+
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130#, qt-format
134#, qt-format
131msgid "Hello %1"
135msgid "Hello %1"
132msgstr "Привіт, %1"
136msgstr "Привіт, %1"
133
137
134−#: qml/Greeter/PassphraseLockscreen.qml:59
138+#: qml/Greeter/PassphraseLockscreen.qml:60
135msgid "Hello"
139msgid "Hello"
136msgstr "Привіт!"
140msgstr "Привіт!"
137
141
142+#: qml/Greeter/PinLockscreen.qml:198
143+msgid "CANCEL"
144+msgstr "Скасувати"
145+
146+#: qml/Greeter/PinLockscreen.qml:216
147+msgid "DONE"
148+msgstr "Виконано"
149+
138#: qml/Hud/HudParametrizedActionsPage.qml:132
150#: qml/Hud/HudParametrizedActionsPage.qml:132
139msgid "Confirm"
151msgid "Confirm"
140msgstr "Підтвердити"
152msgstr "Підтвердити"
@@ -155,19 +167,19 @@ msgstr "Можна говорити…"
155msgid "Speaking..."
167msgid "Speaking..."
156msgstr "Мовлення…"
168msgstr "Мовлення…"
157
169
158−#: qml/Notifications/NotificationMenuItemFactory.qml:91
170+#: qml/Notifications/NotificationMenuItemFactory.qml:92
159msgid "Show password"
171msgid "Show password"
160msgstr "Показати пароль"
172msgstr "Показати пароль"
161
173
162−#: qml/Notifications/NotificationMenuItemFactory.qml:103
174+#: qml/Notifications/NotificationMenuItemFactory.qml:104
163msgid "Please enter SIM PIN"
175msgid "Please enter SIM PIN"
164msgstr "Введіть PIN-код SIM-картки"
176msgstr "Введіть PIN-код SIM-картки"
165
177
166−#: qml/Panel/SearchIndicator.qml:27
178+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
167msgid "Search"
179msgid "Search"
168msgstr "Пошук"
180msgstr "Пошук"
169
181
170−#: qml/Shell.qml:348
182+#: qml/Shell.qml:334
171#, qt-format
183#, qt-format
172msgid "Please enter %1"
184msgid "Please enter %1"
173msgstr "Будь ласка, введіть %1"
185msgstr "Будь ласка, введіть %1"
po/unity8.pot+24−12
@@ -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-04-10 11:13-0400\n"
11+"POT-Creation-Date: 2014-05-27 22:48+0200\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"
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/vi.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/xh.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr ""
106msgstr ""
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr ""
110msgstr ""
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr ""
114msgstr ""
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr ""
122msgstr ""
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr ""
131msgstr ""
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr ""
135msgstr ""
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr ""
147msgstr ""
@@ -150,19 +162,19 @@ msgstr ""
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr ""
163msgstr ""
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr ""
167msgstr ""
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr ""
175msgstr ""
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
po/zh_CN.po+28−16
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11−"PO-Revision-Date: 2014-05-19 02:24+0000\n"
11+"PO-Revision-Date: 2014-06-12 08:55+0000\n"
12−"Last-Translator: Shuduo Sang <Unknown>\n"
12+"Last-Translator: Shengjing Zhu <Unknown>\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-05-19 06:25+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-13 07:00+0000\n"
18−"X-Generator: Launchpad (build 17007)\n"
18+"X-Generator: Launchpad (build 17045)\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
@@ -101,35 +101,47 @@ msgstr "更多..."
101msgid "Less..."
101msgid "Less..."
102msgstr "更少..."
102msgstr "更少..."
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "评分"
106msgstr "评分"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "添加评论"
110msgstr "添加评论"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "发送"
114msgstr "发送"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr "滑动解锁"
118msgstr "滑动解锁"
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "紧急电话"
122msgstr "紧急电话"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr "确定"
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "你好，%1"
131msgstr "你好，%1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "你好"
135msgstr "你好"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr "取消"
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr "完成"
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "确认"
147msgstr "确认"
@@ -150,19 +162,19 @@ msgstr "现在请讲..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "讲话中..."
163msgstr "讲话中..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "显示密码"
167msgstr "显示密码"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr "请输入 SIM PIN"
171msgstr "请输入 SIM PIN"
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "搜索"
175msgstr "搜索"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "请输入 %1"
180msgstr "请输入 %1"
po/zh_HK.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-01-25 13:32+0000\n"
11"PO-Revision-Date: 2014-01-25 13:32+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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "評價"
106msgstr "評價"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "新增評論"
110msgstr "新增評論"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "傳送"
114msgstr "傳送"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "緊急電話"
122msgstr "緊急電話"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "您好 %1"
131msgstr "您好 %1"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "您好"
135msgstr "您好"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "確認"
147msgstr "確認"
@@ -150,19 +162,19 @@ msgstr "馬上講..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "正在講..."
163msgstr "正在講..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "顯示密碼"
167msgstr "顯示密碼"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "搜尋"
175msgstr "搜尋"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr "請輸入 %1"
180msgstr "請輸入 %1"
po/zh_TW.po+26−14
@@ -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-04-10 11:13-0400\n"
10+"POT-Creation-Date: 2014-05-27 22:48+0200\n"
11"PO-Revision-Date: 2014-01-16 06:04+0000\n"
11"PO-Revision-Date: 2014-01-16 06:04+0000\n"
12"Last-Translator: Henry Yang <henry9846@hotmail.com>\n"
12"Last-Translator: Henry Yang <henry9846@hotmail.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-05-01 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-06-07 06:35+0000\n"
18−"X-Generator: Launchpad (build 16985)\n"
18+"X-Generator: Launchpad (build 17031)\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
@@ -101,35 +101,47 @@ msgstr ""
101msgid "Less..."
101msgid "Less..."
102msgstr ""
102msgstr ""
103
103
104−#: qml/Dash/Previews/PreviewRatingInput.qml:81
104+#: qml/Dash/Previews/PreviewRatingInput.qml:82
105msgid "Rate this"
105msgid "Rate this"
106msgstr "對此評比"
106msgstr "對此評比"
107
107
108−#: qml/Dash/Previews/PreviewRatingInput.qml:126
108+#: qml/Dash/Previews/PreviewRatingInput.qml:128
109msgid "Add a review"
109msgid "Add a review"
110msgstr "新增回覆"
110msgstr "新增回覆"
111
111
112−#: qml/Dash/Previews/PreviewRatingInput.qml:166
112+#: qml/Dash/Previews/PreviewRatingInput.qml:168
113msgid "Send"
113msgid "Send"
114msgstr "發送"
114msgstr "發送"
115
115
116−#: qml/Greeter/Greeter.qml:151
116+#: qml/Greeter/Greeter.qml:157
117msgid "Swipe to unlock"
117msgid "Swipe to unlock"
118msgstr ""
118msgstr ""
119
119
120−#: qml/Greeter/Lockscreen.qml:149
120+#: qml/Greeter/Lockscreen.qml:215
121msgid "Emergency Call"
121msgid "Emergency Call"
122msgstr "緊急連絡"
122msgstr "緊急連絡"
123
123
124+#: qml/Greeter/Lockscreen.qml:232
125+msgid "OK"
126+msgstr ""
127+
124−#: qml/Greeter/PassphraseLockscreen.qml:59
128+#: qml/Greeter/PassphraseLockscreen.qml:60
125#, qt-format
129#, qt-format
126msgid "Hello %1"
130msgid "Hello %1"
127msgstr "%1 您好"
131msgstr "%1 您好"
128
132
129−#: qml/Greeter/PassphraseLockscreen.qml:59
133+#: qml/Greeter/PassphraseLockscreen.qml:60
130msgid "Hello"
134msgid "Hello"
131msgstr "您好"
135msgstr "您好"
132
136
137+#: qml/Greeter/PinLockscreen.qml:198
138+msgid "CANCEL"
139+msgstr ""
140+
141+#: qml/Greeter/PinLockscreen.qml:216
142+msgid "DONE"
143+msgstr ""
144+
133#: qml/Hud/HudParametrizedActionsPage.qml:132
145#: qml/Hud/HudParametrizedActionsPage.qml:132
134msgid "Confirm"
146msgid "Confirm"
135msgstr "確認"
147msgstr "確認"
@@ -150,19 +162,19 @@ msgstr "請說..."
150msgid "Speaking..."
162msgid "Speaking..."
151msgstr "說話中..."
163msgstr "說話中..."
152
164
153−#: qml/Notifications/NotificationMenuItemFactory.qml:91
165+#: qml/Notifications/NotificationMenuItemFactory.qml:92
154msgid "Show password"
166msgid "Show password"
155msgstr "顯示密碼"
167msgstr "顯示密碼"
156
168
157−#: qml/Notifications/NotificationMenuItemFactory.qml:103
169+#: qml/Notifications/NotificationMenuItemFactory.qml:104
158msgid "Please enter SIM PIN"
170msgid "Please enter SIM PIN"
159msgstr ""
171msgstr ""
160
172
161−#: qml/Panel/SearchIndicator.qml:27
173+#: qml/Panel/SearchIndicator.qml:27 test.qml:7
162msgid "Search"
174msgid "Search"
163msgstr "搜尋"
175msgstr "搜尋"
164
176
165−#: qml/Shell.qml:348
177+#: qml/Shell.qml:334
166#, qt-format
178#, qt-format
167msgid "Please enter %1"
179msgid "Please enter %1"
168msgstr ""
180msgstr ""
qml/Greeter/Lockscreen.qml → qml/Components/Lockscreen.qmlrenamed+91−8
@@ -15,8 +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.0
19−import "../Components"
19+import Ubuntu.Components.Popups 1.0
20
20
21Showable {
21Showable {
22 id: root
22 id: root
@@ -26,19 +26,34 @@ Showable {
26
26
27 // Placeholder text
27 // Placeholder text
28 property string placeholderText: ""
28 property string placeholderText: ""
29+ // Placeholder text while shaking (e.g. Incorrect passprase)
30+ property string wrongPlaceholderText: ""
31+ // Retries text (e.g. 3 retries left)
32+ property string retryText: ""
33+
34+ // Informational text. (e.g. some text to tell which domain this is pin is entered for.
35+ property string infoText: ""
29
36
30 // In case the Lockscreen can show a greeter message, this is the username
37 // In case the Lockscreen can show a greeter message, this is the username
31 property string username: ""
38 property string username: ""
32
39
33− // Set this to a value greater 0 to enable auto-confirm behavior for the lockscreen.
40+ // Set those to a value greater 0 to restrict the pin length.
41+ // If both are unset, the Lockscreen will show a confirm button and allow typing any length of pin before
42+ // confirming. If minPinLength is set to a value > 0, the confirm button will only become active when the
43+ // entered pin is at least that long. If maxPinLength is set, the lockscreen won't allow entering any
44+ // more numbers than that. If both are set to the same value, the lockscreen will enter auto confirming
45+ // behavior, hiding the confirmation button and triggering that automatically when the entered pin reached
34− // This is ignored by the alphaNumeric lockscreen as that one is confirmed with pressing enter on the OSK.
46+ // that length. This is ignored by the alphaNumeric lockscreen as that one is always confirmed by pressing
47+ // enter on the OSK.
35− property int pinLength: -1
48+ property int minPinLength: -1
49+ property int maxPinLength: -1
36
50
37 property url background: ""
51 property url background: ""
38
52
39 signal entered(string passphrase)
53 signal entered(string passphrase)
40 signal cancel()
54 signal cancel()
41 signal emergencyCall()
55 signal emergencyCall()
56+ signal infoPopupConfirmed()
42
57
43 onRequiredChanged: {
58 onRequiredChanged: {
44 if (required && pinPadLoader.item) {
59 if (required && pinPadLoader.item) {
@@ -56,6 +71,10 @@ Showable {
56 pinPadLoader.item.clear(showAnimation);
71 pinPadLoader.item.clear(showAnimation);
57 }
72 }
58
73
74+ function showInfoPopup(title, text) {
75+ PopupUtils.open(infoPopupComponent, root, {title: title, text: text})
76+ }
77+
59 Rectangle {
78 Rectangle {
60 // In case background fails to load or is undefined
79 // In case background fails to load or is undefined
61 id: backgroundBackup
80 id: backgroundBackup
@@ -68,7 +87,6 @@ Showable {
68 objectName: "lockscreenBackground"
87 objectName: "lockscreenBackground"
69 anchors {
88 anchors {
70 fill: parent
89 fill: parent
71− topMargin: backgroundTopMargin
72 }
90 }
73 source: root.required ? root.background : ""
91 source: root.required ? root.background : ""
74 fillMode: Image.PreserveAspectCrop
92 fillMode: Image.PreserveAspectCrop
@@ -78,6 +96,43 @@ Showable {
78 anchors.fill: root
96 anchors.fill: root
79 }
97 }
80
98
99+ Column {
100+ spacing: units.gu(2)
101+ anchors {
102+ left: parent.left
103+ right: parent.right
104+ bottom: pinPadLoader.top
105+ bottomMargin: units.gu(2)
106+ }
107+ Label {
108+ objectName: "retryCountLabel"
109+ anchors {
110+ left: parent.left
111+ right: parent.right
112+ }
113+ text: root.retryText
114+ horizontalAlignment: Text.AlignHCenter
115+ color: "#f3f3e7"
116+ opacity: 0.6
117+ visible: root.retryText.length > 0
118+ }
119+ Label {
120+ id: infoTextLabel
121+ objectName: "infoTextLabel"
122+ anchors {
123+ left: parent.left
124+ right: parent.right
125+ }
126+ text: root.infoText
127+ horizontalAlignment: Text.AlignHCenter
128+ color: "#f3f3e7"
129+ opacity: 0.6
130+ visible: root.infoText.length > 0
131+ }
132+ }
133+
134+
135+
81 Loader {
136 Loader {
82 id: pinPadLoader
137 id: pinPadLoader
83 objectName: "pinPadLoader"
138 objectName: "pinPadLoader"
@@ -105,14 +160,24 @@ Showable {
105
160
106 Binding {
161 Binding {
107 target: pinPadLoader.item
162 target: pinPadLoader.item
108− property: "pinLength"
163+ property: "minPinLength"
164+ value: root.minPinLength
165+ }
166+ Binding {
167+ target: pinPadLoader.item
168+ property: "maxPinLength"
109− value: root.pinLength
169+ value: root.maxPinLength
110 }
170 }
111 Binding {
171 Binding {
112 target: pinPadLoader.item
172 target: pinPadLoader.item
113 property: "placeholderText"
173 property: "placeholderText"
114 value: root.placeholderText
174 value: root.placeholderText
115 }
175 }
176+ Binding {
177+ target: pinPadLoader.item
178+ property: "wrongPlaceholderText"
179+ value: root.wrongPlaceholderText
180+ }
116 Binding {
181 Binding {
117 target: pinPadLoader.item
182 target: pinPadLoader.item
118 property: "username"
183 property: "username"
@@ -153,4 +218,22 @@ Showable {
153 anchors.horizontalCenter: parent.horizontalCenter
218 anchors.horizontalCenter: parent.horizontalCenter
154 }
219 }
155 }
220 }
221+
222+ Component {
223+ id: infoPopupComponent
224+ Dialog {
225+ id: dialog
226+ objectName: "infoPopup"
227+ modal: true
228+
229+ Button {
230+ objectName: "infoPopupOkButton"
231+ text: i18n.tr("OK")
232+ onClicked: {
233+ PopupUtils.close(dialog)
234+ root.infoPopupConfirmed();
235+ }
236+ }
237+ }
238+ }
156}
239}
qml/Components/PageHeader.qml+1−1
@@ -25,7 +25,7 @@ Item {
25 property bool searchEntryEnabled: false
25 property bool searchEntryEnabled: false
26 property alias searchQuery: searchField.text
26 property alias searchQuery: searchField.text
27 property ListModel searchHistory
27 property ListModel searchHistory
28− property Scope scope
28+ property var scope: null
29 property alias childItem: itemContainer.children
29 property alias childItem: itemContainer.children
30 property alias showBackButton: backButton.visible
30 property alias showBackButton: backButton.visible
31
31
qml/Greeter/PassphraseLockscreen.qml → qml/Components/PassphraseLockscreen.qmlrenamed+6−2
@@ -22,7 +22,8 @@ Item {
22 id: root
22 id: root
23 height: highlightItem.height
23 height: highlightItem.height
24
24
25− property alias placeholderText: pinentryField.placeholderText
25+ property string placeholderText
26+ property string wrongPlaceholderText
26 property string username: ""
27 property string username: ""
27
28
28 signal entered(string passphrase)
29 signal entered(string passphrase)
@@ -73,9 +74,12 @@ Item {
73 echoMode: TextInput.Password
74 echoMode: TextInput.Password
74 opacity: 0.9
75 opacity: 0.9
75 hasClearButton: false
76 hasClearButton: false
77+ placeholderText: wrongPasswordAnimation.running ? root.wrongPlaceholderText : root.placeholderText
76
78
77 onAccepted: {
79 onAccepted: {
80+ if (pinentryField.text) {
78− root.entered(pinentryField.text);
81+ root.entered(pinentryField.text);
82+ }
79 }
83 }
80 }
84 }
81 }
85 }
qml/Greeter/PinLockscreen.qml → qml/Components/PinLockscreen.qmlrenamed+30−12
@@ -25,9 +25,11 @@ 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
28 property int padWidth: units.gu(34)
29 property int padWidth: units.gu(34)
29 property int padHeight: units.gu(28)
30 property int padHeight: units.gu(28)
30− property int pinLength: -1
31+ property int minPinLength: -1
32+ property int maxPinLength: -1
31
33
32 signal entered(string passphrase)
34 signal entered(string passphrase)
33 signal cancel()
35 signal cancel()
@@ -41,6 +43,10 @@ Column {
41 }
43 }
42 }
44 }
43
45
46+ QtObject {
47+ id: priv
48+ property bool autoConfirm: root.minPinLength == root.maxPinLength && root.minPinLength != -1
49+ }
44
50
45 UbuntuShape {
51 UbuntuShape {
46 id: pinentryField
52 id: pinentryField
@@ -52,12 +58,20 @@ Column {
52 radius: "medium"
58 radius: "medium"
53 property string text: ""
59 property string text: ""
54 property string placeholderText: ""
60 property string placeholderText: ""
61+ property string wrongPlaceholderText: ""
62+
63+ function appendChar(character) {
64+ if (root.maxPinLength == -1 || pinentryField.text.length < root.maxPinLength) {
65+ pinentryField.text = pinentryField.text + character;
66+ }
67+ }
68+
55 onTextChanged: {
69 onTextChanged: {
56 pinentryFieldLabel.text = "";
70 pinentryFieldLabel.text = "";
57 for (var i = 0; i < text.length; ++i) {
71 for (var i = 0; i < text.length; ++i) {
58 pinentryFieldLabel.text += "•";
72 pinentryFieldLabel.text += "•";
59 }
73 }
60− if (text.length === root.pinLength) {
74+ if (priv.autoConfirm && text.length === root.maxPinLength) {
61 root.entered(text);
75 root.entered(text);
62 }
76 }
63 }
77 }
@@ -74,9 +88,11 @@ Column {
74 }
88 }
75 Label {
89 Label {
76 id: pinentryFieldPlaceHolder
90 id: pinentryFieldPlaceHolder
91+ objectName: "pinentryFieldPlaceHolder"
77 anchors.centerIn: parent
92 anchors.centerIn: parent
78− color: "grey"
93+ color: "#f3f3e7"
94+ opacity: 0.6
79− text: parent.placeholderText
95+ text: wrongPasswordAnimation.running ? parent.wrongPlaceholderText : parent.placeholderText
80 visible: pinentryFieldLabel.text.length == 0
96 visible: pinentryFieldLabel.text.length == 0
81 }
97 }
82
98
@@ -91,9 +107,11 @@ Column {
91 bottom: parent.bottom
107 bottom: parent.bottom
92 bottomMargin: units.gu(1)
108 bottomMargin: units.gu(1)
93 }
109 }
94− visible: root.pinLength == -1
110+ visible: !priv.autoConfirm
95 width: height
111 width: height
96 name: "erase"
112 name: "erase"
113+ color: "#f3f3e7"
114+ opacity: 0.6
97 MouseArea {
115 MouseArea {
98 anchors.fill: parent
116 anchors.fill: parent
99 onClicked: pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1);
117 onClicked: pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1);
@@ -168,7 +186,7 @@ Column {
168 enabled: entryEnabled
186 enabled: entryEnabled
169
187
170 onClicked: {
188 onClicked: {
171− pinentryField.text = pinentryField.text + text;
189+ pinentryField.appendChar(text);
172 }
190 }
173 }
191 }
174 }
192 }
@@ -177,7 +195,7 @@ Column {
177 objectName: "pinPadButtonBack"
195 objectName: "pinPadButtonBack"
178 width: root.padWidth / 3
196 width: root.padWidth / 3
179 height: root.padHeight / 4
197 height: root.padHeight / 4
180− subText: "CANCEL"
198+ subText: i18n.tr("CANCEL")
181 onClicked: root.cancel();
199 onClicked: root.cancel();
182 }
200 }
183
201
@@ -186,7 +204,7 @@ Column {
186 width: root.padWidth / 3
204 width: root.padWidth / 3
187 height: root.padHeight / 4
205 height: root.padHeight / 4
188 text: "0"
206 text: "0"
189− onClicked: pinentryField.text = pinentryField.text + text
207+ onClicked: pinentryField.appendChar(text);
190 enabled: entryEnabled
208 enabled: entryEnabled
191 }
209 }
192
210
@@ -194,16 +212,16 @@ Column {
194 objectName: "pinPadButtonErase"
212 objectName: "pinPadButtonErase"
195 width: root.padWidth / 3
213 width: root.padWidth / 3
196 height: root.padHeight / 4
214 height: root.padHeight / 4
197− iconName: root.pinLength == -1 ? "" : "erase"
215+ iconName: priv.autoConfirm ? "erase" : ""
198− subText: root.pinLength == -1 ? "DONE" : ""
216+ subText: priv.autoConfirm ? "" : i18n.tr("DONE")
199 onClicked: {
217 onClicked: {
200− if (root.pinLength !== -1) {
218+ if (priv.autoConfirm) {
201 pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1);
219 pinentryField.text = pinentryField.text.substring(0, pinentryField.text.length-1);
202 } else {
220 } else {
203 root.entered(pinentryField.text);
221 root.entered(pinentryField.text);
204 }
222 }
205 }
223 }
206− enabled: entryEnabled
224+ enabled: priv.autoConfirm ? entryEnabled : pinentryField.text.length >= root.minPinLength
207 }
225 }
208 }
226 }
209 }
227 }
qml/Components/PinPadButton.qml+2−1
@@ -19,6 +19,7 @@ import Ubuntu.Components 0.1
19
19
20Item {
20Item {
21 id: root
21 id: root
22+ opacity: enabled ? 1 : 0.6
22
23
23 property alias text: label.text
24 property alias text: label.text
24 property alias subText: subTextLabel.text
25 property alias subText: subTextLabel.text
@@ -62,7 +63,7 @@ Item {
62 Label {
63 Label {
63 id: subTextLabel
64 id: subTextLabel
64 fontSize: "small"
65 fontSize: "small"
65− color: "grey"
66+ color: "#f3f3e7"
66 anchors.horizontalCenter: parent.horizontalCenter
67 anchors.horizontalCenter: parent.horizontalCenter
67 visible: text.length > 0
68 visible: text.length > 0
68 }
69 }
qml/Dash/CardCarousel.qml+3−3
@@ -34,7 +34,7 @@ DashRenderer {
34 Carousel {
34 Carousel {
35 id: carousel
35 id: carousel
36 anchors.fill: parent
36 anchors.fill: parent
37− tileAspectRatio: cardCarousel.components && cardCarousel.components["art"]["aspect-ratio"] || 1.0
37+ tileAspectRatio: cardTool.components && cardTool.components["art"]["aspect-ratio"] || 1.0
38 // FIXME we need to "reverse" the carousel to make the selected item the size
38 // FIXME we need to "reverse" the carousel to make the selected item the size
39 // and push others back.
39 // and push others back.
40 minimumTileWidth: cardTool.cardWidth / selectedItemScaleFactor
40 minimumTileWidth: cardTool.cardWidth / selectedItemScaleFactor
@@ -42,8 +42,8 @@ DashRenderer {
42 cacheBuffer: 1404 // 18px * 13gu * 6
42 cacheBuffer: 1404 // 18px * 13gu * 6
43 model: cardCarousel.model
43 model: cardCarousel.model
44
44
45− onClicked: cardCarousel.clicked(index, itemY)
45+ onClicked: cardCarousel.clicked(index, null)
46− onPressAndHold: cardCarousel.pressAndHold(index, itemY)
46+ onPressAndHold: cardCarousel.pressAndHold(index)
47
47
48 property real fontScale: 1 / selectedItemScaleFactor
48 property real fontScale: 1 / selectedItemScaleFactor
49 property real headerHeight: cardTool.headerHeight / selectedItemScaleFactor
49 property real headerHeight: cardTool.headerHeight / selectedItemScaleFactor
qml/Dash/CardFilterGrid.qml+2−2
@@ -64,8 +64,8 @@ DashRenderer {
64 }
64 }
65 Connections {
65 Connections {
66 target: loader.item
66 target: loader.item
67− onClicked: genericFilterGrid.clicked(index, item.y)
67+ onClicked: genericFilterGrid.clicked(index, result)
68− onPressAndHold: genericFilterGrid.pressAndHold(index, item.y)
68+ onPressAndHold: genericFilterGrid.pressAndHold(index)
69 }
69 }
70 }
70 }
71 }
71 }
qml/Dash/DashContent.qml+1−1
@@ -138,7 +138,7 @@ Item {
138
138
139 readonly property bool moving: item ? item.moving : false
139 readonly property bool moving: item ? item.moving : false
140 readonly property var categoryView: item ? item.categoryView : null
140 readonly property var categoryView: item ? item.categoryView : null
141− readonly property Scope theScope: scope
141+ readonly property var theScope: scope
142
142
143 // these are needed for autopilot tests
143 // these are needed for autopilot tests
144 readonly property string scopeId: scope.id
144 readonly property string scopeId: scope.id
qml/Dash/DashRenderer.qml+3−4
@@ -50,13 +50,12 @@ Item {
50
50
51 /// Emitted when the user clicked on an item
51 /// Emitted when the user clicked on an item
52 /// @param index is the index of the clicked item
52 /// @param index is the index of the clicked item
53− /// @param itemY is y of the clicked delegate
53+ /// @param result result model of the cliked item, used for activation
54− signal clicked(int index, real itemY)
54+ signal clicked(int index, var result)
55
55
56 /// Emitted when the user pressed and held on an item
56 /// Emitted when the user pressed and held on an item
57 /// @param index is the index of the held item
57 /// @param index is the index of the held item
58− /// @param itemY is y of the held delegate
59− signal pressAndHold(int index, real itemY)
58+ signal pressAndHold(int index)
60
59
61 function setFilter(filter, animate) {
60 function setFilter(filter, animate) {
62 }
61 }
qml/Dash/GenericScopeView.qml+4−4
@@ -25,7 +25,7 @@ import "../Components/ListItems" as ListItems
25FocusScope {
25FocusScope {
26 id: scopeView
26 id: scopeView
27
27
28− property Scope scope: null
28+ property var scope: null
29 property SortFilterProxyModel categories: categoryFilter
29 property SortFilterProxyModel categories: categoryFilter
30 property bool isCurrent: false
30 property bool isCurrent: false
31 property alias moving: categoryView.moving
31 property alias moving: categoryView.moving
@@ -128,7 +128,7 @@ FocusScope {
128
128
129 CardTool {
129 CardTool {
130 id: cardTool
130 id: cardTool
131−
131+ objectName: "cardTool"
132 count: results.count
132 count: results.count
133 template: model.renderer
133 template: model.renderer
134 components: model.components
134 components: model.components
@@ -141,6 +141,7 @@ FocusScope {
141 top: parent.top
141 top: parent.top
142 left: parent.left
142 left: parent.left
143 right: parent.right
143 right: parent.right
144+ topMargin: hasSectionHeader ? 0 : units.gu(2)
144 }
145 }
145
146
146 source: {
147 source: {
@@ -187,8 +188,7 @@ FocusScope {
187 // TODO Technically it is possible that calling activate() will make the scope emit
188 // TODO Technically it is possible that calling activate() will make the scope emit
188 // previewRequested so that we show a preview but there's no scope that does that yet
189 // previewRequested so that we show a preview but there's no scope that does that yet
189 // so it's not implemented
190 // so it's not implemented
190− var item = target.model.get(index);
191− scopeView.scope.activate(item.result)
191+ scopeView.scope.activate(result)
192 } else {
192 } else {
193 previewListView.model = target.model;
193 previewListView.model = target.model;
194 previewListView.currentIndex = -1
194 previewListView.currentIndex = -1
qml/Dash/PreviewListView.qml+2−2
@@ -23,7 +23,7 @@ import "Previews" as Previews
23Item {
23Item {
24 id: root
24 id: root
25
25
26− property Scope scope: null
26+ property var scope: null
27 property var pageHeader: null
27 property var pageHeader: null
28
28
29 property alias open: previewListView.open
29 property alias open: previewListView.open
@@ -116,7 +116,7 @@ Item {
116
116
117 previewModel: {
117 previewModel: {
118 var previewStack = root.scope.preview(result);
118 var previewStack = root.scope.preview(result);
119− return previewStack.get(0);
119+ return previewStack.getPreviewModel(0);
120 }
120 }
121 }
121 }
122
122
qml/Dash/Previews/PreviewHeader.qml+3
@@ -56,6 +56,9 @@ PreviewWidget {
56
56
57 Loader {
57 Loader {
58 id: mascotShapeLoader
58 id: mascotShapeLoader
59+ objectName: "mascotShapeLoader"
60+ active: headerRoot.mascot != ""
61+ visible: active
59
62
60 anchors.verticalCenter: parent.verticalCenter
63 anchors.verticalCenter: parent.verticalCenter
61 // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
64 // TODO karni: Icon aspect-ratio is 8:7.5. Revisit these values to avoid fraction of pixels.
qml/Greeter/LoginList.qml+1
@@ -193,6 +193,7 @@ Item {
193 }
193 }
194
194
195 onAccepted: {
195 onAccepted: {
196+ if (text == "") return; // Might be useful anyway, but mainly workaround for LP 1324159
196 if (!enabled)
197 if (!enabled)
197 return;
198 return;
198 root.focus = true; // so that it can handle Escape presses for us
199 root.focus = true; // so that it can handle Escape presses for us
qml/Notifications/NotificationMenuItemFactory.qml−1
@@ -20,7 +20,6 @@
20import QtQuick 2.0
20import QtQuick 2.0
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import "../Components"
22import "../Components"
23−import "../Greeter"
24
23
25Loader {
24Loader {
26 id: menuFactory
25 id: menuFactory
qml/Panel/Panel.qml+1−1
@@ -62,7 +62,7 @@ Item {
62 height: __panelMinusSeparatorLineHeight
62 height: __panelMinusSeparatorLineHeight
63 y: 0
63 y: 0
64
64
65− Behavior on y { StandardAnimation { duration: UbuntuAnimation.FastDuration } }
65+ Behavior on y { StandardAnimation { duration: 500 } }
66 }
66 }
67
67
68 PanelSeparatorLine {
68 PanelSeparatorLine {
qml/ScopeTool.qml+1−1
@@ -74,7 +74,7 @@ Rectangle {
74
74
75 model: filteredScopes
75 model: filteredScopes
76 searchHistory: SearchHistoryModel { }
76 searchHistory: SearchHistoryModel { }
77− property Scope scope: scopes.get(currentIndex)
77+ property var scope: scopes.getScope(currentIndex)
78
78
79 anchors {
79 anchors {
80 top: parent.top
80 top: parent.top
qml/Shell.qml+6−11
@@ -117,15 +117,6 @@ FocusScope {
117 // through the translucent parts of the shell surface.
117 // through the translucent parts of the shell surface.
118 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
118 visible: !fullyCovered && !applicationSurfaceShouldBeSeen
119
119
120− CrossFadeImage {
121− id: backgroundImage
122− objectName: "backgroundImage"
123−
124− anchors.fill: parent
125− source: shell.background
126− fillMode: Image.PreserveAspectCrop
127− }
128−
129 Rectangle {
120 Rectangle {
130 anchors.fill: parent
121 anchors.fill: parent
131 color: "black"
122 color: "black"
@@ -316,7 +307,8 @@ FocusScope {
316 width: parent.width
307 width: parent.width
317 height: parent.height - panel.panelHeight
308 height: parent.height - panel.panelHeight
318 background: shell.background
309 background: shell.background
319− pinLength: 4
310+ minPinLength: 4
311+ maxPinLength: 4
320
312
321 onEntered: LightDM.Greeter.respond(passphrase);
313 onEntered: LightDM.Greeter.respond(passphrase);
322 onCancel: greeter.show()
314 onCancel: greeter.show()
@@ -370,7 +362,10 @@ FocusScope {
370 width: parent.width
362 width: parent.width
371 height: parent.height - panel.panelHeight
363 height: parent.height - panel.panelHeight
372
364
373− Behavior on x {SmoothedAnimation{velocity: 600}}
365+ Behavior on x {
366+ enabled: !launcher.dashSwipe
367+ StandardAnimation {}
368+ }
374
369
375 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
370 readonly property real showProgress: MathUtils.clamp((1 - x/width) + greeter.showProgress - 1, 0, 1)
376
371
tests/mocks/Unity/iconutils.h → qml/Stages/Dot.qmlrenamed+9−13
@@ -1,5 +1,5 @@
1/*
1/*
2− * Copyright (C) 2013 Canonical, Ltd.
2+ * Copyright (C) 2014 Canonical, Ltd.
3 *
3 *
4 * This program is free software; you can redistribute it and/or modify
4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by
5 * it under the terms of the GNU General Public License as published by
@@ -12,18 +12,14 @@
12 *
12 *
13 * You should have received a copy of the GNU General Public License
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Michal Hruby <michal.hruby@canonical.com>
18 */
15 */
19
16
20−#ifndef ICONUTILS_H
17+import QtQuick 2.0
21−#define ICONUTILS_H
18+import Ubuntu.Components 0.1
22−
23−#include <QString>
24−#include <QVariant>
25−
26−QString gIconToDeclarativeImageProviderString(QString const &giconString);
27−QString uriToThumbnailerProviderString(QString const &uri, QString const &mimetype, QVariantHash const &metadata);
28
19
29−#endif
20+Rectangle {
21+ radius: width
22+ width: units.dp(6)
23+ height: width
24+ color: UbuntuColors.orange
25+}
qml/Stages/PhoneStage.qml+5−2
@@ -214,7 +214,7 @@ Item {
214 Rectangle {
214 Rectangle {
215 id: appSplash2
215 id: appSplash2
216 anchors.fill: parent
216 anchors.fill: parent
217− color: "white"
217+ color: "black"
218 visible: priv.secondApplicationStarting
218 visible: priv.secondApplicationStarting
219 }
219 }
220 Image {
220 Image {
@@ -228,8 +228,11 @@ Item {
228 Rectangle {
228 Rectangle {
229 id: appSplash
229 id: appSplash
230 anchors.fill: parent
230 anchors.fill: parent
231− color: "white"
231+ color: "black"
232 visible: priv.applicationStarting
232 visible: priv.applicationStarting
233+
234+ WaitingDots {
235+ }
233 }
236 }
234 Image {
237 Image {
235 id: mainScreenshotImage
238 id: mainScreenshotImage
qml/Stages/StageWithSideStage.qml+8−2
@@ -282,7 +282,10 @@ Item {
282 id: mainStageSplash
282 id: mainStageSplash
283 anchors.fill: root
283 anchors.fill: root
284 anchors.rightMargin: root.width - sideStageImage.x
284 anchors.rightMargin: root.width - sideStageImage.x
285− color: "white"
285+ color: "black"
286+
287+ WaitingDots {
288+ }
286 }
289 }
287
290
288 SidestageHandle {
291 SidestageHandle {
@@ -402,6 +405,9 @@ Item {
402 id: sideStageSplash
405 id: sideStageSplash
403 anchors.fill: parent
406 anchors.fill: parent
404 anchors.leftMargin: sideStageImage.x
407 anchors.leftMargin: sideStageImage.x
405− color: "white"
408+ color: "black"
409+
410+ WaitingDots {
411+ }
406 }
412 }
407}
413}
qml/Stages/WaitingDots.qmlnew file+76
@@ -0,0 +1,76 @@
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 0.1
19+
20+Item {
21+ id: waitingDots
22+
23+ // center in parent; waitingDots has no size therefore anchors.centerIn cannot be used
24+ x: parent.width / 2
25+ y: parent.height / 2
26+
27+ property var dots: [dot1, dot2, dot3]
28+ property var vertices: [[-units.gu(1), -units.gu(1)],
29+ [units.gu(1), -units.gu(1)],
30+ [0, units.gu(1)]]
31+ property int shift: 0
32+
33+ function cycle () {
34+ var n = vertices.length;
35+ shift = (shift + 1) % n;
36+
37+ for (var i = 0; i < n; i++) {
38+ dots[i].x = vertices[(i+shift) % n][0];
39+ dots[i].y = vertices[(i+shift) % n][1];
40+ }
41+ }
42+
43+ Timer {
44+ interval: 800
45+ running: waitingDots.visible
46+ repeat: true
47+ triggeredOnStart: true
48+ onTriggered: waitingDots.cycle()
49+ }
50+
51+
52+ Dot {
53+ id: dot1
54+ x: vertices[0][0]
55+ y: vertices[0][1]
56+ Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
57+ Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
58+ }
59+
60+ Dot {
61+ id: dot2
62+ x: vertices[1][0]
63+ y: vertices[1][1]
64+ Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
65+ Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
66+
67+ }
68+
69+ Dot {
70+ id: dot3
71+ x: vertices[2][0]
72+ y: vertices[2][1]
73+ Behavior on x {XAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
74+ Behavior on y {YAnimator {duration: UbuntuAnimation.BriskDuration; easing: UbuntuAnimation.StandardEasing}}
75+ }
76+}
tests/autopilot/unity8/shell/emulators/main_window.py−4
@@ -114,10 +114,6 @@ class QQuickView(emulators.UnityEmulatorBase):
114 self.wait_select_single('Indicators', fullyOpened=True)
114 self.wait_select_single('Indicators', fullyOpened=True)
115 return self._get_indicator_page(indicator_name)
115 return self._get_indicator_page(indicator_name)
116
116
117− def get_shell_background(self):
118− return self.select_single(
119− "CrossFadeImage", objectName="backgroundImage")
120−
121 @autopilot_logging.log_action(logger.info)
117 @autopilot_logging.log_action(logger.info)
122 def show_dash_swiping(self):
118 def show_dash_swiping(self):
123 """Show the dash swiping from the left."""
119 """Show the dash swiping from the left."""
tests/mocks/Unity/CMakeLists.txt+8−1
@@ -6,6 +6,7 @@ add_subdirectory(Notifications)
6pkg_search_module(DEE dee-1.0 REQUIRED)
6pkg_search_module(DEE dee-1.0 REQUIRED)
7pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
7pkg_search_module(GOBJECT gobject-2.0 REQUIRED)
8pkg_search_module(DEEQT libdee-qt5 REQUIRED)
8pkg_search_module(DEEQT libdee-qt5 REQUIRED)
9+pkg_check_modules(SCOPES_API REQUIRED unity-shell-scopes=1)
9
10
10include_directories(
11include_directories(
11 ${CMAKE_CURRENT_BINARY_DIR}
12 ${CMAKE_CURRENT_BINARY_DIR}
@@ -18,7 +19,6 @@ include_directories(
18add_definitions(-DQT_NO_KEYWORDS)
19add_definitions(-DQT_NO_KEYWORDS)
19
20
20set(UnityQML_SOURCES
21set(UnityQML_SOURCES
21− iconutils.cpp
22 fake_scope.cpp
22 fake_scope.cpp
23 fake_scopes.cpp
23 fake_scopes.cpp
24 fake_categories.cpp
24 fake_categories.cpp
@@ -27,6 +27,13 @@ set(UnityQML_SOURCES
27 fake_previewstack.cpp
27 fake_previewstack.cpp
28 fake_previewwidgetmodel.cpp
28 fake_previewwidgetmodel.cpp
29 fake_unity_plugin.cpp
29 fake_unity_plugin.cpp
30+ ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/CategoriesInterface.h
31+ ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewModelInterface.h
32+ ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewStackInterface.h
33+ ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/PreviewWidgetModelInterface.h
34+ ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ResultsModelInterface.h
35+ ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopeInterface.h
36+ ${SCOPES_API_INCLUDEDIR}/unity/shell/scopes/ScopesInterface.h
30)
37)
31
38
32add_library(FakeUnityQml MODULE ${UnityQML_SOURCES})
39add_library(FakeUnityQml MODULE ${UnityQML_SOURCES})
tests/mocks/Unity/Launcher/MockLauncherModel.cpp+5
@@ -183,6 +183,11 @@ void MockLauncherModel::setUser(const QString &username)
183 // TODO: implement this...
183 // TODO: implement this...
184}
184}
185
185
186+QString MockLauncherModel::getUrlForAppId(const QString &appId) const
187+{
188+ return "application:///" + appId + ".desktop";
189+}
190+
186void MockLauncherModel::setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager)
191void MockLauncherModel::setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager)
187{
192{
188 Q_UNUSED(applicationManager)
193 Q_UNUSED(applicationManager)
tests/mocks/Unity/Launcher/MockLauncherModel.h+1
@@ -44,6 +44,7 @@ public:
44 Q_INVOKABLE void requestRemove(const QString &appId);
44 Q_INVOKABLE void requestRemove(const QString &appId);
45 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
45 Q_INVOKABLE void quickListActionInvoked(const QString &appId, int actionIndex);
46 Q_INVOKABLE void setUser(const QString &username);
46 Q_INVOKABLE void setUser(const QString &username);
47+ Q_INVOKABLE QString getUrlForAppId(const QString &appId) const;
47
48
48 unity::shell::application::ApplicationManagerInterface *applicationManager() const;
49 unity::shell::application::ApplicationManagerInterface *applicationManager() const;
49 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);
50 void setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager);
tests/mocks/Unity/fake_categories.cpp+11−23
@@ -22,24 +22,9 @@
22#include "fake_resultsmodel.h"
22#include "fake_resultsmodel.h"
23
23
24Categories::Categories(int category_count, QObject* parent)
24Categories::Categories(int category_count, QObject* parent)
25− : QAbstractListModel(parent)
25+ : unity::shell::scopes::CategoriesInterface(parent)
26 , m_category_count(category_count)
26 , m_category_count(category_count)
27{
27{
28− m_roles[Categories::RoleCategoryId] = "categoryId";
29− m_roles[Categories::RoleName] = "name";
30− m_roles[Categories::RoleIcon] = "icon";
31− m_roles[Categories::RoleRawRendererTemplate] = "rawRendererTemplate";
32− m_roles[Categories::RoleRenderer] = "renderer";
33− m_roles[Categories::RoleComponents] = "components";
34− m_roles[Categories::RoleProgressSource] = "progressSource";
35− m_roles[Categories::RoleResults] = "results";
36− m_roles[Categories::RoleCount] = "count";
37−}
38−
39−QHash<int, QByteArray>
40−Categories::roleNames() const
41−{
42− return m_roles;
43}
28}
44
29
45int Categories::rowCount(const QModelIndex& /*parent*/) const
30int Categories::rowCount(const QModelIndex& /*parent*/) const
@@ -65,6 +50,11 @@ void Categories::addSpecialCategory(QString const& categoryId, QString const& na
65 }
50 }
66}
51}
67
52
53+bool Categories::overrideCategoryJson(QString const& categoryId, QString const& json)
54+{
55+ qFatal("Using un-implemented Categories::overrideCategoryJson");
56+}
57+
68void Categories::countChanged()
58void Categories::countChanged()
69{
59{
70 QObject* countObject = sender();
60 QObject* countObject = sender();
@@ -126,9 +116,6 @@ Categories::data(const QModelIndex& index, int role) const
126 map["title"] = "HOLA";
116 map["title"] = "HOLA";
127 return map;
117 return map;
128 }
118 }
129− case RoleProgressSource:
130− qFatal("Using un-implemented RoleProgressSource Categories role");
131− return QVariant();
132 case RoleResults:
119 case RoleResults:
133 return QVariant();
120 return QVariant();
134 case RoleCount:
121 case RoleCount:
@@ -165,16 +152,17 @@ Categories::data(const QModelIndex& index, int role) const
165 case RoleComponents:
152 case RoleComponents:
166 {
153 {
167 QVariantMap map, artMap;
154 QVariantMap map, artMap;
155+ if (index.row() % 2 != 0) {
168− artMap["aspect-ratio"] = "1.0";
156+ artMap["aspect-ratio"] = QString("1.%1").arg(index.row());
157+ } else {
158+ artMap["aspect-ratio"] = "1.0";
159+ }
169 artMap["field"] = "art";
160 artMap["field"] = "art";
170 map["art"] = artMap;
161 map["art"] = artMap;
171 map["title"] = "HOLA";
162 map["title"] = "HOLA";
172 map["subtitle"] = "HOLA";
163 map["subtitle"] = "HOLA";
173 return map;
164 return map;
174 }
165 }
175− case RoleProgressSource:
176− qFatal("Using un-implemented RoleProgressSource Categories role");
177− return QVariant();
178 case RoleResults:
166 case RoleResults:
179 return QVariant::fromValue(resultsModel);
167 return QVariant::fromValue(resultsModel);
180 case RoleCount:
168 case RoleCount:
tests/mocks/Unity/fake_categories.h+5−18
@@ -17,44 +17,31 @@
17#ifndef FAKE_CATEGORIES_H
17#ifndef FAKE_CATEGORIES_H
18#define FAKE_CATEGORIES_H
18#define FAKE_CATEGORIES_H
19
19
20+#include <unity/shell/scopes/CategoriesInterface.h>
21+
20// Qt
22// Qt
21−#include <QAbstractListModel>
22#include <QList>
23#include <QList>
23
24
24class ResultsModel;
25class ResultsModel;
25
26
26−class Categories : public QAbstractListModel
27+class Categories : public unity::shell::scopes::CategoriesInterface
27{
28{
28 Q_OBJECT
29 Q_OBJECT
29
30
30− Q_ENUMS(Roles)
31−
32public:
31public:
33 Categories(int category_count, QObject* parent = 0);
32 Categories(int category_count, QObject* parent = 0);
34− enum Roles {
35− RoleCategoryId,
36− RoleName,
37− RoleIcon,
38− RoleRawRendererTemplate,
39− RoleRenderer,
40− RoleComponents,
41− RoleProgressSource, // maybe
42− RoleResults,
43− RoleCount
44− };
45
33
46 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
34 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
47− QHash<int, QByteArray> roleNames() const override;
48 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
35 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
49
36
50− Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject);
37+ Q_INVOKABLE void addSpecialCategory(QString const& categoryId, QString const& name, QString const& icon, QString const& rawTemplate, QObject* countObject) override;
38+ Q_INVOKABLE bool overrideCategoryJson(QString const& categoryId, QString const& json) override;
51
39
52private Q_SLOTS:
40private Q_SLOTS:
53 void countChanged();
41 void countChanged();
54
42
55private:
43private:
56 mutable QHash<int, ResultsModel*> m_resultsModels;
44 mutable QHash<int, ResultsModel*> m_resultsModels;
57− QHash<int, QByteArray> m_roles;
58 int m_category_count;
45 int m_category_count;
59
46
60 struct CategoryData {
47 struct CategoryData {
tests/mocks/Unity/fake_previewmodel.cpp+2−15
@@ -27,22 +27,14 @@
27// Qt
27// Qt
28#include <QDebug>
28#include <QDebug>
29
29
30−PreviewModel::PreviewModel(QObject* parent) : QAbstractListModel(parent)
30+PreviewModel::PreviewModel(QObject* parent)
31+ : unity::shell::scopes::PreviewModelInterface(parent)
31{
32{
32 // we have one column by default
33 // we have one column by default
33 PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);
34 PreviewWidgetModel* columnModel = new PreviewWidgetModel(this);
34 m_previewWidgetModels.append(columnModel);
35 m_previewWidgetModels.append(columnModel);
35}
36}
36
37
37−QHash<int, QByteArray> PreviewModel::roleNames() const
38−{
39− QHash<int, QByteArray> roles;
40−
41− roles[Roles::RoleColumnModel] = "columnModel";
42−
43− return roles;
44−}
45−
46void PreviewModel::setWidgetColumnCount(int count)
38void PreviewModel::setWidgetColumnCount(int count)
47{
39{
48 if (count != 1) {
40 if (count != 1) {
@@ -65,11 +57,6 @@ bool PreviewModel::processingAction() const
65 return false;
57 return false;
66}
58}
67
59
68−void PreviewModel::setProcessingAction(bool /*processing*/)
69−{
70− qFatal("PreviewModel::setProcessingAction not implemented");
71−}
72−
73int PreviewModel::rowCount(const QModelIndex&) const
60int PreviewModel::rowCount(const QModelIndex&) const
74{
61{
75 return m_previewWidgetModels.size();
62 return m_previewWidgetModels.size();
tests/mocks/Unity/fake_previewmodel.h+7−25
@@ -18,47 +18,29 @@
18#ifndef FAKE_PREVIEWMODEL_H
18#ifndef FAKE_PREVIEWMODEL_H
19#define FAKE_PREVIEWMODEL_H
19#define FAKE_PREVIEWMODEL_H
20
20
21−#include <QAbstractListModel>
21+#include <unity/shell/scopes/PreviewModelInterface.h>
22+
22#include <QSharedPointer>
23#include <QSharedPointer>
23#include <QVariantMap>
24#include <QVariantMap>
24
25
25class PreviewWidgetModel;
26class PreviewWidgetModel;
26
27
27−class PreviewModel : public QAbstractListModel
28+class PreviewModel : public unity::shell::scopes::PreviewModelInterface
28{
29{
29 Q_OBJECT
30 Q_OBJECT
30
31
31− Q_ENUMS(Roles)
32−
33− Q_PROPERTY(int widgetColumnCount READ widgetColumnCount WRITE setWidgetColumnCount NOTIFY widgetColumnCountChanged)
34− Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
35− Q_PROPERTY(bool processingAction READ processingAction NOTIFY processingActionChanged)
36−
37public:
32public:
38 explicit PreviewModel(QObject* parent = 0);
33 explicit PreviewModel(QObject* parent = 0);
39
34
40− enum Roles {
41− RoleColumnModel
42− };
43−
44 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
35 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
45− QHash<int, QByteArray> roleNames() const override;
46 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
36 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
47
37
48− void setWidgetColumnCount(int count);
38+ void setWidgetColumnCount(int count) override;
49− int widgetColumnCount() const;
39+ int widgetColumnCount() const override;
50− bool loaded() const;
40+ bool loaded() const override;
51− bool processingAction() const;
41+ bool processingAction() const override;
52− void setProcessingAction(bool processing);
53−
54−Q_SIGNALS:
55− void widgetColumnCountChanged();
56− void loadedChanged();
57− void processingActionChanged();
58− void triggered(QString const&, QString const&, QVariantMap const&);
59
42
60private:
43private:
61− QHash<int, QByteArray> m_roles;
62 QList<PreviewWidgetModel*> m_previewWidgetModels;
44 QList<PreviewWidgetModel*> m_previewWidgetModels;
63};
45};
64
46
tests/mocks/Unity/fake_previewstack.cpp+3−11
@@ -21,7 +21,8 @@
21#include "fake_previewmodel.h"
21#include "fake_previewmodel.h"
22#include "fake_scope.h"
22#include "fake_scope.h"
23
23
24−PreviewStack::PreviewStack(QObject* parent) : QAbstractListModel(parent)
24+PreviewStack::PreviewStack(QObject* parent)
25+ : unity::shell::scopes::PreviewStackInterface(parent)
25{
26{
26 m_previews << new PreviewModel(this);
27 m_previews << new PreviewModel(this);
27}
28}
@@ -30,15 +31,6 @@ PreviewStack::~PreviewStack()
30{
31{
31}
32}
32
33
33−QHash<int, QByteArray> PreviewStack::roleNames() const
34−{
35− QHash<int, QByteArray> roles;
36−
37− roles[Roles::RolePreviewModel] = "previewModel";
38−
39− return roles;
40−}
41−
42void PreviewStack::setWidgetColumnCount(int columnCount)
34void PreviewStack::setWidgetColumnCount(int columnCount)
43{
35{
44 if (columnCount != 1) {
36 if (columnCount != 1) {
@@ -56,7 +48,7 @@ int PreviewStack::rowCount(const QModelIndex&) const
56 return m_previews.size();
48 return m_previews.size();
57}
49}
58
50
59−PreviewModel* PreviewStack::get(int index) const
51+unity::shell::scopes::PreviewModelInterface* PreviewStack::getPreviewModel(int index) const
60{
52{
61 if (index >= m_previews.size()) {
53 if (index >= m_previews.size()) {
62 return nullptr;
54 return nullptr;
tests/mocks/Unity/fake_previewstack.h+6−17
@@ -18,39 +18,28 @@
18#ifndef FAKE_PREVIEWSTACK_H
18#ifndef FAKE_PREVIEWSTACK_H
19#define FAKE_PREVIEWSTACK_H
19#define FAKE_PREVIEWSTACK_H
20
20
21−#include <QAbstractListModel>
21+#include <unity/shell/scopes/PreviewStackInterface.h>
22+
22#include <QSharedPointer>
23#include <QSharedPointer>
23#include <QVariantMap>
24#include <QVariantMap>
24
25
25class PreviewModel;
26class PreviewModel;
26
27
27−class PreviewStack : public QAbstractListModel
28+class PreviewStack : public unity::shell::scopes::PreviewStackInterface
28{
29{
29 Q_OBJECT
30 Q_OBJECT
30
31
31− Q_ENUMS(Roles)
32−
33− Q_PROPERTY(int widgetColumnCount READ widgetColumnCount WRITE setWidgetColumnCount NOTIFY widgetColumnCountChanged)
34−
35public:
32public:
36 explicit PreviewStack(QObject* parent = 0);
33 explicit PreviewStack(QObject* parent = 0);
37 virtual ~PreviewStack();
34 virtual ~PreviewStack();
38
35
39− enum Roles {
40− RolePreviewModel
41− };
42−
43 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
36 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
44− QHash<int, QByteArray> roleNames() const override;
45 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
37 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
46
38
47− Q_INVOKABLE PreviewModel* get(int index) const;
39+ Q_INVOKABLE unity::shell::scopes::PreviewModelInterface* getPreviewModel(int index) const override;
48−
49− void setWidgetColumnCount(int columnCount);
50− int widgetColumnCount() const;
51
40
52−Q_SIGNALS:
41+ void setWidgetColumnCount(int columnCount) override;
53− void widgetColumnCountChanged();
42+ int widgetColumnCount() const override;
54
43
55private:
44private:
56 QList<PreviewModel*> m_previews;
45 QList<PreviewModel*> m_previews;
tests/mocks/Unity/fake_previewwidgetmodel.cpp+2−10
@@ -35,12 +35,9 @@ struct PreviewData
35 }
35 }
36};
36};
37
37
38−PreviewWidgetModel::PreviewWidgetModel(QObject* parent) : QAbstractListModel(parent)
38+PreviewWidgetModel::PreviewWidgetModel(QObject* parent)
39+ : unity::shell::scopes::PreviewWidgetModelInterface(parent)
39{
40{
40− m_roles[Roles::RoleWidgetId] = "widgetId";
41− m_roles[Roles::RoleType] = "type";
42− m_roles[Roles::RoleProperties] = "properties";
43−
44 populateWidgets();
41 populateWidgets();
45}
42}
46
43
@@ -60,11 +57,6 @@ void PreviewWidgetModel::populateWidgets()
60
57
61}
58}
62
59
63−QHash<int, QByteArray> PreviewWidgetModel::roleNames() const
64−{
65− return m_roles;
66−}
67−
68int PreviewWidgetModel::rowCount(const QModelIndex&) const
60int PreviewWidgetModel::rowCount(const QModelIndex&) const
69{
61{
70 return m_previewWidgets.size();
62 return m_previewWidgets.size();
tests/mocks/Unity/fake_previewwidgetmodel.h+3−12
@@ -18,33 +18,24 @@
18#ifndef FAKE_PREVIEWWIDGETMODEL_H
18#ifndef FAKE_PREVIEWWIDGETMODEL_H
19#define FAKE_PREVIEWWIDGETMODEL_H
19#define FAKE_PREVIEWWIDGETMODEL_H
20
20
21−#include <QAbstractListModel>
21+#include <unity/shell/scopes/PreviewWidgetModelInterface.h>
22+
22#include <QSharedPointer>
23#include <QSharedPointer>
23#include <QVariantMap>
24#include <QVariantMap>
24
25
25class PreviewData;
26class PreviewData;
26
27
27−class PreviewWidgetModel : public QAbstractListModel
28+class PreviewWidgetModel : public unity::shell::scopes::PreviewWidgetModelInterface
28{
29{
29 Q_OBJECT
30 Q_OBJECT
30
31
31− Q_ENUMS(Roles)
32−
33public:
32public:
34 explicit PreviewWidgetModel(QObject* parent = 0);
33 explicit PreviewWidgetModel(QObject* parent = 0);
35
34
36− enum Roles {
37− RoleWidgetId,
38− RoleType,
39− RoleProperties
40− };
41−
42 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
35 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
43− QHash<int, QByteArray> roleNames() const override;
44 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
36 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
45
37
46private:
38private:
47− QHash<int, QByteArray> m_roles;
48 QList<QSharedPointer<PreviewData>> m_previewWidgets;
39 QList<QSharedPointer<PreviewData>> m_previewWidgets;
49
40
50 void populateWidgets();
41 void populateWidgets();
tests/mocks/Unity/fake_resultsmodel.cpp+1−44
@@ -23,25 +23,10 @@
23#include <paths.h>
23#include <paths.h>
24
24
25ResultsModel::ResultsModel(int result_count, int categoryId, QObject* parent)
25ResultsModel::ResultsModel(int result_count, int categoryId, QObject* parent)
26− : QAbstractListModel(parent)
26+ : unity::shell::scopes::ResultsModelInterface(parent)
27 , m_result_count(result_count)
27 , m_result_count(result_count)
28 , m_categoryId(categoryId)
28 , m_categoryId(categoryId)
29{
29{
30− m_roles[ResultsModel::RoleUri] = "uri";
31− m_roles[ResultsModel::RoleCategoryId] = "categoryId";
32− m_roles[ResultsModel::RoleDndUri] = "dndUri";
33− m_roles[ResultsModel::RoleResult] = "result";
34− m_roles[ResultsModel::RoleTitle] = "title";
35− m_roles[ResultsModel::RoleArt] = "art";
36− m_roles[ResultsModel::RoleSubtitle] = "subtitle";
37− m_roles[ResultsModel::RoleMascot] = "mascot";
38− m_roles[ResultsModel::RoleEmblem] = "emblem";
39− m_roles[ResultsModel::RoleOldPrice] = "oldPrice";
40− m_roles[ResultsModel::RolePrice] = "price";
41− m_roles[ResultsModel::RoleAltPrice] = "altPrice";
42− m_roles[ResultsModel::RoleRating] = "rating";
43− m_roles[ResultsModel::RoleAltRating] = "altRating";
44− m_roles[ResultsModel::RoleSummary] = "summary";
45}
30}
46
31
47QString ResultsModel::categoryId() const
32QString ResultsModel::categoryId() const
@@ -54,12 +39,6 @@ void ResultsModel::setCategoryId(QString const& /*id*/)
54 qFatal("Calling un-implemented ResultsModel::setCategoryId");
39 qFatal("Calling un-implemented ResultsModel::setCategoryId");
55}
40}
56
41
57−QHash<int, QByteArray>
58−ResultsModel::roleNames() const
59−{
60− return m_roles;
61−}
62−
63int ResultsModel::rowCount(const QModelIndex& parent) const
42int ResultsModel::rowCount(const QModelIndex& parent) const
64{
43{
65 Q_UNUSED(parent);
44 Q_UNUSED(parent);
@@ -72,23 +51,6 @@ int ResultsModel::count() const
72 return rowCount();
51 return rowCount();
73}
52}
74
53
75−QVariant ResultsModel::get(int row) const
76−{
77− if (row >= m_result_count || row < 0) return QVariantMap();
78−
79− QVariantMap result;
80− QModelIndex modelIndex(index(row));
81− QHashIterator<int, QByteArray> it(roleNames());
82− while (it.hasNext()) {
83− it.next();
84− QVariant val(data(modelIndex, it.key()));
85− if (val.isNull()) continue;
86− result[it.value()] = val;
87− }
88−
89− return result;
90−}
91−
92QVariant
54QVariant
93ResultsModel::data(const QModelIndex& index, int role) const
55ResultsModel::data(const QModelIndex& index, int role) const
94{
56{
@@ -106,11 +68,6 @@ ResultsModel::data(const QModelIndex& index, int role) const
106 return QString("Subtitle.%1.%2").arg(m_categoryId).arg(index.row());
68 return QString("Subtitle.%1.%2").arg(m_categoryId).arg(index.row());
107 case RoleMascot:
69 case RoleMascot:
108 case RoleEmblem:
70 case RoleEmblem:
109− case RoleOldPrice:
110− case RolePrice:
111− case RoleAltPrice:
112− case RoleRating:
113− case RoleAltRating:
114 case RoleSummary:
71 case RoleSummary:
115 default:
72 default:
116 return QVariant();
73 return QVariant();
tests/mocks/Unity/fake_resultsmodel.h+5−37
@@ -21,58 +21,26 @@
21#ifndef FAKE_RESULTS_MODEL_H
21#ifndef FAKE_RESULTS_MODEL_H
22#define FAKE_RESULTS_MODEL_H
22#define FAKE_RESULTS_MODEL_H
23
23
24−#include <QAbstractListModel>
24+#include <unity/shell/scopes/ResultsModelInterface.h>
25
25
26−class ResultsModel : public QAbstractListModel
26+class ResultsModel : public unity::shell::scopes::ResultsModelInterface
27{
27{
28 Q_OBJECT
28 Q_OBJECT
29
29
30− Q_ENUMS(Roles)
31−
32− Q_PROPERTY(QString categoryId READ categoryId WRITE setCategoryId NOTIFY categoryIdChanged)
33− Q_PROPERTY(int count READ count NOTIFY countChanged)
34−
35public:
30public:
36 explicit ResultsModel(int result_count, int categoryId, QObject* parent = 0);
31 explicit ResultsModel(int result_count, int categoryId, QObject* parent = 0);
37
32
38− enum Roles {
39− RoleUri,
40− RoleCategoryId,
41− RoleDndUri,
42− RoleResult,
43− // card components
44− RoleTitle,
45− RoleArt,
46− RoleSubtitle,
47− RoleMascot,
48− RoleEmblem,
49− RoleOldPrice,
50− RolePrice,
51− RoleAltPrice,
52− RoleRating,
53− RoleAltRating,
54− RoleSummary
55− };
56−
57 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
33 int rowCount(const QModelIndex& parent = QModelIndex()) const override;
58− QHash<int, QByteArray> roleNames() const override;
59 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
34 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override;
60
35
61− Q_INVOKABLE QVariant get(int row) const;
62−
63 /* getters */
36 /* getters */
64− QString categoryId() const;
37+ QString categoryId() const override;
65− int count() const;
38+ int count() const override;
66
39
67 /* setters */
40 /* setters */
68− void setCategoryId(QString const& id);
41+ void setCategoryId(QString const& id) override;
69−
70−Q_SIGNALS:
71− void categoryIdChanged();
72− void countChanged();
73
42
74private:
43private:
75− QHash<int, QByteArray> m_roles;
76 int m_result_count;
44 int m_result_count;
77 int m_categoryId;
45 int m_categoryId;
78};
46};
tests/mocks/Unity/fake_scope.cpp+3−14
@@ -22,7 +22,7 @@ Scope::Scope(QObject* parent) : Scope(QString(), QString(), false, parent)
22}
22}
23
23
24Scope::Scope(QString const& id, QString const& name, bool visible, QObject* parent)
24Scope::Scope(QString const& id, QString const& name, bool visible, QObject* parent)
25− : QObject(parent)
25+ : unity::shell::scopes::ScopeInterface(parent)
26 , m_id(id)
26 , m_id(id)
27 , m_name(name)
27 , m_name(name)
28 , m_visible(visible)
28 , m_visible(visible)
@@ -61,15 +61,11 @@ QString Scope::shortcut() const {
61 return QString("");
61 return QString("");
62}
62}
63
63
64−bool Scope::connected() const {
65− return true;
66−}
67−
68bool Scope::searchInProgress() const {
64bool Scope::searchInProgress() const {
69 return m_searching;
65 return m_searching;
70}
66}
71
67
72−Categories* Scope::categories() const {
68+unity::shell::scopes::CategoriesInterface* Scope::categories() const {
73 return m_categories;
69 return m_categories;
74}
70}
75
71
@@ -89,13 +85,6 @@ bool Scope::isActive() const {
89 return m_isActive;
85 return m_isActive;
90}
86}
91
87
92−void Scope::setName(const QString &str) {
93− if (str != m_name) {
94− m_name = str;
95− Q_EMIT nameChanged(m_name);
96− }
97−}
98−
99void Scope::setSearchQuery(const QString &str) {
88void Scope::setSearchQuery(const QString &str) {
100 if (str != m_searchQuery) {
89 if (str != m_searchQuery) {
101 m_searchQuery = str;
90 m_searchQuery = str;
@@ -149,7 +138,7 @@ void Scope::cancelActivation()
149{
138{
150}
139}
151
140
152−void Scope::closeScope(Scope* /*scope*/)
141+void Scope::closeScope(unity::shell::scopes::ScopeInterface* /*scope*/)
153{
142{
154 qFatal("Scope::closeScope is not implemented");
143 qFatal("Scope::closeScope is not implemented");
155}
144}
tests/mocks/Unity/fake_scope.h+26−72
@@ -17,93 +17,47 @@
17#ifndef FAKE_SCOPE_H
17#ifndef FAKE_SCOPE_H
18#define FAKE_SCOPE_H
18#define FAKE_SCOPE_H
19
19
20+#include <unity/shell/scopes/ScopeInterface.h>
21+
20#include "fake_categories.h"
22#include "fake_categories.h"
21#include "fake_previewstack.h"
23#include "fake_previewstack.h"
22
24
23−#include <QObject>
24#include <QTimer>
25#include <QTimer>
25
26
26−class Preview;
27+class Scope : public unity::shell::scopes::ScopeInterface
27−
28−class Scope : public QObject
29{
28{
30 Q_OBJECT
29 Q_OBJECT
31
30
32− Q_PROPERTY(QString id READ id NOTIFY idChanged)
33− Q_PROPERTY(QString name READ name NOTIFY nameChanged)
34− Q_PROPERTY(QString iconHint READ iconHint NOTIFY iconHintChanged)
35− Q_PROPERTY(QString description READ description NOTIFY descriptionChanged)
36− Q_PROPERTY(QString searchHint READ searchHint NOTIFY searchHintChanged)
37− Q_PROPERTY(bool searchInProgress READ searchInProgress WRITE setSearchInProgress NOTIFY searchInProgressChanged)
38− Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged)
39− Q_PROPERTY(QString shortcut READ shortcut NOTIFY shortcutChanged)
40− Q_PROPERTY(Categories* categories READ categories NOTIFY categoriesChanged)
41− //Q_PROPERTY(Filters* filters READ filters NOTIFY filtersChanged)
42−
43− Q_PROPERTY(QString searchQuery READ searchQuery WRITE setSearchQuery NOTIFY searchQueryChanged)
44− Q_PROPERTY(QString noResultsHint READ noResultsHint WRITE setNoResultsHint NOTIFY noResultsHintChanged)
45− Q_PROPERTY(QString formFactor READ formFactor WRITE setFormFactor NOTIFY formFactorChanged)
46− Q_PROPERTY(bool isActive READ isActive WRITE setActive NOTIFY isActiveChanged)
47−
48public:
31public:
49 Scope(QObject* parent = 0);
32 Scope(QObject* parent = 0);
50 Scope(QString const& id, QString const& name, bool visible, QObject* parent = 0);
33 Scope(QString const& id, QString const& name, bool visible, QObject* parent = 0);
51
34
52 /* getters */
35 /* getters */
53− QString id() const;
36+ QString id() const override;
54− QString name() const;
37+ QString name() const override;
55− QString iconHint() const;
38+ QString iconHint() const override;
56− QString description() const;
39+ QString description() const override;
57− QString searchHint() const;
40+ QString searchHint() const override;
58− bool visible() const;
41+ bool visible() const override;
59− QString shortcut() const;
42+ QString shortcut() const override;
60− bool connected() const;
61− bool searchInProgress() const;
43+ bool searchInProgress() const override;
62− Categories* categories() const;
44+ unity::shell::scopes::CategoriesInterface* categories() const override;
63− QString searchQuery() const;
45+ QString searchQuery() const override;
64− QString noResultsHint() const;
46+ QString noResultsHint() const override;
65− QString formFactor() const;
47+ QString formFactor() const override;
66− bool isActive() const;
48+ bool isActive() const override;
67
49
68 /* setters */
50 /* setters */
69− void setName(const QString& name);
70− void setSearchQuery(const QString& search_query);
51+ void setSearchQuery(const QString& search_query) override;
71− void setNoResultsHint(const QString& hint);
52+ void setNoResultsHint(const QString& hint) override;
72− void setFormFactor(const QString& form_factor);
53+ void setFormFactor(const QString& form_factor) override;
73− void setActive(const bool);
54+ void setActive(const bool) override;
74− void setSearchInProgress(const bool inProg);
55+ Q_INVOKABLE void setSearchInProgress(const bool inProg); // This is not invokable in the Interface, here for testing benefits
75−
56+
76− Q_INVOKABLE void activate(QVariant const& result);
57+ Q_INVOKABLE void activate(QVariant const& result) override;
77− Q_INVOKABLE PreviewStack* preview(QVariant const& result);
58+ Q_INVOKABLE PreviewStack* preview(QVariant const& result) override;
78− Q_INVOKABLE void cancelActivation();
59+ Q_INVOKABLE void cancelActivation() override;
79− Q_INVOKABLE void closeScope(Scope* scope);
60+ Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
80−
81−Q_SIGNALS:
82− void idChanged();
83− void nameChanged(const QString&);
84− void iconHintChanged(const QString&);
85− void descriptionChanged(const QString&);
86− void searchHintChanged(const QString&);
87− void searchInProgressChanged();
88− void visibleChanged(bool);
89− void shortcutChanged(const QString&);
90− void categoriesChanged();
91− //void filtersChanged();
92− void searchQueryChanged();
93− void noResultsHintChanged();
94− void formFactorChanged();
95− void isActiveChanged(bool);
96−
97− // signals triggered by activate(..) or preview(..) requests.
98− void showDash();
99− void hideDash();
100− void gotoUri(const QString &uri);
101− void activated();
102− void previewRequested(QVariant const& result);
103− void gotoScope(QString const& scopeId);
104− void openScope(Scope* scope);
105−
106− void activateApplication(const QString &desktop);
107
61
108protected:
62protected:
109
63
tests/mocks/Unity/fake_scopes.cpp+11−26
@@ -25,19 +25,10 @@
25#include <QTimer>
25#include <QTimer>
26
26
27Scopes::Scopes(QObject *parent)
27Scopes::Scopes(QObject *parent)
28−: QAbstractListModel(parent)
28+ : unity::shell::scopes::ScopesInterface(parent)
29−, m_loaded(false)
29+ , m_loaded(false)
30−, timer(this)
30+ , timer(this)
31{
31{
32− m_roles[Scopes::RoleScope] = "scope";
33− m_roles[Scopes::RoleId] = "id";
34− m_roles[Scopes::RoleVisible] = "visible";
35− m_roles[Scopes::RoleTitle] = "title";
36−
37− QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
38− QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));
39− QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));
40−
41 timer.setSingleShot(true);
32 timer.setSingleShot(true);
42 timer.setInterval(100);
33 timer.setInterval(100);
43 QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(updateScopes()));
34 QObject::connect(&timer, SIGNAL(timeout()), this, SLOT(updateScopes()));
@@ -83,11 +74,6 @@ void Scopes::load()
83 timer.start();
74 timer.start();
84}
75}
85
76
86−QHash<int, QByteArray> Scopes::roleNames() const
87−{
88− return m_roles;
89−}
90−
91int Scopes::rowCount(const QModelIndex&) const
77int Scopes::rowCount(const QModelIndex&) const
92{
78{
93 return m_scopes.count();
79 return m_scopes.count();
@@ -114,14 +100,18 @@ QVariant Scopes::data(const QModelIndex& index, int role) const
114 }
100 }
115}
101}
116
102
117−QVariant Scopes::get(int row) const
103+unity::shell::scopes::ScopeInterface* Scopes::getScope(int row) const
118{
104{
119− return data(QAbstractListModel::index(row), 0);
105+ if (row < 0 || row >= m_scopes.size()) {
106+ return nullptr;
107+ }
108+
109+ return m_scopes[row];
120}
110}
121
111
122−QVariant Scopes::get(QString const&) const
112+unity::shell::scopes::ScopeInterface* Scopes::getScope(QString const&) const
123{
113{
124− return QVariant();
114+ return nullptr;
125}
115}
126
116
127QModelIndex Scopes::parent(const QModelIndex&) const
117QModelIndex Scopes::parent(const QModelIndex&) const
@@ -134,11 +124,6 @@ bool Scopes::loaded() const
134 return m_loaded;
124 return m_loaded;
135}
125}
136
126
137−int Scopes::count() const
138−{
139− return rowCount();
140−}
141−
142void Scopes::addScope(Scope* scope)
127void Scopes::addScope(Scope* scope)
143{
128{
144 int index = rowCount();
129 int index = rowCount();
tests/mocks/Unity/fake_scopes.h+7−24
@@ -19,36 +19,27 @@
19#ifndef FAKE_SCOPES_H
19#ifndef FAKE_SCOPES_H
20#define FAKE_SCOPES_H
20#define FAKE_SCOPES_H
21
21
22+#include <unity/shell/scopes/ScopesInterface.h>
23+
22// Local
24// Local
23#include "fake_scope.h"
25#include "fake_scope.h"
24
26
25// Qt
27// Qt
26−#include <QAbstractListModel>
27#include <QList>
28#include <QList>
28#include <QTimer>
29#include <QTimer>
29
30
30−class Scopes : public QAbstractListModel
31+class Scopes : public unity::shell::scopes::ScopesInterface
31{
32{
32 Q_OBJECT
33 Q_OBJECT
33− Q_ENUMS(Roles)
34− Q_PROPERTY(bool loaded READ loaded NOTIFY loadedChanged)
35− Q_PROPERTY(int count READ count NOTIFY countChanged)
36
34
37public:
35public:
38 explicit Scopes(QObject *parent = 0);
36 explicit Scopes(QObject *parent = 0);
39 ~Scopes();
37 ~Scopes();
40
38
41− enum Roles {
42− RoleScope,
43− RoleId,
44− RoleVisible,
45− RoleTitle
46− };
47−
48− Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const;
39+ Q_INVOKABLE int rowCount(const QModelIndex& parent = QModelIndex()) const override;
49
40
50− Q_INVOKABLE QVariant get(int row) const;
41+ Q_INVOKABLE unity::shell::scopes::ScopeInterface* getScope(int row) const override;
51− Q_INVOKABLE QVariant get(const QString& scope_id) const;
42+ Q_INVOKABLE unity::shell::scopes::ScopeInterface* getScope(const QString& scope_id) const override;
52
43
53 Q_INVOKABLE void addScope(Scope* scope);
44 Q_INVOKABLE void addScope(Scope* scope);
54
45
@@ -56,23 +47,15 @@ public:
56 Q_INVOKABLE void load();
47 Q_INVOKABLE void load();
57
48
58 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
49 QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const;
59− QHash<int, QByteArray> roleNames() const;
60 QModelIndex parent ( const QModelIndex & index ) const;
50 QModelIndex parent ( const QModelIndex & index ) const;
61
51
62− bool loaded() const;
52+ bool loaded() const override;
63− int count() const;
64−
65−Q_SIGNALS:
66− void activateScopeRequested(const QString& scope_id);
67− void loadedChanged(bool);
68− void countChanged();
69
53
70private Q_SLOTS:
54private Q_SLOTS:
71 void updateScopes();
55 void updateScopes();
72
56
73private:
57private:
74 QList<Scope*> m_scopes;
58 QList<Scope*> m_scopes;
75− QHash<int, QByteArray> m_roles;
76 bool m_loaded;
59 bool m_loaded;
77 QTimer timer;
60 QTimer timer;
78};
61};
tests/mocks/Unity/fake_unity_plugin.cpp+3−2
@@ -40,8 +40,9 @@ void FakeUnityPlugin::registerTypes(const char *uri)
40 Q_ASSERT(uri == QLatin1String("Unity"));
40 Q_ASSERT(uri == QLatin1String("Unity"));
41
41
42 qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");
42 qmlRegisterType<Scopes>(uri, 0, 2, "Scopes");
43− qmlRegisterType<Scope>(uri, 0, 2, "Scope");
43+ qmlRegisterType<Scope>(uri, 0, 2, "MockScope");
44+ qmlRegisterUncreatableType<unity::shell::scopes::ScopeInterface>(uri, 0, 2, "Scope", "Can't create Scope object in QML.");
44− qmlRegisterUncreatableType<Categories>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");
45+ qmlRegisterUncreatableType<unity::shell::scopes::CategoriesInterface>(uri, 0, 2, "Categories", "Can't create Categories object in QML.");
45 qmlRegisterUncreatableType<ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create ResultsModel object in QML.");
46 qmlRegisterUncreatableType<ResultsModel>(uri, 0, 2, "ResultsModel", "Can't create ResultsModel object in QML.");
46 qmlRegisterType<PreviewModel>(uri, 0, 2, "FakePreviewModel");
47 qmlRegisterType<PreviewModel>(uri, 0, 2, "FakePreviewModel");
47 qmlRegisterUncreatableType<PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");
48 qmlRegisterUncreatableType<PreviewWidgetModel>(uri, 0, 2, "PreviewWidgetModel", "Can't create new PreviewWidgetModel in QML. Get them from PreviewModel instance.");
tests/mocks/Unity/iconutils.cppdeleted−124
@@ -1,124 +0,0 @@
1−/*
2− * Copyright (C) 2013 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− *
16− * Authors:
17− * Michal Hruby <michal.hruby@canonical.com>
18− */
19−
20−#include "iconutils.h"
21−
22−#include <gio/gio.h>
23−
24−#include <QStringList>
25−#include <QUrl>
26−#include <QUrlQuery>
27−
28−#define BASE_THEME_ICON_URI "image://theme/"
29−#define BASE_THUMBNAILER_URI "image://thumbnailer/"
30−#define BASE_ALBUMART_URI "image://albumart/"
31−
32−QString gIconToDeclarativeImageProviderString(QString const &giconString)
33−{
34− if (giconString.isEmpty()) return giconString;
35−
36− if (giconString.startsWith('/') || giconString.startsWith(QLatin1String("http")) ||
37− giconString.startsWith(QLatin1String("file:")) || giconString.startsWith(QLatin1String("image:"))) {
38− return giconString;
39− }
40−
41− if (!giconString.startsWith(QLatin1String(". "))) {
42− // must be a themed icon
43− QString themedIcon(BASE_THEME_ICON_URI);
44− themedIcon.append(giconString);
45− return themedIcon;
46− }
47−
48− // special case annotated icon
49− if (giconString.startsWith(QLatin1String(". UnityProtocolAnnotatedIcon "))) {
50− QString annotatedIcon;
51− QString serializedData(QUrl::fromPercentEncoding(giconString.mid(29).toUtf8()));
52− GVariant *variant = g_variant_parse(G_VARIANT_TYPE_VARDICT, serializedData.toUtf8().constData(), NULL, NULL, NULL);
53− gchar *baseUri;
54− if (variant != NULL && g_variant_lookup(variant, "base-icon", "&s", &baseUri)) {
55− annotatedIcon = gIconToDeclarativeImageProviderString(QString(baseUri));
56− // FIXME: enclose in image://annotated/... once unity supports that
57− }
58− if (variant != NULL) g_variant_unref(variant);
59−
60− return annotatedIcon;
61− }
62−
63− // handle real gicon strings
64− QString result;
65− GError *error = NULL;
66− GIcon *icon = g_icon_new_for_string(giconString.toLocal8Bit().constData(), &error);
67− if (error != NULL || icon == NULL) {
68− qWarning("Unable to deserialize icon: %s", giconString.toLocal8Bit().constData());
69− g_clear_error(&error);
70− return result;
71− }
72−
73− if (G_IS_THEMED_ICON(icon)) {
74− QString themedIcon(BASE_THEME_ICON_URI);
75− QStringList list;
76− const char* const *iconNames = g_themed_icon_get_names(G_THEMED_ICON(icon));
77− if (iconNames != NULL) {
78− for (const char * const *iter = iconNames; *iter != NULL; ++iter) {
79− list << QLatin1String(*iter);
80− }
81− }
82− themedIcon.append(list.join(QString(",")));
83− result = themedIcon;
84− } else if (G_IS_FILE_ICON(icon)) {
85− GFile *file = g_file_icon_get_file(G_FILE_ICON(icon));
86− gchar *uri = g_file_get_uri(file);
87− QString iconUri(uri);
88− g_free(uri);
89− result = iconUri;
90− }
91−
92− g_object_unref(icon);
93−
94− return result;
95−}
96−
97−QString uriToThumbnailerProviderString(QString const &uri, QString const &mimetype, QVariantHash const &metadata)
98−{
99− if (uri.startsWith(QLatin1String("file:///"))) {
100− bool isAudio = mimetype.startsWith(QLatin1String("audio/"));
101− QString thumbnailerUri;
102− if (isAudio) {
103− thumbnailerUri = BASE_ALBUMART_URI;
104− if (metadata.contains("content")) {
105− QVariantHash contentHash = metadata["content"].toHash();
106− if (contentHash.contains("content")) { // nested content in Home?
107− contentHash = contentHash["content"].toHash();
108− }
109− if (contentHash.contains("album") && contentHash.contains("artist")) {
110− QUrlQuery query;
111− query.addQueryItem(QStringLiteral("artist"), contentHash["artist"].toString());
112− query.addQueryItem(QStringLiteral("album"), contentHash["album"].toString());
113− thumbnailerUri.append(query.toString());
114− }
115− }
116− } else {
117− thumbnailerUri = BASE_THUMBNAILER_URI;
118− thumbnailerUri.append(uri.midRef(7));
119− }
120− return thumbnailerUri;
121− }
122−
123− return QString::null;
124−}
tests/plugins/Dash/cardcreator/1.res+3−3
@@ -3,7 +3,7 @@ AbstractButton {
3 property var template;
3 property var template;
4 property var components;
4 property var components;
5 property var cardData;
5 property var cardData;
6− property var artShapeBorderSource;
6+ property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property int headerAlignment: Text.AlignLeft;
8 property int headerAlignment: Text.AlignLeft;
9 property int fixedHeaderHeight: -1;
9 property int fixedHeaderHeight: -1;
@@ -12,6 +12,7 @@ AbstractButton {
12 property bool asynchronous: true;
12 property bool asynchronous: true;
13 property bool showHeader: true;
13 property bool showHeader: true;
14 implicitWidth: childrenRect.width;
14 implicitWidth: childrenRect.width;
15+onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; }
15readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
16readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
16Item {
17Item {
17 id: artShapeHolder;
18 id: artShapeHolder;
@@ -30,10 +31,9 @@ Item {
30 radius: "medium";
31 radius: "medium";
31 readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1;
32 readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1;
32 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
33 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
33− Component.onCompleted: updateWidthHeightBindings();
34+ Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
34 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
35 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
35 visible: image.status == Image.Ready;
36 visible: image.status == Image.Ready;
36− borderSource: artShapeBorderSource;
37 function updateWidthHeightBindings() {
37 function updateWidthHeightBindings() {
38 if (aspectSmallerThanImageAspect) {
38 if (aspectSmallerThanImageAspect) {
39 width = Qt.binding(function() { return !visible ? 0 : image.width });
39 width = Qt.binding(function() { return !visible ? 0 : image.width });
tests/plugins/Dash/cardcreator/2.res+1−1
@@ -3,7 +3,7 @@ AbstractButton {
3 property var template;
3 property var template;
4 property var components;
4 property var components;
5 property var cardData;
5 property var cardData;
6− property var artShapeBorderSource;
6+ property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property int headerAlignment: Text.AlignLeft;
8 property int headerAlignment: Text.AlignLeft;
9 property int fixedHeaderHeight: -1;
9 property int fixedHeaderHeight: -1;
tests/plugins/Dash/cardcreator/3.res+3−3
@@ -3,7 +3,7 @@ AbstractButton {
3 property var template;
3 property var template;
4 property var components;
4 property var components;
5 property var cardData;
5 property var cardData;
6− property var artShapeBorderSource;
6+ property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property int headerAlignment: Text.AlignLeft;
8 property int headerAlignment: Text.AlignLeft;
9 property int fixedHeaderHeight: -1;
9 property int fixedHeaderHeight: -1;
@@ -12,6 +12,7 @@ AbstractButton {
12 property bool asynchronous: true;
12 property bool asynchronous: true;
13 property bool showHeader: true;
13 property bool showHeader: true;
14 implicitWidth: childrenRect.width;
14 implicitWidth: childrenRect.width;
15+onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; }
15readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
16readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
16Item {
17Item {
17 id: artShapeHolder;
18 id: artShapeHolder;
@@ -30,10 +31,9 @@ Item {
30 radius: "medium";
31 radius: "medium";
31 readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1;
32 readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1;
32 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
33 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
33− Component.onCompleted: updateWidthHeightBindings();
34+ Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
34 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
35 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
35 visible: image.status == Image.Ready;
36 visible: image.status == Image.Ready;
36− borderSource: artShapeBorderSource;
37 function updateWidthHeightBindings() {
37 function updateWidthHeightBindings() {
38 if (aspectSmallerThanImageAspect) {
38 if (aspectSmallerThanImageAspect) {
39 width = Qt.binding(function() { return !visible ? 0 : image.width });
39 width = Qt.binding(function() { return !visible ? 0 : image.width });
tests/plugins/Dash/cardcreator/4.res+1−1
@@ -3,7 +3,7 @@ AbstractButton {
3 property var template;
3 property var template;
4 property var components;
4 property var components;
5 property var cardData;
5 property var cardData;
6− property var artShapeBorderSource;
6+ property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property int headerAlignment: Text.AlignLeft;
8 property int headerAlignment: Text.AlignLeft;
9 property int fixedHeaderHeight: -1;
9 property int fixedHeaderHeight: -1;
tests/plugins/Dash/cardcreator/5.res+3−3
@@ -3,7 +3,7 @@ AbstractButton {
3 property var template;
3 property var template;
4 property var components;
4 property var components;
5 property var cardData;
5 property var cardData;
6− property var artShapeBorderSource;
6+ property var artShapeBorderSource: undefined;
7 property real fontScale: 1.0;
7 property real fontScale: 1.0;
8 property int headerAlignment: Text.AlignLeft;
8 property int headerAlignment: Text.AlignLeft;
9 property int fixedHeaderHeight: -1;
9 property int fixedHeaderHeight: -1;
@@ -12,6 +12,7 @@ AbstractButton {
12 property bool asynchronous: true;
12 property bool asynchronous: true;
13 property bool showHeader: true;
13 property bool showHeader: true;
14 implicitWidth: childrenRect.width;
14 implicitWidth: childrenRect.width;
15+onArtShapeBorderSourceChanged: { if (artShapeBorderSource !== undefined && artShapeLoader.item) artShapeLoader.item.borderSource = artShapeBorderSource; }
15readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
16readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
16Item {
17Item {
17 id: artShapeHolder;
18 id: artShapeHolder;
@@ -30,10 +31,9 @@ Item {
30 radius: "medium";
31 radius: "medium";
31 readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1;
32 readonly property real aspect: components !== undefined ? components["art"]["aspect-ratio"] : 1;
32 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
33 readonly property bool aspectSmallerThanImageAspect: aspect < image.aspect;
33− Component.onCompleted: updateWidthHeightBindings();
34+ Component.onCompleted: { updateWidthHeightBindings(); if (artShapeBorderSource !== undefined) borderSource = artShapeBorderSource; }
34 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
35 onAspectSmallerThanImageAspectChanged: updateWidthHeightBindings();
35 visible: image.status == Image.Ready;
36 visible: image.status == Image.Ready;
36− borderSource: artShapeBorderSource;
37 function updateWidthHeightBindings() {
37 function updateWidthHeightBindings() {
38 if (aspectSmallerThanImageAspect) {
38 if (aspectSmallerThanImageAspect) {
39 width = Qt.binding(function() { return !visible ? 0 : image.width });
39 width = Qt.binding(function() { return !visible ? 0 : image.width });
tests/plugins/Dash/horizontaljournaltry.qml+23−2
@@ -29,14 +29,35 @@ Item {
29 width: parent.width - controls.width
29 width: parent.width - controls.width
30
30
31 delegate: HorizontalJournal {
31 delegate: HorizontalJournal {
32+ id: hj
32 model: vjModel
33 model: vjModel
33 rowHeight: 100
34 rowHeight: 100
34 columnSpacing: 10
35 columnSpacing: 10
35 rowSpacing: 10
36 rowSpacing: 10
36 width: parent.width
37 width: parent.width
37 height: implicitHeight > 100 ? implicitHeight : 100
38 height: implicitHeight > 100 ? implicitHeight : 100
38− delegateCreationBegin: lvwph.contentY
39+ displayMarginBeginning: {
39− delegateCreationEnd: lvwph.contentY + lvwph.height
40+ if (hj.y + hj.height <= 0) {
41+ // Not visible (item at top of the list viewport)
42+ return -hj.height;
43+ } else if (hj.y >= lvwph.height) {
44+ // Not visible (item at bottom of the list viewport)
45+ return 0;
46+ } else {
47+ return -Math.max(-hj.y, 0);
48+ }
49+ }
50+ displayMarginEnd: {
51+ if (hj.y + hj.height <= 0) {
52+ // Not visible (item at top of the list viewport)
53+ return 0;
54+ } else if (hj.y >= lvwph.height) {
55+ // Not visible (item at bottom of the list viewport)
56+ return -hj.height;
57+ } else {
58+ return -Math.max(hj.height - lvwph.height + hj.y, 0)
59+ }
60+ }
40
61
41 delegate: Rectangle {
62 delegate: Rectangle {
42 height: 100
63 height: 100
tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp+3−3
@@ -82,10 +82,10 @@ private:
82 QTRY_COMPARE(lvwph->m_visibleItems[visibleIndex]->y(), pos);
82 QTRY_COMPARE(lvwph->m_visibleItems[visibleIndex]->y(), pos);
83 QTRY_COMPARE(lvwph->m_visibleItems[visibleIndex]->height(), height);
83 QTRY_COMPARE(lvwph->m_visibleItems[visibleIndex]->height(), height);
84 QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->m_item)->culled, culled);
84 QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->m_item)->culled, culled);
85− QCOMPARE(section(lvwph->m_visibleItems[visibleIndex]->m_sectionItem), sectionHeader);
85+ QCOMPARE(section(lvwph->m_visibleItems[visibleIndex]->sectionItem()), sectionHeader);
86 if (!sectionHeader.isNull()) {
86 if (!sectionHeader.isNull()) {
87− QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->m_sectionItem)->culled, sectionHeaderCulled);
87+ QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->sectionItem())->culled, sectionHeaderCulled);
88− QCOMPARE(sectionDelegateIndex(lvwph->m_visibleItems[visibleIndex]->m_sectionItem), lvwph->m_firstVisibleIndex + visibleIndex);
88+ QCOMPARE(sectionDelegateIndex(lvwph->m_visibleItems[visibleIndex]->sectionItem()), lvwph->m_firstVisibleIndex + visibleIndex);
89 }
89 }
90 }
90 }
91
91
tests/plugins/Dash/listviewwithpageheadersectiontest.cpp+11−5
@@ -39,10 +39,11 @@ private:
39 QTRY_COMPARE(lvwph->m_visibleItems[visibleIndex]->y(), pos);
39 QTRY_COMPARE(lvwph->m_visibleItems[visibleIndex]->y(), pos);
40 QTRY_COMPARE(lvwph->m_visibleItems[visibleIndex]->height(), height);
40 QTRY_COMPARE(lvwph->m_visibleItems[visibleIndex]->height(), height);
41 QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->m_item)->culled, culled);
41 QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->m_item)->culled, culled);
42− QCOMPARE(section(lvwph->m_visibleItems[visibleIndex]->m_sectionItem), sectionHeader);
42+ QCOMPARE(section(lvwph->m_visibleItems[visibleIndex]->sectionItem()), sectionHeader);
43+ QTRY_COMPARE(hasSectionHeaderProperty(lvwph->m_visibleItems[visibleIndex]->m_item), !sectionHeader.isNull());
43 if (!sectionHeader.isNull()) {
44 if (!sectionHeader.isNull()) {
44− QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->m_sectionItem)->culled, sectionHeaderCulled);
45+ QCOMPARE(QQuickItemPrivate::get(lvwph->m_visibleItems[visibleIndex]->sectionItem())->culled, sectionHeaderCulled);
45− QCOMPARE(sectionDelegateIndex(lvwph->m_visibleItems[visibleIndex]->m_sectionItem), lvwph->m_firstVisibleIndex + visibleIndex);
46+ QCOMPARE(sectionDelegateIndex(lvwph->m_visibleItems[visibleIndex]->sectionItem()), lvwph->m_firstVisibleIndex + visibleIndex);
46 }
47 }
47 }
48 }
48
49
@@ -109,12 +110,17 @@ private:
109 QVERIFY(QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);
110 QVERIFY(QQuickItemPrivate::get(lvwph->m_topSectionItem)->culled);
110 }
111 }
111
112
113+ bool hasSectionHeaderProperty(QQuickItem *item) const
114+ {
115+ return item ? QQmlEngine::contextForObject(item)->parentContext()->contextProperty(QLatin1String("hasSectionHeader")).toBool() : false;
116+ }
117+
112− QString section(QQuickItem *item)
118+ QString section(QQuickItem *item) const
113 {
119 {
114 return item ? QQmlEngine::contextForObject(item)->parentContext()->contextProperty(QLatin1String("section")).toString() : QString();
120 return item ? QQmlEngine::contextForObject(item)->parentContext()->contextProperty(QLatin1String("section")).toString() : QString();
115 }
121 }
116
122
117− int sectionDelegateIndex(QQuickItem *item)
123+ int sectionDelegateIndex(QQuickItem *item) const
118 {
124 {
119 return item ? QQmlEngine::contextForObject(item)->parentContext()->contextProperty(QLatin1String("delegateIndex")).toInt() : -1;
125 return item ? QQmlEngine::contextForObject(item)->parentContext()->contextProperty(QLatin1String("delegateIndex")).toInt() : -1;
120 }
126 }
tests/plugins/Dash/organicgridtest.cpp+5
@@ -514,6 +514,11 @@ private Q_SLOTS:
514
514
515 model->setCount(21);
515 model->setCount(21);
516
516
517+ QTRY_COMPARE(grid->m_visibleItems.count(), 0);
518+
519+ grid->setDisplayMarginBeginning(0);
520+ grid->setDisplayMarginEnd(0);
521+
517 // This is exactly the same block as the first again
522 // This is exactly the same block as the first again
518 checkInitialPositions();
523 checkInitialPositions();
519 }
524 }
tests/plugins/Dash/organicgridtry.qml+22−2
@@ -37,8 +37,28 @@ Item {
37 rowSpacing: 10
37 rowSpacing: 10
38 width: parent.width
38 width: parent.width
39 height: implicitHeight > 100 ? implicitHeight : 100
39 height: implicitHeight > 100 ? implicitHeight : 100
40− delegateCreationBegin: lvwph.contentY
40+ displayMarginBeginning: {
41− delegateCreationEnd: lvwph.contentY + lvwph.height
41+ if (grid.y + grid.height <= 0) {
42+ // Not visible (item at top of the list viewport)
43+ return -grid.height;
44+ } else if (grid.y >= lvwph.height) {
45+ // Not visible (item at bottom of the list viewport)
46+ return 0;
47+ } else {
48+ return -Math.max(-grid.y, 0);
49+ }
50+ }
51+ displayMarginEnd: {
52+ if (grid.y + grid.height <= 0) {
53+ // Not visible (item at top of the list viewport)
54+ return 0;
55+ } else if (grid.y >= lvwph.height) {
56+ // Not visible (item at bottom of the list viewport)
57+ return -grid.height;
58+ } else {
59+ return -Math.max(grid.height - lvwph.height + grid.y, 0)
60+ }
61+ }
42
62
43 delegate: Rectangle {
63 delegate: Rectangle {
44 width: 100
64 width: 100
tests/plugins/Dash/verticaljournaltry.qml+23−2
@@ -36,8 +36,29 @@ Item {
36 rowSpacing: 10
36 rowSpacing: 10
37 width: parent.width
37 width: parent.width
38 height: implicitHeight > 100 ? implicitHeight : 100
38 height: implicitHeight > 100 ? implicitHeight : 100
39− delegateCreationBegin: lvwph.contentY
39+
40− delegateCreationEnd: lvwph.contentY + lvwph.height
40+ displayMarginBeginning: {
41+ if (vj.y + vj.height <= 0) {
42+ // Not visible (item at top of the list viewport)
43+ return -vj.height;
44+ } else if (vj.y >= lvwph.height) {
45+ // Not visible (item at bottom of the list viewport)
46+ return 0;
47+ } else {
48+ return -Math.max(-vj.y, 0);
49+ }
50+ }
51+ displayMarginEnd: {
52+ if (vj.y + vj.height <= 0) {
53+ // Not visible (item at top of the list viewport)
54+ return 0;
55+ } else if (vj.y >= lvwph.height) {
56+ // Not visible (item at bottom of the list viewport)
57+ return -vj.height;
58+ } else {
59+ return -Math.max(vj.height - lvwph.height + vj.y, 0)
60+ }
61+ }
41
62
42 delegate: Rectangle {
63 delegate: Rectangle {
43 width: 100
64 width: 100
tests/plugins/Unity/Launcher/CMakeLists.txt+1−1
@@ -49,7 +49,7 @@ add_executable(launchermodeltestExec
49 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
49 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h
50 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
50 ${LAUNCHER_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h
51 )
51 )
52−target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS} )
52+target_link_libraries(launchermodeltestExec ${GSETTINGS_QT_LDFLAGS})
53qt5_use_modules(launchermodeltestExec Test Core DBus)
53qt5_use_modules(launchermodeltestExec Test Core DBus)
54
54
55# copy .desktop files into build directory for shadow builds
55# copy .desktop files into build directory for shadow builds
tests/plugins/Unity/Launcher/launchermodeltest.cpp+9
@@ -274,6 +274,15 @@ private Q_SLOTS:
274 QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);
274 QCOMPARE(launcherModel->rowCount(QModelIndex()), 1);
275 QCOMPARE(launcherModel->get(0)->appId(), QLatin1String("abs-icon"));
275 QCOMPARE(launcherModel->get(0)->appId(), QLatin1String("abs-icon"));
276 }
276 }
277+
278+ void testGetUrlForAppId() {
279+ QCOMPARE(launcherModel->getUrlForAppId(QString()), QString());
280+ QCOMPARE(launcherModel->getUrlForAppId(""), QString());
281+ QCOMPARE(launcherModel->getUrlForAppId("no-name"), QString("application:///no-name.desktop"));
282+ QCOMPARE(launcherModel->getUrlForAppId("com.test.good"), QString("appid://com.test.good/first-listed-app/current-user-version"));
283+ QCOMPARE(launcherModel->getUrlForAppId("com.test.good_application"), QString("appid://com.test.good/application/current-user-version"));
284+ QCOMPARE(launcherModel->getUrlForAppId("com.test.good_application_1.2.3"), QString("appid://com.test.good/application/current-user-version"));
285+ }
277};
286};
278
287
279QTEST_GUILESS_MAIN(LauncherModelTest)
288QTEST_GUILESS_MAIN(LauncherModelTest)
tests/qmltests/CMakeLists.txt+38−48
@@ -4,6 +4,7 @@ include(QmlTest)
4add_subdirectory(Components)
4add_subdirectory(Components)
5
5
6set(qmltest_DEFAULT_IMPORT_PATHS
6set(qmltest_DEFAULT_IMPORT_PATHS
7+ ${CMAKE_BINARY_DIR}/plugins
7 ${CMAKE_BINARY_DIR}/tests/utils/modules
8 ${CMAKE_BINARY_DIR}/tests/utils/modules
8 ${CMAKE_BINARY_DIR}/tests/mocks
9 ${CMAKE_BINARY_DIR}/tests/mocks
9)
10)
@@ -23,7 +24,7 @@ add_qml_test(. Shell IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_
23add_qml_test(Components Carousel)
24add_qml_test(Components Carousel)
24add_qml_test(Components DraggingArea)
25add_qml_test(Components DraggingArea)
25add_qml_test(Components EdgeDemoOverlay)
26add_qml_test(Components EdgeDemoOverlay)
26−add_qml_test(Components FilterGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
27+add_qml_test(Components FilterGrid)
27add_qml_test(Components LazyImage)
28add_qml_test(Components LazyImage)
28add_qml_test(Components Rating)
29add_qml_test(Components Rating)
29add_qml_test(Components ResponsiveFlowView)
30add_qml_test(Components ResponsiveFlowView)
@@ -32,54 +33,43 @@ add_qml_test(Components SeeMore)
32add_qml_test(Components Showable)
33add_qml_test(Components Showable)
33add_qml_test(Components PageHeaderLabel)
34add_qml_test(Components PageHeaderLabel)
34add_qml_test(Components ZoomableImage)
35add_qml_test(Components ZoomableImage)
35−add_qml_test(Dash Dash IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
36+add_qml_test(Dash Dash)
36−add_qml_test(Dash DashContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
37+add_qml_test(Dash DashContent)
37−add_qml_test(Dash Card IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
38+add_qml_test(Dash Card)
38−add_qml_benchmark(Dash CardBenchmark 1000 IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
39+add_qml_benchmark(Dash CardBenchmark 1000)
39−add_qml_test(Dash CardHeader)
40−add_qml_test(Dash CardTool IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
40+add_qml_test(Dash CardTool)
41−add_qml_test(Dash GenericScopeView IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
41+add_qml_test(Dash GenericScopeView)
42−add_qml_test(Dash/Apps RunningApplicationsGrid IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
42+add_qml_test(Dash/Apps RunningApplicationsGrid)
43− ${CMAKE_BINARY_DIR}/tests/mocks
44− ${CMAKE_BINARY_DIR}/plugins)
45−add_qml_test(Dash/Previews Preview IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
43+add_qml_test(Dash/Previews Preview)
46−add_qml_test(Dash/Previews PreviewActions IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
44+add_qml_test(Dash/Previews PreviewActions)
47−add_qml_test(Dash/Previews PreviewAudioPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
45+add_qml_test(Dash/Previews PreviewAudioPlayback)
48−add_qml_test(Dash/Previews PreviewHeader IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
46+add_qml_test(Dash/Previews PreviewHeader)
49−add_qml_test(Dash/Previews PreviewImageGallery IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
47+add_qml_test(Dash/Previews PreviewImageGallery)
50−add_qml_test(Dash/Previews PreviewProgress IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
48+add_qml_test(Dash/Previews PreviewProgress)
51−add_qml_test(Dash/Previews PreviewRatingDisplay IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
49+add_qml_test(Dash/Previews PreviewRatingDisplay)
52−add_qml_test(Dash/Previews PreviewRatingInput IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
50+add_qml_test(Dash/Previews PreviewRatingInput)
53−add_qml_test(Dash/Previews PreviewTextSummary IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
51+add_qml_test(Dash/Previews PreviewTextSummary)
54−add_qml_test(Dash/Previews PreviewVideoPlayback IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
52+add_qml_test(Dash/Previews PreviewVideoPlayback)
55−add_qml_test(Dash/Previews PreviewWidgetFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
53+add_qml_test(Dash/Previews PreviewWidgetFactory)
56−add_qml_test(Dash/Previews PreviewZoomableImage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/tests/mocks)
54+add_qml_test(Dash/Previews PreviewZoomableImage)
57−add_qml_test(Greeter Lockscreen IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
58− PROPERTIES ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
55+add_qml_test(Greeter Lockscreen ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
59−add_qml_test(Greeter Tablet IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
60− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
56+add_qml_test(Greeter MultiGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
61−add_qml_test(Greeter Phone IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
62− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
57+add_qml_test(Greeter SingleGreeter ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/single")
63−add_qml_test(Greeter Infographics IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
64− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
58+add_qml_test(Greeter Infographics ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics:${CMAKE_BINARY_DIR}/tests/mocks/LightDM/full")
65−add_qml_test(Greeter Clock IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
66− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
59+add_qml_test(Greeter Clock ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
67add_qml_test(Hud Hud)
60add_qml_test(Hud Hud)
68add_qml_test(Hud Result)
61add_qml_test(Hud Result)
69−add_qml_test(Launcher Launcher IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
62+add_qml_test(Launcher Launcher)
70−add_qml_test(Notifications Notifications IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
63+add_qml_test(Notifications Notifications)
71−add_qml_test(Notifications VisualSnapDecisionsQueue IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
64+add_qml_test(Notifications VisualSnapDecisionsQueue)
72add_qml_test(Panel IndicatorRow)
65add_qml_test(Panel IndicatorRow)
73−add_qml_test(Panel Indicators IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
66+add_qml_test(Panel Indicators)
74−add_qml_test(Panel MenuContent IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
67+add_qml_test(Panel MenuContent)
75−add_qml_test(Panel Panel IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS})
68+add_qml_test(Panel Panel)
76add_qml_test(Panel SearchIndicator)
69add_qml_test(Panel SearchIndicator)
77−add_qml_test(Panel/Indicators DefaultIndicatorWidget IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
78− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
70+add_qml_test(Panel/Indicators DefaultIndicatorWidget ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
79−add_qml_test(Panel/Indicators DefaultIndicatorPage IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${qmltest_DEFAULT_IMPORT_PATHS}
80− ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
71+add_qml_test(Panel/Indicators DefaultIndicatorPage ENVIRONMENT "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/tests/mocks/QMenuModel")
72+# These MenuItemFactory tests need the test/mocks/ to come before plugins/
81−add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
73+add_qml_test(Panel/Indicators MenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
82−add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS} ${CMAKE_BINARY_DIR}/plugins)
74+add_qml_test(Panel/Indicators MessageMenuItemFactory IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks ${qmltest_DEFAULT_IMPORT_PATHS})
83−add_qml_test(Stages PhoneStage IMPORT_PATHS ${qmltest_DEFAULT_IMPORT_PATHS}
75+add_qml_test(Stages PhoneStage)
84− ${CMAKE_BINARY_DIR}/tests/mocks
85− ${CMAKE_BINARY_DIR}/plugins)
tests/qmltests/Components/tst_LazyImage.qml+1−1
@@ -113,7 +113,7 @@ Rectangle {
113 }
113 }
114
114
115 UT.UnityTestCase {
115 UT.UnityTestCase {
116− name: "Stage"
116+ name: "LazyImage"
117 when: windowShown
117 when: windowShown
118
118
119 function cleanup() {
119 function cleanup() {
tests/qmltests/Components/tst_PageHeaderLabel.qml+4−4
@@ -26,7 +26,7 @@ Item {
26 width: units.gu(110)
26 width: units.gu(110)
27 height: units.gu(30)
27 height: units.gu(30)
28
28
29− Scope {
29+ MockScope {
30 id: scopeMock
30 id: scopeMock
31 }
31 }
32
32
@@ -148,17 +148,17 @@ Item {
148
148
149 pageHeader.triggerSearch()
149 pageHeader.triggerSearch()
150
150
151− scopeMock.searchInProgress = false
151+ scopeMock.setSearchInProgress(false);
152 compare(searchIndicator.running, false, "Search indicator is running.")
152 compare(searchIndicator.running, false, "Search indicator is running.")
153 tryCompare(primaryImage, "visible", true)
153 tryCompare(primaryImage, "visible", true)
154
154
155− scopeMock.searchInProgress = true
155+ scopeMock.setSearchInProgress(true);
156 compare(searchIndicator.running, true, "Search indicator isn't running.")
156 compare(searchIndicator.running, true, "Search indicator isn't running.")
157 tryCompare(primaryImage, "visible", false)
157 tryCompare(primaryImage, "visible", false)
158 }
158 }
159
159
160 function cleanup() {
160 function cleanup() {
161− scopeMock.searchInProgress = false;
161+ scopeMock.setSearchInProgress(false);
162 pageHeader.resetSearch();
162 pageHeader.resetSearch();
163 }
163 }
164
164
tests/qmltests/Components/tst_ZoomableImage.qml+21−19
@@ -98,22 +98,23 @@ Rectangle {
98 // move mouse to center
98 // move mouse to center
99 mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
99 mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
100
100
101+ var oldScale = image.scale;
101 // Test Zoom-in Zoom-out twice.
102 // Test Zoom-in Zoom-out twice.
102 for (var c=0; c<2; c++) {
103 for (var c=0; c<2; c++) {
103 // zoom in
104 // zoom in
104 for (var i=0; i<10; i++) {
105 for (var i=0; i<10; i++) {
105 mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);
106 mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, 10);
106− tryCompare(image, "scale", 1.0 + (i + 1) * 0.1);
107+ tryCompare(image, "scale", oldScale + (i + 1) * 0.1);
107− compare(flickable.contentWidth, lazyImage.width * image.scale);
108+ compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
108− compare(flickable.contentHeight, lazyImage.height * image.scale);
109+ compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
109 }
110 }
110
111
111 // zoom out
112 // zoom out
112 for (var i=0; i<10; i++) {
113 for (var i=0; i<10; i++) {
113 mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, -10);
114 mouseWheel(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2, 0, -10);
114− tryCompare(image, "scale", 2.0 - (i + 1) * 0.1);
115+ tryCompare(image, "scale", oldScale + 1.0 - (i + 1) * 0.1);
115− compare(flickable.contentWidth, lazyImage.width * image.scale);
116+ compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
116− compare(flickable.contentHeight, lazyImage.height * image.scale);
117+ compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
117 }
118 }
118 }
119 }
119 }
120 }
@@ -123,16 +124,12 @@ Rectangle {
123 zoomable:false,
124 zoomable:false,
124 answer1: true,
125 answer1: true,
125 answer2: false,
126 answer2: false,
126− answer3: true,
127+ answer3: true },
127− answer4: 1.0,
128− answer5: 1.0 },
129 { source:widgetData2["source"],
128 { source:widgetData2["source"],
130 zoomable:true,
129 zoomable:true,
131 answer1: false,
130 answer1: false,
132 answer2: true,
131 answer2: true,
133− answer3: false,
132+ answer3: false }
134− answer4: 1.7740461882048026,
135− answer5: 1.0 }
136 ]
133 ]
137 }
134 }
138
135
@@ -163,7 +160,7 @@ Rectangle {
163 var y2End = zoomableImage.height * 5 / 6;
160 var y2End = zoomableImage.height * 5 / 6;
164
161
165 var oldScale = image.scale;
162 var oldScale = image.scale;
166−
163+ var newScale = -1;
167 // move mouse to center
164 // move mouse to center
168 mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
165 mouseMove(zoomableImage, zoomableImage.width / 2, zoomableImage.height / 2);
169
166
@@ -172,20 +169,25 @@ Rectangle {
172 wait(3000); // have to delay between two consequent pinch event.
169 wait(3000); // have to delay between two consequent pinch event.
173 // pinch zoom-in
170 // pinch zoom-in
174 touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);
171 touchPinch(zoomableImage, x1Start, y1Start, x1End, y1End, x2Start, y2Start, x2End, y2End);
172+ waitForRendering(image);
175
173
176− tryCompare(image, "scale", data.answer4);
174+ if (newScale == -1) {
177− var newScale = image.scale;
175+ newScale = image.scale;
176+ }
177+ tryCompare(image, "scale", newScale);
178 compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);
178 compare(newScale == oldScale, data.answer1, "scale factor not equal: "+ oldScale + "=?" + newScale);
179 compare(newScale > oldScale, data.answer2, "scale factor didn't changed");
179 compare(newScale > oldScale, data.answer2, "scale factor didn't changed");
180 compare(signalSpy.count == 0, data.answer3, "scale signal count error");
180 compare(signalSpy.count == 0, data.answer3, "scale signal count error");
181− compare(newScale, data.answer4, "scale factor error");
181+ compare(image.scale, newScale, "scale factor error");
182− compare(flickable.contentWidth, lazyImage.width * image.scale);
182+ compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
183− compare(flickable.contentHeight, lazyImage.height * image.scale);
183+ compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
184
184
185 wait(3000); // have to delay between two consequent pinch event.
185 wait(3000); // have to delay between two consequent pinch event.
186 // pinch zoom-out
186 // pinch zoom-out
187 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);
187 touchPinch(zoomableImage, x1End, y1End, x1Start, y1Start, x2End, y2End, x2Start, y2Start);
188− tryCompare(image, "scale", data.answer5);
188+ tryCompare(image, "scale", oldScale);
189+ compare(flickable.contentWidth, Math.max(lazyImage.width * image.scale, flickable.width));
190+ compare(flickable.contentHeight, Math.max(lazyImage.height * image.scale, flickable.height));
189 }
191 }
190 }
192 }
191 }
193 }
tests/qmltests/Dash/Previews/tst_PreviewHeader.qml+12−7
@@ -53,12 +53,12 @@ Rectangle {
53 name: "PreviewHeaderTest"
53 name: "PreviewHeaderTest"
54 when: windowShown
54 when: windowShown
55
55
56− property Item mascot: findChild(previewHeader, "mascotShape")
56+ property Item mascotShapeLoader: findChild(previewHeader, "mascotShapeLoader")
57 property Item outerRow: findChild(previewHeader, "outerRow")
57 property Item outerRow: findChild(previewHeader, "outerRow")
58 property Item column: findChild(previewHeader, "column")
58 property Item column: findChild(previewHeader, "column")
59
59
60 function initTestCase() {
60 function initTestCase() {
61− verify(typeof testCase.mascot === "object", "Couldn't find mascot object.");
61+ verify(typeof testCase.mascotShapeLoader === "object", "Couldn't find mascot loader object.");
62 verify(typeof testCase.outerRow === "object", "Couldn't find outerRow object.");
62 verify(typeof testCase.outerRow === "object", "Couldn't find outerRow object.");
63 verify(typeof testCase.column === "object", "Couldn't find column object.");
63 verify(typeof testCase.column === "object", "Couldn't find column object.");
64
64
@@ -70,9 +70,9 @@ Rectangle {
70
70
71 function test_mascot_data() {
71 function test_mascot_data() {
72 return [
72 return [
73− { tag: "Empty", source: "", visible: false },
73+ { tag: "Empty", source: "", loaderVisible: false, visible: false },
74− { tag: "Invalid", source: "bad_path", visible: false },
74+ { tag: "Invalid", source: "bad_path", loaderVisible: true, visible: false },
75− { tag: "Valid", source: "../graphics/play_button.png", visible: true },
75+ { tag: "Valid", source: "../graphics/play_button.png", loaderVisible: true, visible: true },
76 ]
76 ]
77 }
77 }
78
78
@@ -80,12 +80,17 @@ Rectangle {
80 headerjson.mascot = data.source;
80 headerjson.mascot = data.source;
81 previewHeader.widgetData = headerjson;
81 previewHeader.widgetData = headerjson;
82
82
83+ tryCompare(testCase.mascotShapeLoader, "visible", data.loaderVisible);
84+ if (data.loaderVisible) {
85+ tryCompareFunction(function() { return findChild(previewHeader, "mascotShape") != null }, true);
86+ var mascot = findChild(previewHeader, "mascotShape")
83− tryCompare(testCase.mascot, "visible", data.visible);
87+ tryCompare(mascot, "visible", data.visible);
88+ }
84 }
89 }
85
90
86 function test_dimensions_data() {
91 function test_dimensions_data() {
87 return [
92 return [
88− { tag: "Column width with mascot", object: column, width: previewHeader.width - mascot.width - outerRow.margins * 3, mascot: "artwork/avatar.png" },
93+ { tag: "Column width with mascot", object: column, width: previewHeader.width - mascotShapeLoader.width - outerRow.margins * 3, mascot: "artwork/avatar.png" },
89 { tag: "Header height", object: previewHeader, height: function() { return outerRow.height + outerRow.margins * 2 } },
94 { tag: "Header height", object: previewHeader, height: function() { return outerRow.height + outerRow.margins * 2 } },
90 ]
95 ]
91 }
96 }
tests/qmltests/Dash/Previews/tst_PreviewZoomableImage.qml+7−5
@@ -26,12 +26,12 @@ Rectangle {
26 color: "lightgrey"
26 color: "lightgrey"
27
27
28 property var widgetData0: {
28 property var widgetData0: {
29− "source": ""
29+ "source": Qt.resolvedUrl("../artwork/checkers.png"),
30+ "zoomable": false
30 }
31 }
31
32
32 property var widgetData1: {
33 property var widgetData1: {
33− "source": Qt.resolvedUrl("../artwork/checkers.png"),
34+ "source": ""
34− "zoomable": false
35 }
35 }
36
36
37 PreviewZoomableImage {
37 PreviewZoomableImage {
@@ -49,11 +49,13 @@ Rectangle {
49
49
50 zoomableImage.widgetData = widgetData0;
50 zoomableImage.widgetData = widgetData0;
51 waitForRendering(zoomableImage);
51 waitForRendering(zoomableImage);
52+ waitForRendering(image);
52− tryCompare(image, "imageState", "default");
53+ tryCompare(image, "imageState", "ready");
53
54
54 zoomableImage.widgetData = widgetData1;
55 zoomableImage.widgetData = widgetData1;
55 waitForRendering(zoomableImage);
56 waitForRendering(zoomableImage);
57+ waitForRendering(image);
56− tryCompare(image, "imageState", "ready");
58+ tryCompare(image, "imageState", "default");
57 }
59 }
58 }
60 }
59}
61}
tests/qmltests/Dash/tst_DashContent.qml+34−19
@@ -67,13 +67,17 @@ Item {
67 name: "DashContent"
67 name: "DashContent"
68 when: scopesModel.loaded && windowShown
68 when: scopesModel.loaded && windowShown
69
69
70− function init() {
70+ function loadScopes() {
71− scopesModel.clear();
72 scopeLoadedSpy.clear();
71 scopeLoadedSpy.clear();
73 scopesModel.load();
72 scopesModel.load();
74 tryCompare(scopeLoadedSpy, "count", 4);
73 tryCompare(scopeLoadedSpy, "count", 4);
75 }
74 }
76
75
76+ function init() {
77+ scopesModel.clear();
78+ loadScopes();
79+ }
80+
77 function cleanup() {
81 function cleanup() {
78 movementStartedSpy.clear();
82 movementStartedSpy.clear();
79 dashContent.visible = true;
83 dashContent.visible = true;
@@ -93,9 +97,7 @@ Item {
93 compare(dashContentList.count, 0, "DashContent should have 0 items when it starts");
97 compare(dashContentList.count, 0, "DashContent should have 0 items when it starts");
94 tryCompare(dashContentList, "currentIndex", -1);
98 tryCompare(dashContentList, "currentIndex", -1);
95
99
96− scopeLoadedSpy.clear();
100+ loadScopes();
97− scopesModel.load();
98− tryCompare(scopeLoadedSpy, "count", 4);
99
101
100 verify(dashContentList.currentIndex >= 0);
102 verify(dashContentList.currentIndex >= 0);
101 }
103 }
@@ -109,9 +111,7 @@ Item {
109 // pretend we're running after a model reset
111 // pretend we're running after a model reset
110 dashContentList.currentIndex = 27;
112 dashContentList.currentIndex = 27;
111
113
112− scopeLoadedSpy.clear();
114+ loadScopes();
113− scopesModel.load();
114− tryCompare(scopeLoadedSpy, "count", 4);
115
115
116 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < 5);
116 verify(dashContentList.currentIndex >= 0 && dashContentList.currentIndex < 5);
117 }
117 }
@@ -166,7 +166,7 @@ Item {
166
166
167 // test greater than scope count.
167 // test greater than scope count.
168 var currentScopeIndex = dashContent.currentIndex;
168 var currentScopeIndex = dashContent.currentIndex;
169− dashContent.setCurrentScopeAtIndex(scopesModel.count, true, false);
169+ dashContent.setCurrentScopeAtIndex(8, true, false);
170 compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
170 compare(dashContent.currentIndex, currentScopeIndex, "Scope should not change if changing to greater index than count");
171 }
171 }
172
172
@@ -195,7 +195,7 @@ Item {
195 dashContent.setCurrentScopeAtIndex(data.index, true, false);
195 dashContent.setCurrentScopeAtIndex(data.index, true, false);
196 tryCompareFunction(get_current_item_object_name, data.objectName)
196 tryCompareFunction(get_current_item_object_name, data.objectName)
197 var pageHeader = findChild(dashContent, "pageHeader");
197 var pageHeader = findChild(dashContent, "pageHeader");
198− compare(pageHeader.scope, scopesModel.get(data.index));
198+ compare(pageHeader.scope, scopesModel.getScope(data.index));
199 }
199 }
200
200
201 function test_is_active_data() {
201 function test_is_active_data() {
@@ -212,9 +212,9 @@ Item {
212 dashContent.setCurrentScopeAtIndex(data.select, true, false);
212 dashContent.setCurrentScopeAtIndex(data.select, true, false);
213 dashContent.visible = data.visible;
213 dashContent.visible = data.visible;
214
214
215− tryCompare(scopesModel.get(0), "isActive", data.active0);
215+ tryCompare(scopesModel.getScope(0), "isActive", data.active0);
216− tryCompare(scopesModel.get(1), "isActive", data.active1);
216+ tryCompare(scopesModel.getScope(1), "isActive", data.active1);
217− tryCompare(scopesModel.get(2), "isActive", data.active2);
217+ tryCompare(scopesModel.getScope(2), "isActive", data.active2);
218 }
218 }
219
219
220 function doFindMusicButton(parent) {
220 function doFindMusicButton(parent) {
@@ -326,8 +326,6 @@ Item {
326 }
326 }
327
327
328 function test_previewOpenClose() {
328 function test_previewOpenClose() {
329− tryCompare(scopeLoadedSpy, "count", 4);
330−
331 var previewListView = findChild(dashContent, "dashContentPreviewList");
329 var previewListView = findChild(dashContent, "dashContentPreviewList");
332 tryCompare(previewListView, "open", false);
330 tryCompare(previewListView, "open", false);
333
331
@@ -352,8 +350,6 @@ Item {
352 },
350 },
353 true);
351 true);
354
352
355− tryCompare(scopeLoadedSpy, "count", 4);
356−
357 var previewListView = findChild(dashContent, "dashContentPreviewList");
353 var previewListView = findChild(dashContent, "dashContentPreviewList");
358 tryCompare(previewListView, "open", false);
354 tryCompare(previewListView, "open", false);
359
355
@@ -368,8 +364,6 @@ Item {
368 }
364 }
369
365
370 function test_previewCycle() {
366 function test_previewCycle() {
371− tryCompare(scopeLoadedSpy, "count", 4);
372−
373 var categoryListView = findChild(dashContent, "categoryListView");
367 var categoryListView = findChild(dashContent, "categoryListView");
374 categoryListView.positionAtBeginning();
368 categoryListView.positionAtBeginning();
375
369
@@ -392,5 +386,26 @@ Item {
392 }
386 }
393 closePreview();
387 closePreview();
394 }
388 }
389+
390+ function test_carouselAspectRatio() {
391+ tryCompareFunction(function() {
392+ var scope = findChild(dashContent, "MockScope1 loader");
393+ if (scope != null) {
394+ var dashCategory1 = findChild(scope, "dashCategory1");
395+ if (dashCategory1 != null) {
396+ var tile = findChild(dashCategory1, "carouselDelegate1");
397+ return tile != null;
398+ }
399+ }
400+ return false;
401+ },
402+ true);
403+
404+ var scope = findChild(dashContent, "MockScope1 loader");
405+ var dashCategory1 = findChild(scope, "dashCategory1");
406+ var cardTool = findChild(dashCategory1, "cardTool");
407+ var carouselLV = findChild(dashCategory1, "listView");
408+ verify(carouselLV.tileWidth / carouselLV.tileHeight == cardTool.components["art"]["aspect-ratio"]);
409+ }
395 }
410 }
396}
411}
tests/qmltests/Dash/tst_GenericScopeView.qml+11−10
@@ -39,7 +39,7 @@ Item {
39 id: scopes
39 id: scopes
40
40
41 onLoadedChanged: {
41 onLoadedChanged: {
42− genericScopeView.scope = scopes.get(2)
42+ genericScopeView.scope = scopes.getScope(2)
43 }
43 }
44 }
44 }
45
45
@@ -67,7 +67,7 @@ Item {
67 when: scopes.loaded && windowShown
67 when: scopes.loaded && windowShown
68
68
69 function init() {
69 function init() {
70− genericScopeView.scope = scopes.get(2)
70+ genericScopeView.scope = scopes.getScope(2)
71 shell.width = units.gu(120)
71 shell.width = units.gu(120)
72 genericScopeView.categoryView.positionAtBeginning();
72 genericScopeView.categoryView.positionAtBeginning();
73 tryCompare(genericScopeView.categoryView, "contentY", 0)
73 tryCompare(genericScopeView.categoryView, "contentY", 0)
@@ -96,36 +96,37 @@ Item {
96
96
97 function test_showDash() {
97 function test_showDash() {
98 previewListView.open = true;
98 previewListView.open = true;
99− scopes.get(2).showDash();
99+ scopes.getScope(2).showDash();
100 tryCompare(previewListView, "open", false);
100 tryCompare(previewListView, "open", false);
101 }
101 }
102
102
103 function test_hideDash() {
103 function test_hideDash() {
104 previewListView.open = true;
104 previewListView.open = true;
105− scopes.get(2).hideDash();
105+ scopes.getScope(2).hideDash();
106 tryCompare(previewListView, "open", false);
106 tryCompare(previewListView, "open", false);
107 }
107 }
108
108
109 function test_searchQuery() {
109 function test_searchQuery() {
110− genericScopeView.scope = scopes.get(0);
110+ genericScopeView.scope = scopes.getScope(0);
111 genericScopeView.scope.searchQuery = "test";
111 genericScopeView.scope.searchQuery = "test";
112− genericScopeView.scope = scopes.get(1);
112+ genericScopeView.scope = scopes.getScope(1);
113 genericScopeView.scope.searchQuery = "test2";
113 genericScopeView.scope.searchQuery = "test2";
114− genericScopeView.scope = scopes.get(0);
114+ genericScopeView.scope = scopes.getScope(0);
115 tryCompare(genericScopeView.scope, "searchQuery", "test");
115 tryCompare(genericScopeView.scope, "searchQuery", "test");
116− genericScopeView.scope = scopes.get(1);
116+ genericScopeView.scope = scopes.getScope(1);
117 tryCompare(genericScopeView.scope, "searchQuery", "test2");
117 tryCompare(genericScopeView.scope, "searchQuery", "test2");
118 }
118 }
119
119
120 function test_changeScope() {
120 function test_changeScope() {
121 genericScopeView.scope.searchQuery = "test"
121 genericScopeView.scope.searchQuery = "test"
122− genericScopeView.scope = scopes.get(1)
122+ genericScopeView.scope = scopes.getScope(1)
123− genericScopeView.scope = scopes.get(2)
123+ genericScopeView.scope = scopes.getScope(2)
124 tryCompare(genericScopeView.scope, "searchQuery", "test")
124 tryCompare(genericScopeView.scope, "searchQuery", "test")
125 }
125 }
126
126
127 function test_filter_expand_collapse() {
127 function test_filter_expand_collapse() {
128 // wait for the item to be there
128 // wait for the item to be there
129+ waitForRendering(genericScopeView);
129 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);
130 tryCompareFunction(function() { return findChild(genericScopeView, "dashSectionHeader0") != null; }, true);
130
131
131 var header = findChild(genericScopeView, "dashSectionHeader0")
132 var header = findChild(genericScopeView, "dashSectionHeader0")
tests/qmltests/Greeter/tst_Lockscreen.qml+209−31
@@ -17,31 +17,40 @@
17import QtQuick 2.0
17import QtQuick 2.0
18import QtTest 1.0
18import QtTest 1.0
19import ".."
19import ".."
20−import "../../../qml/Greeter"
20+import "../../../qml/Components"
21import Ubuntu.Components 0.1
21import Ubuntu.Components 0.1
22import LightDM 0.1 as LightDM
22import LightDM 0.1 as LightDM
23import Unity.Test 0.1 as UT
23import Unity.Test 0.1 as UT
24
24
25Rectangle {
25Rectangle {
26+ id: root
26− width: units.gu(60)
27+ width: units.gu(80)
27 height: units.gu(80)
28 height: units.gu(80)
28 color: "orange"
29 color: "orange"
29
30
30 Lockscreen {
31 Lockscreen {
31 id: lockscreen
32 id: lockscreen
32 anchors.fill: parent
33 anchors.fill: parent
33− anchors.rightMargin: units.gu(18)
34+ anchors.rightMargin: units.gu(30)
34 placeholderText: "Please enter your PIN"
35 placeholderText: "Please enter your PIN"
36+ wrongPlaceholderText: "Incorrect PIN"
37+ retryText: retryCountTextField.text
35 alphaNumeric: pinPadCheckBox.checked
38 alphaNumeric: pinPadCheckBox.checked
36− pinLength: pinLengthTextField.text
39+ minPinLength: minPinLengthTextField.text
40+ maxPinLength: maxPinLengthTextField.text
37 username: "Lola"
41 username: "Lola"
42+ background: "../../../qml/graphics/phone_background.jpg"
43+ infoText: infoTextTextField.text
38 }
44 }
39
45
40 Connections {
46 Connections {
41 target: lockscreen
47 target: lockscreen
42
48
43 onEmergencyCall: emergencyCheckBox.checked = true
49 onEmergencyCall: emergencyCheckBox.checked = true
50+ onEntered: {
44− onEntered: enteredLabel.text = passphrase
51+ enteredLabel.text = passphrase
52+ lockscreen.clear(true)
53+ }
45 }
54 }
46
55
47 Connections {
56 Connections {
@@ -49,9 +58,9 @@ Rectangle {
49
58
50 onShowPrompt: {
59 onShowPrompt: {
51 if (text.indexOf("PIN") >= 0) {
60 if (text.indexOf("PIN") >= 0) {
52− lockscreen.alphaNumeric = false
61+ pinPadCheckBox.checked = false
53 } else {
62 } else {
54− lockscreen.alphaNumeric = true
63+ pinPadCheckBox.checked = true
55 }
64 }
56 lockscreen.placeholderText = text;
65 lockscreen.placeholderText = text;
57 }
66 }
@@ -65,6 +74,7 @@ Rectangle {
65 Column {
74 Column {
66 anchors.fill: parent
75 anchors.fill: parent
67 anchors.margins: units.gu(1)
76 anchors.margins: units.gu(1)
77+ spacing: units.gu(1)
68
78
69 Row {
79 Row {
70 CheckBox {
80 CheckBox {
@@ -86,12 +96,32 @@ Rectangle {
86 }
96 }
87 Row {
97 Row {
88 TextField {
98 TextField {
89− id: pinLengthTextField
99+ id: minPinLengthTextField
90 width: units.gu(7)
100 width: units.gu(7)
91 text: "4"
101 text: "4"
92 }
102 }
93 Label {
103 Label {
104+ text: "Min PIN length"
105+ }
106+ }
107+ Row {
108+ TextField {
109+ id: maxPinLengthTextField
110+ width: units.gu(7)
111+ text: "4"
112+ }
113+ Label {
94− text: "PIN length"
114+ text: "Max PIN length"
115+ }
116+ }
117+ Row {
118+ TextField {
119+ id: retryCountTextField
120+ width: units.gu(7)
121+ text: "3 retries left"
122+ }
123+ Label {
124+ text: "Retries left"
95 }
125 }
96 }
126 }
97 Label {
127 Label {
@@ -108,12 +138,40 @@ Rectangle {
108 }
138 }
109 Button {
139 Button {
110 text: "start auth (1234)"
140 text: "start auth (1234)"
141+ width: parent.width
111 onClicked: LightDM.Greeter.authenticate("has-pin")
142 onClicked: LightDM.Greeter.authenticate("has-pin")
112 }
143 }
113 Button {
144 Button {
114 text: "start auth (password)"
145 text: "start auth (password)"
146+ width: parent.width
115 onClicked: LightDM.Greeter.authenticate("has-password")
147 onClicked: LightDM.Greeter.authenticate("has-password")
116 }
148 }
149+
150+ TextField {
151+ id: infoTextTextField
152+ width: parent.width
153+ placeholderText: "Infotext"
154+ text: "+49 179 3253553"
155+ }
156+
157+ TextField {
158+ id: infoPopupTitleTextField
159+ width: parent.width
160+ placeholderText: "Popup title"
161+ text: "This will be the last attempt"
162+ }
163+
164+ TextArea {
165+ id: infoPopupTextArea
166+ width: parent.width
167+ text: "If the SIM PIN is entered incorrectly, your SIM will be blocked and would require the PUK code to unlock."
168+ }
169+
170+ Button {
171+ text: "open info popup"
172+ width: parent.width
173+ onClicked: lockscreen.showInfoPopup(infoPopupTitleTextField.text, infoPopupTextArea.text)
174+ }
117 }
175 }
118 }
176 }
119
177
@@ -121,6 +179,16 @@ Rectangle {
121 name: "Lockscreen"
179 name: "Lockscreen"
122 when: windowShown
180 when: windowShown
123
181
182+ function cleanup() {
183+ lockscreen.clear(false);
184+ }
185+
186+ function waitForLockscreenReady() {
187+ var pinPadLoader = findChild(lockscreen, "pinPadLoader");
188+ tryCompare(pinPadLoader, "status", Loader.Ready)
189+ waitForRendering(lockscreen)
190+ }
191+
124 function test_loading_data() {
192 function test_loading_data() {
125 return [
193 return [
126 {tag: "numeric", alphanumeric: false, pinPadAvailable: true },
194 {tag: "numeric", alphanumeric: false, pinPadAvailable: true },
@@ -129,8 +197,8 @@ Rectangle {
129 }
197 }
130
198
131 function test_loading(data) {
199 function test_loading(data) {
132− lockscreen.alphaNumeric = data.alphanumeric
200+ pinPadCheckBox.checked = data.alphanumeric
133− waitForRendering(lockscreen)
201+ waitForLockscreenReady();
134 if (data.pinPadAvailable) {
202 if (data.pinPadAvailable) {
135 compare(findChild(lockscreen, "pinPadButton8").text, "8", "Could not find number 8 on PinPad")
203 compare(findChild(lockscreen, "pinPadButton8").text, "8", "Could not find number 8 on PinPad")
136 } else {
204 } else {
@@ -147,8 +215,8 @@ Rectangle {
147
215
148 function test_emergency_call(data) {
216 function test_emergency_call(data) {
149 emergencyCheckBox.checked = false
217 emergencyCheckBox.checked = false
150− lockscreen.alphaNumeric = data.alphanumeric
218+ pinPadCheckBox.checked = data.alphanumeric
151− waitForRendering(lockscreen)
219+ waitForLockscreenReady();
152 var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
220 var emergencyButton = findChild(lockscreen, "emergencyCallIcon")
153 mouseClick(emergencyButton, units.gu(1), units.gu(1))
221 mouseClick(emergencyButton, units.gu(1), units.gu(1))
154 tryCompare(emergencyCheckBox, "checked", true)
222 tryCompare(emergencyCheckBox, "checked", true)
@@ -163,9 +231,9 @@ Rectangle {
163 }
231 }
164
232
165 function test_labels(data) {
233 function test_labels(data) {
166− lockscreen.alphaNumeric = data.alphanumeric
234+ pinPadCheckBox.checked = data.alphanumeric
167 lockscreen.placeholderText = data.placeholderText
235 lockscreen.placeholderText = data.placeholderText
168− waitForRendering(lockscreen)
236+ waitForLockscreenReady();
169 compare(findChild(lockscreen, "pinentryField").placeholderText, data.placeholderText, "Placeholdertext is not what it should be")
237 compare(findChild(lockscreen, "pinentryField").placeholderText, data.placeholderText, "Placeholdertext is not what it should be")
170 if (data.alphanumeric) {
238 if (data.alphanumeric) {
171 compare(findChild(lockscreen, "greeterLabel").text, "Hello " + data.username, "Greeter is not set correctly")
239 compare(findChild(lockscreen, "greeterLabel").text, "Hello " + data.username, "Greeter is not set correctly")
@@ -175,23 +243,25 @@ Rectangle {
175
243
176 function test_unlock_data() {
244 function test_unlock_data() {
177 return [
245 return [
178− {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234", pinLength: 4},
246+ {tag: "numeric", alphanumeric: false, username: "has-pin", password: "1234", minPinLength: 4, maxPinLength: 4},
179− {tag: "alphanumeric", alphanumeric: true, username: "has-password", password: "password", pinLength: -1},
247+ {tag: "alphanumeric", alphanumeric: true, username: "has-password", password: "password", minPinLength: -1, maxPinLength: -1},
180− {tag: "numeric (wrong)", alphanumeric: false, username: "has-pin", password: "4321", pinLength: 4},
248+ {tag: "numeric (wrong)", alphanumeric: false, username: "has-pin", password: "4321", minPinLength: 4, maxPinLength: 4},
181− {tag: "alphanumeric (wrong)", alphanumeric: true, username: "has-password", password: "drowssap", pinLength: -1},
249+ {tag: "alphanumeric (wrong)", alphanumeric: true, username: "has-password", password: "drowssap", minPinLength: -1, maxPinLength: -1},
182− {tag: "flexible length", alphanumeric: false, username: "has-pin", password: "1234", pinLength: -1},
250+ {tag: "flexible length", alphanumeric: false, username: "has-pin", password: "1234", minPinLength: -1, maxPinLength: -1},
183 ]
251 ]
184 }
252 }
185
253
186 function test_unlock(data) {
254 function test_unlock(data) {
187 enteredLabel.text = ""
255 enteredLabel.text = ""
188− pinLengthTextField.text = data.pinLength
256+ minPinLengthTextField.text = data.minPinLength
257+ maxPinLengthTextField.text = data.maxPinLength
189 LightDM.Greeter.authenticate(data.username)
258 LightDM.Greeter.authenticate(data.username)
190− waitForRendering(lockscreen)
259+ waitForLockscreenReady();
191
260
192 var inputField = findChild(lockscreen, "pinentryField")
261 var inputField = findChild(lockscreen, "pinentryField")
193 if (data.alphanumeric) {
262 if (data.alphanumeric) {
194 mouseClick(inputField, units.gu(1), units.gu(1))
263 mouseClick(inputField, units.gu(1), units.gu(1))
264+ tryCompare(inputField, "focus", true);
195 typeString(data.password)
265 typeString(data.password)
196 keyClick(Qt.Key_Enter)
266 keyClick(Qt.Key_Enter)
197 } else {
267 } else {
@@ -200,7 +270,7 @@ Rectangle {
200 var button = findChild(lockscreen, "pinPadButton" + character)
270 var button = findChild(lockscreen, "pinPadButton" + character)
201 mouseClick(button, units.gu(1), units.gu(1))
271 mouseClick(button, units.gu(1), units.gu(1))
202 }
272 }
203− if (data.pinLength == -1) {
273+ if (data.minPinLength !== data.maxPinLength || data.minPinLength == -1) {
204 var pinPadButtonErase = findChild(lockscreen, "pinPadButtonErase");
274 var pinPadButtonErase = findChild(lockscreen, "pinPadButtonErase");
205 mouseClick(pinPadButtonErase, units.gu(1), units.gu(1));
275 mouseClick(pinPadButtonErase, units.gu(1), units.gu(1));
206 }
276 }
@@ -219,11 +289,12 @@ Rectangle {
219
289
220 function test_clear(data) {
290 function test_clear(data) {
221 pinPadCheckBox.checked = data.alphanumeric
291 pinPadCheckBox.checked = data.alphanumeric
222− waitForRendering(lockscreen)
292+ waitForLockscreenReady();
223
293
224 var inputField = findChild(lockscreen, "pinentryField")
294 var inputField = findChild(lockscreen, "pinentryField")
225 if (data.alphanumeric) {
295 if (data.alphanumeric) {
226 mouseClick(inputField, units.gu(1), units.gu(1))
296 mouseClick(inputField, units.gu(1), units.gu(1))
297+ tryCompare(inputField, "activeFocus", true);
227 typeString("1")
298 typeString("1")
228 } else {
299 } else {
229 var button = findChild(lockscreen, "pinPadButton1")
300 var button = findChild(lockscreen, "pinPadButton1")
@@ -239,6 +310,16 @@ Rectangle {
239
310
240 wait(0) // Trigger event loop to make sure the animation would start running
311 wait(0) // Trigger event loop to make sure the animation would start running
241 compare(animation.running, data.animation)
312 compare(animation.running, data.animation)
313+ if (data.animation) {
314+ if (data.alphanumeric) {
315+ tryCompare(inputField, "placeholderText", lockscreen.wrongPlaceholderText)
316+ tryCompare(inputField, "placeholderText", lockscreen.placeholderText)
317+ } else {
318+ var label = findChild(lockscreen, "pinentryFieldPlaceHolder");
319+ tryCompare(label, "text", lockscreen.wrongPlaceholderText)
320+ tryCompare(label, "text", lockscreen.placeholderText)
321+ }
322+ }
242
323
243 // wait for animation to finish to not disturb other tests
324 // wait for animation to finish to not disturb other tests
244 tryCompare(animation, "running", false)
325 tryCompare(animation, "running", false)
@@ -246,33 +327,130 @@ Rectangle {
246
327
247 function test_backspace_data() {
328 function test_backspace_data() {
248 return [
329 return [
249− {tag: "fixed length", pinLength: 4},
330+ {tag: "fixed length", minPinLength: 4, maxPinLength: 4},
250− {tag: "variable length", pinLength: -1}
331+ {tag: "variable undefined length", minPinLength: -1, maxPinLength: -1},
332+ {tag: "variable restricted length", minPinLength: 4, maxPinLength: 8}
251 ];
333 ];
252 }
334 }
253
335
254 function test_backspace(data) {
336 function test_backspace(data) {
255 pinPadCheckBox.checked = false
337 pinPadCheckBox.checked = false
256− pinLengthTextField.text = data.pinLength
338+ minPinLengthTextField.text = data.minPinLength
257− waitForRendering(lockscreen);
339+ maxPinLengthTextField.text = data.maxPinLength
340+ waitForLockscreenReady();
258
341
259 var pinPadButtonErase = findChild(lockscreen, "pinPadButtonErase");
342 var pinPadButtonErase = findChild(lockscreen, "pinPadButtonErase");
260 var backspaceIcon = findChild(lockscreen, "backspaceIcon");
343 var backspaceIcon = findChild(lockscreen, "backspaceIcon");
261 var pinEntryField = findChild(lockscreen, "pinentryField");
344 var pinEntryField = findChild(lockscreen, "pinentryField");
262
345
346+ var autoConfirmEnabled = data.minPinLength === data.maxPinLength && data.minPinLength !== -1;
263− compare(pinPadButtonErase.iconName, data.pinLength == -1 ? "" : "erase");
347+ compare(pinPadButtonErase.iconName, autoConfirmEnabled ? "erase" : "");
264− compare(backspaceIcon.visible, data.pinLength == -1);
348+ compare(backspaceIcon.visible, !autoConfirmEnabled);
265
349
266 var pinPadButton5 = findChild(lockscreen, "pinPadButton5");
350 var pinPadButton5 = findChild(lockscreen, "pinPadButton5");
267 mouseClick(pinPadButton5, units.gu(1), units.gu(1));
351 mouseClick(pinPadButton5, units.gu(1), units.gu(1));
268 compare(pinEntryField.text, "5");
352 compare(pinEntryField.text, "5");
269
353
270− if (data.pinLength == -1) {
354+ if (data.minPinLength !== data.maxPinLength) {
271 mouseClick(backspaceIcon, units.gu(1), units.gu(1));
355 mouseClick(backspaceIcon, units.gu(1), units.gu(1));
272 } else {
356 } else {
273 mouseClick(pinPadButtonErase, units.gu(1), units.gu(1));
357 mouseClick(pinPadButtonErase, units.gu(1), units.gu(1));
274 }
358 }
275 compare(pinEntryField.text, "");
359 compare(pinEntryField.text, "");
276 }
360 }
361+
362+ function test_minMaxLength_data() {
363+ return [
364+ {tag: "undefined", minPinLength: -1, maxPinLength: -1},
365+ {tag: "fixed", minPinLength: 4, maxPinLength: 4},
366+ {tag: "variable, limited", minPinLength: 4, maxPinLength: 8},
367+ ];
368+ }
369+
370+ function test_minMaxLength(data) {
371+ pinPadCheckBox.checked = false
372+ minPinLengthTextField.text = data.minPinLength
373+ maxPinLengthTextField.text = data.maxPinLength
374+ waitForLockscreenReady();
375+
376+ var pinPadButton5 = findChild(lockscreen, "pinPadButton5");
377+ var pinPadButtonErase = findChild(lockscreen, "pinPadButtonErase");
378+ var inputField = findChild(lockscreen, "pinentryField")
379+
380+ for (var i = 0; i < 10; i++) {
381+ mouseClick(pinPadButton5, units.gu(1), units.gu(1));
382+
383+ if (data.minPinLength == data.maxPinLength && data.minPinLength != -1) {
384+ // auto confirm mode...
385+ compare(inputField.text.length, (i+1) % data.minPinLength);
386+ } else {
387+ // manual confirm mode
388+ tryCompare(pinPadButtonErase, "enabled", (i+1) >= data.minPinLength)
389+ if (data.maxPinLength == -1) {
390+ compare(inputField.text.length, i+1);
391+ } else {
392+ compare(inputField.text.length, Math.min(data.maxPinLength, i+1));
393+ }
394+
395+ }
396+ }
397+ }
398+
399+ function test_retryDisplay_data() {
400+ return [
401+ {tag: "empty", retryText: "", shown: false},
402+ {tag: "3 retries left", retryText: "3 retries left", shown: true},
403+ ]
404+ }
405+
406+ function test_retryDisplay(data) {
407+ pinPadCheckBox.checked = false
408+ waitForLockscreenReady();
409+
410+ retryCountTextField.text = data.retryText;
411+ var label = findChild(lockscreen, "retryCountLabel")
412+ compare(label.visible, data.shown);
413+ }
414+
415+ function test_infoPopup() {
416+ verify(findChild(root, "infoPopup") === null);
417+ lockscreen.showInfoPopup("foo", "bar");
418+ tryCompareFunction(function() { return findChild(root, "infoPopup") !== null}, true);
419+
420+ var infoPopup = findChild(root, "infoPopup");
421+ compare(infoPopup.title, "foo");
422+ compare(infoPopup.text, "bar");
423+
424+ signalSpy.signalName = "infoPopupConfirmed"
425+ signalSpy.clear();
426+
427+ var okButton = findChild(root, "infoPopupOkButton");
428+ mouseClick(okButton, okButton.width / 2, okButton.height / 2);
429+
430+ tryCompareFunction(function() { return findChild(root, "infoPopup") === null}, true);
431+
432+ tryCompare(signalSpy, "count", 1);
433+ }
434+
435+ function test_infoTextDisplay_data() {
436+ return [
437+ {tag: "empty string", text: "", shown: false},
438+ {tag: "hello world", text: "hello world", shown: true},
439+ ]
440+ }
441+
442+ function test_infoTextDisplay(data) {
443+ pinPadCheckBox.checked = false
444+ waitForLockscreenReady();
445+
446+ infoTextTextField.text = data.text;
447+ var label = findChild(lockscreen, "infoTextLabel")
448+ compare(label.visible, data.shown);
449+ }
450+ }
451+
452+ SignalSpy {
453+ id: signalSpy
454+ target: lockscreen
277 }
455 }
278}
456}
tests/qmltests/Greeter/tst_Tablet.qml → tests/qmltests/Greeter/tst_MultiGreeter.qmlrenamed+1−1
@@ -61,7 +61,7 @@ Item {
61 }
61 }
62
62
63 UT.UnityTestCase {
63 UT.UnityTestCase {
64− name: "Greeter"
64+ name: "MultiGreeter"
65 when: windowShown
65 when: windowShown
66
66
67 function select_index(i) {
67 function select_index(i) {
tests/qmltests/Greeter/tst_Phone.qml → tests/qmltests/Greeter/tst_SingleGreeter.qmlrenamed+1−19
@@ -33,8 +33,6 @@ Item {
33 height: parent.height
33 height: parent.height
34 x: 0; y: 0
34 x: 0; y: 0
35
35
36− defaultBackground: Qt.resolvedUrl("../../../qml/graphics/phone_background.jpg")
37−
38 property int minX: 0
36 property int minX: 0
39
37
40 onXChanged: {
38 onXChanged: {
@@ -68,7 +66,7 @@ Item {
68 }
66 }
69
67
70 UT.UnityTestCase {
68 UT.UnityTestCase {
71− name: "Greeter"
69+ name: "SingleGreeter"
72 when: windowShown
70 when: windowShown
73
71
74 function cleanup() {
72 function cleanup() {
@@ -104,22 +102,6 @@ Item {
104 tryCompare(LightDM.Infographic, "username", "single")
102 tryCompare(LightDM.Infographic, "username", "single")
105 }
103 }
106
104
107− function test_background_data() {
108− return [
109− {tag: "set", accounts: Qt.resolvedUrl("../../data/unity/backgrounds/blue.png"), expected: "blue.png"},
110− {tag: "unset", accounts: "", expected: "background.jpg"},
111− {tag: "invalid", accounts: "invalid", expected: "background.jpg"},
112− ]
113− }
114−
115− function test_background(data) {
116− var loader = findChild(greeter, "greeterContentLoader")
117− var background = findChild(loader.item, "greeterBackground")
118− AccountsService.backgroundFile = data.accounts
119− tryCompareFunction(function() { return background.source.toString().indexOf(data.expected) !== -1; }, true)
120− tryCompare(background, "status", Image.Ready)
121− }
122−
123 function test_initial_selected_signal() {
105 function test_initial_selected_signal() {
124 var greeterObj = greeterComponent.createObject(this)
106 var greeterObj = greeterComponent.createObject(this)
125 var spy = findChild(greeterObj, "selectedSpy")
107 var spy = findChild(greeterObj, "selectedSpy")
tests/qmltests/tst_Shell.qml−9
@@ -475,15 +475,6 @@ Item {
475 } while (!isStill);
475 } while (!isStill);
476 }
476 }
477
477
478− function test_background_data() {
479− return [
480− {tag: "red", url: Qt.resolvedUrl("../data/unity/backgrounds/red.png"), expectedUrl: "tests/data/unity/backgrounds/red.png"},
481− {tag: "blue", url: Qt.resolvedUrl("../data/unity/backgrounds/blue.png"), expectedUrl: "tests/data/unity/backgrounds/blue.png"},
482− {tag: "invalid", url: "invalid", expectedUrl: shell.defaultBackground},
483− {tag: "empty", url: "", expectedUrl: shell.defaultBackground}
484− ]
485− }
486−
487 function test_DashShown_data() {
478 function test_DashShown_data() {
488 return [
479 return [
489 {tag: "in focus", greeter: false, app: false, launcher: false, indicators: false, expectedShown: true},
480 {tag: "in focus", greeter: false, app: false, launcher: false, indicators: false, expectedShown: true},