d1fae99 · unity8 · git.iko.soy

po/ast.po+11−9

compare with xenial

unifiedsplit

@@ -8,15 +8,15 @@ msgstr ""

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

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

10"POT-Creation-Date: 2014-02-13 18:37+0000\n"

11−"PO-Revision-Date: 2013-12-11 20:45+0000\n"

11+"PO-Revision-Date: 2014-03-01 16:51+0000\n"

12−"Last-Translator: ivarela <ivarela@ubuntu.com>\n"

12+"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"

13"Language-Team: Asturian <ast@li.org>\n"

14"MIME-Version: 1.0\n"

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

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

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2014-02-19 05:44+0000\n"

18+"X-Launchpad-Export-Date: 2014-03-02 05:30+0000\n"

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

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

20

21#: plugins/Unity/Launcher/launcheritem.cpp:43

22#: plugins/Unity/Launcher/launcheritem.cpp:73

@@ -74,6 +74,8 @@ msgid ""

74"You have now mastered the edge gestures and can start using the "

75"phone<br><br>Tap on the screen to start"

76msgstr ""

77+"Agora domina los xestos de los bordes y pue principiar a usar el "

78+"teléfonu<br><br>Toque la pantalla pa comenzar"

77

79

78#: qml/Components/PageHeader.qml:340

80#: qml/Components/PageHeader.qml:340

79msgid "Recent searches"

81msgid "Recent searches"

@@ -81,11 +83,11 @@ msgstr "Busques recientes"

81

83

82#: qml/Components/SeeMore.qml:35

84#: qml/Components/SeeMore.qml:35

83msgid "See more"

85msgid "See more"

84−msgstr ""

86+msgstr "Ver más"

85

87

86#: qml/Components/SeeMore.qml:57

88#: qml/Components/SeeMore.qml:57

87msgid "See less"

89msgid "See less"

88−msgstr ""

90+msgstr "Ver menos"

89

91

90#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

92#: qml/Dash/Apps/AppPreview.qml:136 qml/Dash/Previews/PreviewRating.qml:70

91msgid "Rate this"

93msgid "Rate this"

@@ -107,11 +109,11 @@ msgstr[1] "%1 reseñes"

107

109

108#: qml/Dash/Previews/PreviewActionCombo.qml:34

110#: qml/Dash/Previews/PreviewActionCombo.qml:34

109msgid "More..."

111msgid "More..."

110−msgstr ""

112+msgstr "Más…"

111

113

112#: qml/Dash/Previews/PreviewActionCombo.qml:34

114#: qml/Dash/Previews/PreviewActionCombo.qml:34

113msgid "Less..."

115msgid "Less..."

114−msgstr ""

116+msgstr "Menos…"

115

117

116#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

118#: qml/Dash/Previews/PreviewRating.qml:114 qml/Dash/Previews/Reviews.qml:74

117msgid "Add a review"

119msgid "Add a review"

@@ -168,7 +170,7 @@ msgstr "Amosar contraseña"

168

170

169#: qml/Notifications/NotificationMenuItemFactory.qml:103

171#: qml/Notifications/NotificationMenuItemFactory.qml:103

170msgid "Please enter SIM PIN"

172msgid "Please enter SIM PIN"

171−msgstr ""

173+msgstr "Escriba'l PIN de la SIM"

172

174

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

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

174msgid "Search"

176msgid "Search"

qml/Panel/IndicatorItem.qml+13−21

@@ -19,37 +19,29 @@ import Ubuntu.Components 0.1

19import Unity.Indicators 0.1 as Indicators

20import "../Components"

21

22−Item {

22+Loader {

23− id: indicatorItem

23+ id: root

24

25− property alias widgetSource: loader.source

25+ property alias widgetSource: root.source

26 property bool dimmed: false

27 property var indicatorProperties: undefined

28− property bool indicatorVisible: loader.item ? loader.item.enabled : false

28+ property bool indicatorVisible: item ? item.enabled : false

29 property string identifier

30

31 opacity: dimmed ? 0.4 : 1

32 Behavior on opacity { UbuntuNumberAnimation { duration: UbuntuAnimation.BriskDuration } }

33

34− width: loader.item ? loader.item.width : 0

35−

36− Loader {

37− id: loader

38−

39− onLoaded: {

34+ onLoaded: {

40− item.height = Qt.binding(function() { return indicatorItem.height; });

41−

42− for(var pName in indicatorProperties) {

35+ for(var pName in indicatorProperties) {

43− if (item.hasOwnProperty(pName)) {

36+ if (item.hasOwnProperty(pName)) {

44− item[pName] = indicatorProperties[pName];

37+ item[pName] = indicatorProperties[pName];

45− }

46 }

38 }

47 }

39 }

40+ }

48

41

49− Binding {

42+ Binding {

50− target: loader.item

43+ target: item

51− property: "objectName"

44+ property: "objectName"

52− value: identifier + "-widget"

45+ value: identifier + "-widget"

53− }

54 }

46 }

55}

47}

tests/mocks/Unity/Indicators/CMakeLists.txt+1

@@ -16,6 +16,7 @@ set(IndicatorsFakeQml_SOURCES

16 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/menucontentactivator.cpp

17 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/unitymenumodelstack.cpp

18 ${CMAKE_SOURCE_DIR}/plugins/Unity/Indicators/visibleindicatorsmodel.cpp

19+ fakeindicatorsmodel.cpp

19)

20)

20

21

21set(IndicatorsFakeQml_RESOURCES

22set(IndicatorsFakeQml_RESOURCES

tests/mocks/Unity/Indicators/IndicatorsModel.qml+3−5

@@ -17,12 +17,10 @@

17import QtQuick 2.0

18import Unity.Indicators 0.1 as Indicators

19

20−ListModel {

20+Indicators.FakeIndicatorsModel {

21

22− property var indicatorData : undefined

23−

24− function load() {

22+ function load(profile) {

25− clear();

23+ unload();

26

24

27 append({ "identifier": "indicator-fake1",

25 append({ "identifier": "indicator-fake1",

28 "position": 0,

26 "position": 0,

tests/mocks/Unity/Indicators/fakeindicatorsmodel.cppnew file+122

@@ -0,0 +1,122 @@

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ *

16+ * Authors:

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

18+ */

19+

20+#include "fakeindicatorsmodel.h"

21+#include "indicators.h"

22+

23+#include <paths.h>

24+

25+#include <QQmlContext>

26+#include <QQmlEngine>

27+#include <QDebug>

28+

29+FakeIndicatorsModel::FakeIndicatorsModel(QObject *parent)

30+ : QAbstractListModel(parent)

31+{

32+ QObject::connect(this, SIGNAL(rowsInserted(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

33+ QObject::connect(this, SIGNAL(rowsRemoved(const QModelIndex &, int, int)), this, SIGNAL(countChanged()));

34+ QObject::connect(this, SIGNAL(modelReset()), this, SIGNAL(countChanged()));

35+}

36+

37+/*! \internal */

38+FakeIndicatorsModel::~FakeIndicatorsModel()

39+{

40+ unload();

41+}

42+

43+int FakeIndicatorsModel::count() const

44+{

45+ return rowCount();

46+}

47+

48+void FakeIndicatorsModel::load(const QString&)

49+{

50+}

51+

52+void FakeIndicatorsModel::unload()

53+{

54+ beginResetModel();

55+

56+ qDeleteAll(m_indicators);

57+ m_indicators.clear();

58+

59+ endResetModel();

60+}

61+

62+

63+void FakeIndicatorsModel::append(const QVariantMap& row)

64+{

65+ Indicator* new_row = new QHash<int, QVariant>();

66+ for (auto iter = row.begin(); iter != row.end(); ++iter )

67+ {

68+ int key = roleNames().key(iter.key().toUtf8(), -1);

69+ if (key != -1) {

70+ new_row->insert(key, iter.value());

71+ }

72+ }

73+

74+ beginInsertRows(QModelIndex(), m_indicators.count(), m_indicators.count());

75+

76+ m_indicators.append(new_row);

77+

78+ endInsertRows();

79+}

80+

81+QHash<int, QByteArray> FakeIndicatorsModel::roleNames() const

82+{

83+ static QHash<int, QByteArray> roles;

84+ if (roles.isEmpty())

85+ {

86+ roles[IndicatorsModelRole::Identifier] = "identifier";

87+ roles[IndicatorsModelRole::Position] = "position";

88+ roles[IndicatorsModelRole::WidgetSource] = "widgetSource";

89+ roles[IndicatorsModelRole::PageSource] = "pageSource";

90+ roles[IndicatorsModelRole::IndicatorProperties] = "indicatorProperties";

91+ }

92+ return roles;

93+}

94+

95+int FakeIndicatorsModel::columnCount(const QModelIndex &) const

96+{

97+ return 1;

98+}

99+

100+Q_INVOKABLE QVariant FakeIndicatorsModel::data(int row, int role) const

101+{

102+ return data(index(row, 0), role);

103+}

104+

105+QVariant FakeIndicatorsModel::data(const QModelIndex &index, int role) const

106+{

107+ if (!index.isValid() || index.row() >= m_indicators.size())

108+ return QVariant();

109+

110+ Indicator* indicator = m_indicators[index.row()];

111+ return indicator->value(role, QVariant());

112+}

113+

114+QModelIndex FakeIndicatorsModel::parent(const QModelIndex&) const

115+{

116+ return QModelIndex();

117+}

118+

119+int FakeIndicatorsModel::rowCount(const QModelIndex&) const

120+{

121+ return m_indicators.count();

122+}

tests/mocks/Unity/Indicators/fakeindicatorsmodel.hnew file+61

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

1+/*

3+ *

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

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

6+ * the Free Software Foundation; version 3.

7+ *

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

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

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

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

12+ *

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

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

15+ *

16+ * Authors:

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

18+ */

19+

20+#ifndef FAKE_INDICATORSMODEL_H

21+#define FAKE_INDICATORSMODEL_H

22+

23+#include <QAbstractListModel>

24+

25+class IndicatorsManager;

26+

27+class FakeIndicatorsModel : public QAbstractListModel

28+{

29+ Q_OBJECT

30+ Q_ENUMS(Roles)

31+ Q_PROPERTY(int count READ count NOTIFY countChanged)

32+public:

33+

34+ FakeIndicatorsModel(QObject *parent=0);

35+ ~FakeIndicatorsModel();

36+

37+ Q_INVOKABLE void load(const QString& profile);

38+ Q_INVOKABLE void unload();

39+

40+ Q_INVOKABLE void append(const QVariantMap& row);

41+

42+ Q_INVOKABLE QVariant data(int row, int role) const;

43+

44+ /* QAbstractItemModel */

45+ QHash<int, QByteArray> roleNames() const;

46+ int columnCount(const QModelIndex &parent = QModelIndex()) const;

47+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;

48+ QModelIndex parent (const QModelIndex &index) const;

49+ int rowCount(const QModelIndex &parent = QModelIndex()) const;

50+

51+Q_SIGNALS:

52+ void countChanged();

53+

54+private:

55+ int count() const;

56+

57+ typedef QHash<int, QVariant> Indicator;

58+ QList<Indicator*> m_indicators;

59+};

60+

61+#endif // FAKE_INDICATORSMODEL_H

tests/mocks/Unity/Indicators/fakeplugin.cpp+3

@@ -23,6 +23,7 @@

23#include "fakeplugin.h"

24

25// local

26+#include "fakeindicatorsmodel.h"

26#include "indicators.h"

27#include "indicators.h"

27#include "menucontentactivator.h"

28#include "menucontentactivator.h"

28#include "unitymenumodelstack.h"

29#include "unitymenumodelstack.h"

@@ -32,6 +33,8 @@ void IndicatorsFakePlugin::registerTypes(const char * uri)

32{

33{

33 Q_INIT_RESOURCE(indicators_fake);

34 Q_INIT_RESOURCE(indicators_fake);

34

35

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

37+

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

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

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

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

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

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

tests/qmltests/Panel/tst_IndicatorRow.qml+3−3

@@ -70,13 +70,13 @@ Item {

70 function test_set_current_item() {

71 init_test();

72 indicatorRow.setCurrentItemIndex(0);

73− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake1", "Incorrect item at position 0");

73+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake1", "Incorrect item at position 0");

74

75 indicatorRow.setCurrentItemIndex(1);

76− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake2", "Incorrect item at position 1");

76+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake2", "Incorrect item at position 1");

77

78 indicatorRow.setCurrentItemIndex(2);

79− compare(indicatorRow.indicatorsModel.get(indicatorRow.currentItemIndex).identifier, "indicator-fake3", "Incorrect item at position 2");

79+ compare(indicatorRow.indicatorsModel.data(indicatorRow.currentItemIndex, Indicators.IndicatorsModelRole.Identifier), "indicator-fake3", "Incorrect item at position 2");

80 }

81

82 function test_highlight_data() {

tests/qmltests/Panel/tst_MenuContent.qml+1−1

@@ -133,7 +133,7 @@ Item {

133 var menuIndex = i%menuCount;

134

135 activate_content(menuIndex);

136− testTabObjectName = indicatorsModel.get(menuIndex).identifier;

136+ testTabObjectName = indicatorsModel.data(menuIndex, Indicators.IndicatorsModelRole.Identifier);

137 compare(tabs.selectedTabIndex, menuIndex, "Current tab index does not match selected tab index");

138 tryCompareFunction(selected_tab_equals_test_tab, true);

139 }