git.iko.soy/unity8

on xenial help sign in

CMakeLists.txt+2−1

@@ -13,8 +13,9 @@ endif()

1313

1414set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)

1515

16−# Instruct CMake to run moc automatically when needed.

16+# Instruct CMake to run moc and rcc automatically when needed.

1717set(CMAKE_AUTOMOC ON)

18+set(CMAKE_AUTORCC ON)

1819

1920# enable QML debugging

2021string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.

cmake/modules/QmlTest.cmake+1

@@ -127,6 +127,7 @@ function(add_executable_test COMPONENT_NAME TARGET)

127127 file(MAKE_DIRECTORY ${ARTIFACTS_DIR}/${path})

128128 set(file_logger -o ${ARTIFACTS_DIR}/${path}/test${COMPONENT_NAME}.xml,xunitxml)

129129 else()

130+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

130131 set(file_logger -o ${CMAKE_CURRENT_BINARY_DIR}/test${COMPONENT_NAME}.xml,xunitxml)

131132 endif()

132133

debian/changelog+23

@@ -1,3 +1,26 @@

1+unity8 (8.11+15.10.20150922.1-0ubuntu1) wily; urgency=medium

2+

3+ [ Albert Astals Cid ]

4+ * Adapt test to code changes

5+ * Add DEP-8 test for all our UI and unit tests

6+ * Keep the PreviewStack around to avoid mem leaks (LP: #1495467)

7+

8+ [ CI Train Bot ]

9+ * Resync trunk.

10+

11+ [ Michael Terry ]

12+ * When libusermetrics gives us an empty string, still show the

13+ infographic circle rather than hiding it. This is a follow-on to a

14+ branch [1] that changes the "no data available" label to the empty

15+ string.

16+

17+ [ Michał Sawicz ]

18+ * Add DEP-8 test for all our UI and unit tests

19+ * Fix integrated LightDM path

20+ * Resync trunk

21+

22+ -- Michał Sawicz <michal.sawicz@canonical.com> Tue, 22 Sep 2015 12:57:15 +0000

23+

124unity8 (8.11+15.10.20150915-0ubuntu1) wily; urgency=medium

225

326 [ Albert Astals Cid ]

debian/tests/controlnew file+5

@@ -0,0 +1,5 @@

1+Tests: qmluitests.sh

2+Restrictions: allow-stderr

3+Depends: @,

4+ @builddeps@,

5+ xvfb,

debian/tests/qmluitests.shnew file+19

@@ -0,0 +1,19 @@

1+#!/bin/sh

2+

3+SHELL_QML_PATH=$(pkg-config --variable=plugindir unity-shell-api)

4+UNITY_SOURCE_DIR=$(readlink -f $(dirname $(readlink -f $0))/../..)

5+

6+dh_auto_configure -- -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \

7+ -DARTIFACTS_DIR=${ADT_ARTIFACTS} \

8+ -DUNITY_PLUGINPATH=${SHELL_QML_PATH} \

9+ -DUNITY_MOCKPATH=${SHELL_QML_PATH}/mocks

10+dh_auto_build --parallel -- -C tests/mocks

11+dh_auto_build --parallel -- -C tests/plugins

12+dh_auto_build --parallel -- -C tests/qmltests

13+dh_auto_build --parallel -- -C tests/uqmlscene

14+dh_auto_build --parallel -- -C tests/utils

15+

16+export UNITY_SOURCE_DIR

17+

18+# FIXME: --parallel here causes some failures

19+dh_auto_build -- -k xvfballtests

include/paths.h.in+16−10

@@ -33,11 +33,21 @@ inline bool isRunningInstalled() {

3333 return installed;

3434}

3535

36+inline QString buildDirectory() {

37+ if (!qEnvironmentVariableIsEmpty("UNITY_BINARY_DIR")) return qgetenv("UNITY_BINARY_DIR");

38+ return QStringLiteral("@CMAKE_BINARY_DIR@");

39+}

40+

41+inline QString sourceDirectory() {

42+ if (!qEnvironmentVariableIsEmpty("UNITY_SOURCE_DIR")) return qgetenv("UNITY_SOURCE_DIR");

43+ return QStringLiteral("@CMAKE_SOURCE_DIR@");

44+}

45+

3646inline QString translationDirectory() {

3747 if (isRunningInstalled()) {

3848 return QStringLiteral("@CMAKE_INSTALL_PREFIX@/share/locale");

3949 } else {

40− return QStringLiteral("@CMAKE_BINARY_DIR@/po/locale");

50+ return QString(buildDirectory() + "/po/locale");

4151 }

4252}

4353

@@ -45,14 +55,14 @@ inline QString qmlDirectory() {

4555 if (isRunningInstalled()) {

4656 return QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_APP_DIR@/");

4757 } else {

48− return QStringLiteral("@CMAKE_SOURCE_DIR@/qml/");

58+ return QString(sourceDirectory() + "/qml");

4959 }

5060}

5161

5262inline QStringList overrideImportPaths() {

5363 QStringList paths;

5464 if (!isRunningInstalled()) {

55− paths << QStringLiteral("@CMAKE_BINARY_DIR@/plugins");

65+ paths << QString(buildDirectory() + "/plugins");

5666 }

5767 return paths;

5868}

@@ -62,7 +72,7 @@ inline QStringList nonMirImportPaths() {

6272 if (isRunningInstalled()) {

6373 paths << QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/nonmirplugins");

6474 } else {

65− paths << QStringLiteral("@CMAKE_BINARY_DIR@/nonmirplugins");

75+ paths << QString(buildDirectory() + "/nonmirplugins");

6676 }

6777 return paths;

6878}

@@ -77,7 +87,7 @@ inline QStringList fallbackImportPaths() {

7787 } else {

7888 paths << QStringLiteral("@USS_PRIVATE_PLUGINDIR@");

7989 paths << QStringLiteral("@SHELL_PLUGINDIR@");

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

90+ paths << QString(buildDirectory() + "/tests/mocks");

8191 }

8292 return paths;

8393}

@@ -86,7 +96,7 @@ inline QString mockPluginsDir() {

8696 if (isRunningInstalled()) {

8797 return QStringLiteral("@CMAKE_INSTALL_PREFIX@/@SHELL_INSTALL_QML@/mocks");

8898 } else {

89− return QStringLiteral("@CMAKE_BINARY_DIR@/tests/mocks");

99+ return QString(buildDirectory() + "/tests/mocks");

90100 }

91101}

92102

@@ -99,10 +109,6 @@ inline QStringList shellDataDirs() {

99109 return dirs;

100110}

101111

102−inline QString sourceDirectory() {

103− return QStringLiteral("@CMAKE_SOURCE_DIR@/");

104−}

105−

106112inline void prependImportPaths(QQmlEngine *engine, const QStringList &paths)

107113{

108114 QStringList importPathList = engine->importPathList();

plugins/IntegratedLightDM/liblightdm/CMakeLists.txt+1−1

@@ -33,5 +33,5 @@ set_target_properties(MockLightDM-demo-shared PROPERTIES

3333 OUTPUT_NAME lightdm-qt5-2)

3434

3535install(TARGETS MockLightDM-demo-shared

36− DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/demo

36+ DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/demo

3737 )

plugins/ScreenGrabber/screengrabber.cpp+4−2

@@ -19,6 +19,7 @@

1919#include <QDir>

2020#include <QDateTime>

2121#include <QStandardPaths>

22+#include <QTemporaryDir>

2223#include <QtGui/QImage>

2324#include <QtGui/QGuiApplication>

2425#include <QtQuick/QQuickWindow>

@@ -42,8 +43,9 @@ ScreenGrabber::ScreenGrabber(QObject *parent)

4243 QDir screenshotsDir;

4344 if (qEnvironmentVariableIsSet("UNITY_TESTING")) {

4445 qDebug() << "Using test environment";

45− QStandardPaths::setTestModeEnabled(true);

46− screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::DataLocation);

46+ QTemporaryDir tDir;

47+ tDir.setAutoRemove(false);

48+ screenshotsDir = tDir.path();

4749 } else {

4850 qDebug() << "Using real environment";

4951 screenshotsDir = QStandardPaths::writableLocation(QStandardPaths::PicturesLocation);

plugins/Wizard/System.cpp+11−3

@@ -33,8 +33,10 @@ System::System()

3333 // Register the argument needed for UpdateActivationEnvironment below

3434 qDBusRegisterMetaType<QMap<QString,QString>>();

3535

36− m_fsWatcher.addPath(wizardEnabledPath());

37− connect(&m_fsWatcher, &QFileSystemWatcher::fileChanged, this, &System::wizardEnabledChanged);

36+ if(!wizardEnabled()) {

37+ m_fsWatcher.addPath(wizardEnabledPath());

38+ }

39+ connect(&m_fsWatcher, &QFileSystemWatcher::fileChanged, this, &System::watcherFileChanged);

3840}

3941

4042QString System::wizardEnabledPath()

@@ -59,10 +61,16 @@ void System::setWizardEnabled(bool enabled)

5961 QDir(wizardEnabledPath()).mkpath(QStringLiteral(".."));

6062 QFile(wizardEnabledPath()).open(QIODevice::WriteOnly);

6163 m_fsWatcher.addPath(wizardEnabledPath());

62− wizardEnabledChanged();

64+ Q_EMIT wizardEnabledChanged();

6365 }

6466}

6567

68+void System::watcherFileChanged()

69+{

70+ Q_EMIT wizardEnabledChanged();

71+ m_fsWatcher.removePath(wizardEnabledPath());

72+}

73+

6674void System::setSessionVariable(const QString &variable, const QString &value)

6775{

6876 // We need to update both upstart's and DBus's environment

plugins/Wizard/System.h+3

@@ -38,6 +38,9 @@ public Q_SLOTS:

3838Q_SIGNALS:

3939 void wizardEnabledChanged();

4040

41+private Q_SLOTS:

42+ void watcherFileChanged();

43+

4144private:

4245 Q_DISABLE_COPY(System)

4346

po/am.po+4−9

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-04 14:46+0000\n"

1212"Last-Translator: samson <Unknown>\n"

1313"Language-Team: Amharic <am@li.org>\n"

14−"Language: am\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=2; plural=n > 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -794,8 +793,7 @@ msgstr "%1 〉"

794793#~ "You have now mastered the edge gestures and can start using the "

795794#~ "phone<br><br>Tap on the screen to start"

796795#~ msgstr ""

797−#~ "አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ "

798−#~ "ለመጀመር"

796+#~ "አሁን የ ጠርዝ እንቅስቃሴን አውቀዋል እና መጀመር ይችላሉ ስልኩን መጠቀም <br><br>መመልከቻውን መታ ያድርጉ ለመጀመር"

799797

800798#~ msgid "Restart"

801799#~ msgstr "እንደገና ማስጀመሪያ"

@@ -805,6 +803,3 @@ msgstr "%1 〉"

805803

806804#~ msgid "Please re-enter"

807805#~ msgstr "እባክዎን እንደገና-ያስገቡ"

808−

809−#~ msgid "Click here to finish."

810−#~ msgstr "ለመጨረስ እዚህ ይጫኑ"

po/ar.po+7−10

@@ -6,19 +6,18 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-29 09:41+0000\n"

1212"Last-Translator: Ibrahim Saed <ibraheem5000@gmail.com>\n"

1313"Language-Team: Arabic <ar@li.org>\n"

14−"Language: ar\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "

1918"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2221

2322#: plugins/LightDM/Greeter.cpp:112

2423msgid "Password: "

@@ -593,7 +592,8 @@ msgstr "أدخِل شريحة SIM ثم أعِد تشغيل الجهاز"

593592

594593#: qml/Wizard/Pages/20-sim.qml:59

595594msgid "Without it, you won’t be able to make calls or use text messaging."

596−msgstr "بدونها لن تتمكن من إجراء أي مكالمات هاتفية أو استخدام الرسائل النصية."

595+msgstr ""

596+"بدونها لن تتمكن من إجراء أي مكالمات هاتفية أو استخدام الرسائل النصية."

597597

598598#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

599599msgid "Skip"

@@ -783,11 +783,8 @@ msgstr ""

783783#~ "You have now mastered the edge gestures and can start using the "

784784#~ "phone<br><br>Tap on the screen to start"

785785#~ msgstr ""

786−#~ "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر "

787−#~ "على الشاشة للبدء"

786+#~ "أنت الآن بارع في إيماءات الحواف ويمكنك البدء باستخدام هاتفك<br><br>انقر على "

787+#~ "الشاشة للبدء"

788788

789789#~ msgid "Please re-enter"

790790#~ msgstr "برجاء إعادة إدخالها"

791−

792−#~ msgid "Click here to finish."

793−#~ msgstr "انقر هنا للإنهاء."

po/ast.po+9−11

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-06-11 23:39+0000\n"

1212"Last-Translator: enolp <enolp@softastur.org>\n"

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

14−"Language: ast\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -126,7 +125,8 @@ msgstr "Quedasti bloquiáu polos escesivos intentos fallíos de fras de pasu."

126125

127126#: qml/Components/DelayedLockscreen.qml:65

128127msgid "You have been locked out due to too many failed passcode attempts."

129−msgstr "Quedasti bloquiáu polos escesivos intentos fallíos de códigu de pasu."

128+msgstr ""

129+"Quedasti bloquiáu polos escesivos intentos fallíos de códigu de pasu."

130130

131131#: qml/Components/DelayedLockscreen.qml:74

132132#, qt-format

@@ -648,7 +648,8 @@ msgstr "Namái usando GPS (menos precisión)"

648648

649649#: qml/Wizard/Pages/50-location.qml:86

650650msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

651−msgstr "Usando GPS, Wi-fi anónimes ya información de redes móviles (aconseyao)"

651+msgstr ""

652+"Usando GPS, Wi-fi anónimes ya información de redes móviles (aconseyao)"

652653

653654#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

654655#: qml/Wizard/Pages/50-location.qml:103

@@ -741,8 +742,8 @@ msgstr "%1 〉"

741742

742743#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

743744#~ msgstr ""

744−#~ "Esliza'l deu dende la esquierda p'amosar el llanzador y acceder "

745−#~ "rápidamente a les aplicaciones"

745+#~ "Esliza'l deu dende la esquierda p'amosar el llanzador y acceder rápidamente "

746+#~ "a les aplicaciones"

746747

747748#~ msgid "Well done"

748749#~ msgstr "Bien fecho"

@@ -808,8 +809,5 @@ msgstr "%1 〉"

808809#~ msgid "Manage Scopes"

809810#~ msgstr "Xestionar ámbitos"

810811

811−#~ msgid "Click here to finish."

812−#~ msgstr "Primi equí pa finar."

813−

814812#~ msgid "Please re-enter"

815813#~ msgstr "Por favor, reintroduzla"

po/az.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/be.po+9−12

@@ -6,19 +6,18 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-04-27 14:34+0000\n"

1212"Last-Translator: Arsień Šachalevič <semen.shah@gmail.com>\n"

1313"Language-Team: Belarusian <be@li.org>\n"

14−"Language: be\n"

1514"MIME-Version: 1.0\n"

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

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

18−"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"

19−"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

17+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2221

2322#: plugins/LightDM/Greeter.cpp:112

2423msgid "Password: "

@@ -123,7 +122,8 @@ msgstr "Прылада заблакаваная"

123122

124123#: qml/Components/DelayedLockscreen.qml:64

125124msgid "You have been locked out due to too many failed passphrase attempts."

126−msgstr "Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў."

125+msgstr ""

126+"Вы былі заблакаваныя з-за занадта вялікай колькасці няўдалых спробаў."

127127

128128#: qml/Components/DelayedLockscreen.qml:65

129129msgid "You have been locked out due to too many failed passcode attempts."

@@ -773,8 +773,8 @@ msgstr "%1 〉"

773773

774774#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

775775#~ msgstr ""

776−#~ "Правядзіце пальцам ад левага краю, каб адкрыць панэль запуску для "

777−#~ "паскарэння доступу да праграм"

776+#~ "Правядзіце пальцам ад левага краю, каб адкрыць панэль запуску для паскарэння "

777+#~ "доступу да праграм"

778778

779779#~ msgid "Skip intro"

780780#~ msgstr "Прапусціць уводзіны"

@@ -804,6 +804,3 @@ msgstr "%1 〉"

804804

805805#~ msgid "Please re-enter"

806806#~ msgstr "Калі ласка, паўтарыце ўвод"

807−

808−#~ msgid "Click here to finish."

809−#~ msgstr "Націсніце тут для завяршэння."

po/bg.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/br.po+11−15

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-08-25 14:12+0000\n"

1212"Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"

1313"Language-Team: Breton <br@li.org>\n"

14−"Language: br\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=2; plural=n > 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -594,7 +593,8 @@ msgstr "Surentez ar prennañ"

594593

595594#: qml/Wizard/Pages/30-passwd-type.qml:74

596595msgid "Please select how you’d like to unlock your phone."

597−msgstr "Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."

596+msgstr ""

597+"Diuzit e peseurt mod e fell deoc'h dibrennañ ho pellgomzer, mar plij."

598598

599599#: qml/Wizard/Pages/30-passwd-type.qml:97

600600msgctxt "Label: Type of security method"

@@ -652,7 +652,8 @@ msgstr "Implijout ar GPS hepken (n'eo ket ken resis)"

652652

653653#: qml/Wizard/Pages/50-location.qml:86

654654msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

655−msgstr "Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"

655+msgstr ""

656+"Implijout ar GPS, Wi-Fi dizanv pe titouroù ar rouedad kelligel (aliet)"

656657

657658#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

658659#: qml/Wizard/Pages/50-location.qml:103

@@ -758,13 +759,11 @@ msgstr "%1 〉"

758759

759760#~ msgid "Try swiping from the top edge to access the indicators"

760761#~ msgstr ""

761−#~ "Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war "

762−#~ "wel."

762+#~ "Lakait ho piz da riklañ adalek ar bord uhelañ da lakaat ar merkerioù war wel."

763763

764764#~ msgid "Swipe up again to close the settings screen"

765765#~ msgstr ""

766−#~ "Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an "

767−#~ "arventennoù"

766+#~ "Lakait ho piz da riklañ war-du ar bord uhelañ da serriñ skramm an arventennoù"

768767

769768#~ msgid "Try swiping from the right edge to unlock the phone"

770769#~ msgstr ""

@@ -772,8 +771,8 @@ msgstr "%1 〉"

772771

773772#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

774773#~ msgstr ""

775−#~ "Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser "

776−#~ "arloadoù prim."

774+#~ "Lakait ho piz da riklañ adalek ar bord kleiz da ziskouez al lañser arloadoù "

775+#~ "prim."

777776

778777#~ msgid "Well done"

779778#~ msgstr "Gourc'hemennoù !"

@@ -819,6 +818,3 @@ msgstr "%1 〉"

819818

820819#~ msgid "Please re-enter"

821820#~ msgstr "Adverkañ, mar plij"

822−

823−#~ msgid "Click here to finish."

824−#~ msgstr "Klikit amañ evit echuiñ."

po/bs.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

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

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2121

2222#: plugins/LightDM/Greeter.cpp:112

2323msgid "Password: "

po/ca.po+6−11

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-04 09:48+0000\n"

1212"Last-Translator: David Planella <david.planella@ubuntu.com>\n"

1313"Language-Team: Catalan <ca@li.org>\n"

14−"Language: ca\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -756,8 +755,7 @@ msgstr "%1 〉"

756755

757756#~ msgid "Try swiping from the top edge to access the indicators"

758757#~ msgstr ""

759−#~ "Proveu de lliscar el dit des de la vora superior per accedir als "

760−#~ "indicadors"

758+#~ "Proveu de lliscar el dit des de la vora superior per accedir als indicadors"

761759

762760#~ msgid "Close"

763761#~ msgstr "Tanca"

@@ -769,8 +767,8 @@ msgstr "%1 〉"

769767

770768#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

771769#~ msgstr ""

772−#~ "Llisqueu el dit des de la vora esquerra per mostrar el llançador i "

773−#~ "accedir ràpidament a les aplicacions"

770+#~ "Llisqueu el dit des de la vora esquerra per mostrar el llançador i accedir "

771+#~ "ràpidament a les aplicacions"

774772

775773#~ msgid "Skip intro"

776774#~ msgstr "Omet la introducció"

@@ -824,6 +822,3 @@ msgstr "%1 〉"

824822

825823#~ msgid "Manage Scopes"

826824#~ msgstr "Gestioneu les lents"

827−

828−#~ msgid "Click here to finish."

829−#~ msgstr "Feu un toc aquí per finalitzar"

po/ca@valencia.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/ce.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/ckb.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/cs.po+10−11

@@ -6,18 +6,18 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-07 10:44+0000\n"

1212"Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n"

1313"Language-Team: Czech <cs@li.org>\n"

14−"Language: cs\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

20+"Language: cs\n"

2121

2222#: plugins/LightDM/Greeter.cpp:112

2323msgid "Password: "

@@ -122,11 +122,13 @@ msgstr "Zařízení uzamčeno"

122122

123123#: qml/Components/DelayedLockscreen.qml:64

124124msgid "You have been locked out due to too many failed passphrase attempts."

125−msgstr "Zařízení bylo uzamčeno z důvodu mnoha neúspěšných pokusů o přihlášení."

125+msgstr ""

126+"Zařízení bylo uzamčeno z důvodu mnoha neúspěšných pokusů o přihlášení."

126127

127128#: qml/Components/DelayedLockscreen.qml:65

128129msgid "You have been locked out due to too many failed passcode attempts."

129−msgstr "Zařízení bylo uzamčeno z důvodu mnoha neúspěšných pokusů o přihlášení."

130+msgstr ""

131+"Zařízení bylo uzamčeno z důvodu mnoha neúspěšných pokusů o přihlášení."

130132

131133#: qml/Components/DelayedLockscreen.qml:74

132134#, qt-format

@@ -689,8 +691,8 @@ msgid ""

689691"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

690692"Privacy</b>"

691693msgstr ""

692−"To může být vypnuto v <b>Nastavení systému</b> v <b>Zabezpečení a soukromí</"

693−"b>"

694+"To může být vypnuto v <b>Nastavení systému</b> v <b>Zabezpečení a "

695+"soukromí</b>"

694696

695697#: qml/Wizard/Pages/80-finished.qml:24

696698msgid "All done"

@@ -770,6 +772,3 @@ msgstr "%1 〉"

770772

771773#~ msgid "Please re-enter"

772774#~ msgstr "Vložte znovu"

773−

774−#~ msgid "Click here to finish."

775−#~ msgstr "Klikněte zde pro dokončení."

po/cy.po+5−9

@@ -6,19 +6,18 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-31 13:21+0000\n"

1212"Last-Translator: Owen Llywelyn <owen.llywelyn@gmail.com>\n"

1313"Language-Team: Welsh <cy@li.org>\n"

14−"Language: cy\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : (n != 8 && n != 11) ? "

1918"2 : 3;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2221

2322#: plugins/LightDM/Greeter.cpp:112

2423msgid "Password: "

@@ -668,8 +667,8 @@ msgid ""

668667"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

669668"conditions</a>."

670669msgstr ""

671−"Drwy ddewis yr opsiwn yma rydych yn cytuno i <a href='#'>dermau ac amodau</"

672−"a> Nokia HERE."

670+"Drwy ddewis yr opsiwn yma rydych yn cytuno i <a href='#'>dermau ac "

671+"amodau</a> Nokia HERE."

673672

674673#: qml/Wizard/Pages/50-location.qml:112

675674msgid "Not at all"

@@ -726,6 +725,3 @@ msgstr "〈 %1"

726725#, qt-format

727726msgid "%1 〉"

728727msgstr "%1 〉"

729−

730−#~ msgid "Click here to finish."

731−#~ msgstr "Cliciwch yma i orffen."

po/da.po+6−11

@@ -7,18 +7,17 @@

77msgid ""

88msgstr ""

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

10−"Report-Msgid-Bugs-To: \n"

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

1111"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1212"PO-Revision-Date: 2015-07-06 12:05+0000\n"

1313"Last-Translator: Folmer Fredslund <Unknown>\n"

1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"

15−"Language: da\n"

1615"MIME-Version: 1.0\n"

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

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

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

20−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2221

2322#: plugins/LightDM/Greeter.cpp:112

2423msgid "Password: "

@@ -757,8 +756,7 @@ msgstr "%1 〉"

757756#~ msgstr "Stryg op igen for at låse indstillingsskærmen"

758757

759758#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

760−#~ msgstr ""

761−#~ "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"

759+#~ msgstr "Stryg fra venstre for at vise opstarteren med hurtig adgang til apps"

762760

763761#~ msgid "Well done"

764762#~ msgstr "Godt gjort"

@@ -776,11 +774,8 @@ msgstr "%1 〉"

776774#~ "You have now mastered the edge gestures and can start using the "

777775#~ "phone<br><br>Tap on the screen to start"

778776#~ msgstr ""

779−#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge "

780−#~ "telefonen<br><br>Tryk på skærmen for at starte"

777+#~ "Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "

778+#~ "på skærmen for at starte"

781779

782780#~ msgid "Please re-enter"

783781#~ msgstr "Vær venlig at genindtaste"

784−

785−#~ msgid "Click here to finish."

786−#~ msgstr "Tryk her for at afslutte."

po/de.po+5−8

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-24 18:03+0000\n"

1212"Last-Translator: Torsten Franz <Unknown>\n"

1313"Language-Team: German <de@li.org>\n"

14−"Language: de\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -476,7 +475,8 @@ msgstr "Roaming"

476475

477476#: qml/Tutorial/TutorialBottomFinish.qml:24

478477msgid "This action does different things for different apps"

479−msgstr "Diese Aktion bewirkt verschiedene Dinge in verschiedenen Anwendungen."

478+msgstr ""

479+"Diese Aktion bewirkt verschiedene Dinge in verschiedenen Anwendungen."

480480

481481#: qml/Tutorial/TutorialBottomFinish.qml:25

482482msgid "Tap here to finish."

@@ -817,6 +817,3 @@ msgstr "%1 〉"

817817

818818#~ msgid "Please re-enter"

819819#~ msgstr "Bitte erneut eingeben"

820−

821−#~ msgid "Click here to finish."

822−#~ msgstr "Zum Abschließen bitte hier klicken."

po/el.po+5−8

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-05 21:52+0000\n"

1212"Last-Translator: Simos Xenitellis <Unknown>\n"

1313"Language-Team: Greek <el@li.org>\n"

14−"Language: el\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -478,7 +477,8 @@ msgstr "Περιαγωγή"

478477

479478#: qml/Tutorial/TutorialBottomFinish.qml:24

480479msgid "This action does different things for different apps"

481−msgstr "Αυτή η ενέργεια κάνει διαφορετικά πράγματα για διαφορετικές εφαρμογές"

480+msgstr ""

481+"Αυτή η ενέργεια κάνει διαφορετικά πράγματα για διαφορετικές εφαρμογές"

482482

483483#: qml/Tutorial/TutorialBottomFinish.qml:25

484484msgid "Tap here to finish."

@@ -819,6 +819,3 @@ msgstr "%1 〉"

819819

820820#~ msgid "Power"

821821#~ msgstr "Ενέργεια"

822−

823−#~ msgid "Click here to finish."

824−#~ msgstr "Πατήστε εδώ για τέλος."

po/en_AU.po+3−7

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-12 07:17+0000\n"

1212"Last-Translator: Jared Norris <jarednorris@ubuntu.com>\n"

1313"Language-Team: English (Australia) <en_AU@li.org>\n"

14−"Language: \n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -808,6 +807,3 @@ msgstr "%1 〉"

808807

809808#~ msgid "Please re-enter"

810809#~ msgstr "Please re-enter"

811−

812−#~ msgid "Click here to finish."

813−#~ msgstr "Click here to finish."

po/en_GB.po+5−9

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-04-23 12:59+0000\n"

1212"Last-Translator: Andi Chandler <Unknown>\n"

1313"Language-Team: English (United Kingdom) <en_GB@li.org>\n"

14−"Language: \n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -30,7 +29,7 @@ msgstr "Pin shortcut"

3029

3130#: plugins/Unity/Launcher/launcheritem.cpp:52

3231msgid "Quit"

33−msgstr ""

32+msgstr "Quit"

3433

3534#: plugins/Unity/Launcher/launcheritem.cpp:106

3635msgid "Unpin shortcut"

@@ -460,7 +459,7 @@ msgstr "Reply"

460459

461460#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204

462461msgid "Call back"

463−msgstr ""

462+msgstr "Call back"

464463

465464#: qml/Panel/Indicators/ModemInfoItem.qml:105

466465msgid "Unlock SIM"

@@ -808,6 +807,3 @@ msgstr "%1 〉"

808807

809808#~ msgid "Please re-enter"

810809#~ msgstr "Please re-enter"

811−

812−#~ msgid "Click here to finish."

813−#~ msgstr "Click here to finish."

po/eo.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/es.po+5−9

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-04 06:08+0000\n"

1212"Last-Translator: Paco Molinero <paco@byasl.com>\n"

1313"Language-Team: Spanish <es@li.org>\n"

14−"Language: es\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -774,8 +773,8 @@ msgstr "%1 〉"

774773#~ "You have now mastered the edge gestures and can start using the "

775774#~ "phone<br><br>Tap on the screen to start"

776775#~ msgstr ""

777−#~ "Ahora domina los gestos de los bordes y puede usar el "

778−#~ "teléfono<br><br>Toque la pantalla para comenzar"

776+#~ "Ahora domina los gestos de los bordes y puede usar el teléfono<br><br>Toque "

777+#~ "la pantalla para comenzar"

779778

780779#~ msgid "Power off"

781780#~ msgstr "Apagar"

@@ -815,6 +814,3 @@ msgstr "%1 〉"

815814

816815#~ msgid "Manage Scopes"

817816#~ msgstr "Administrar Scopes"

818−

819−#~ msgid "Click here to finish."

820−#~ msgstr "Pulse aquí para finalizar."

po/eu.po+5−9

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-13 23:29+0000\n"

1212"Last-Translator: Ibai Oihanguren Sala <Unknown>\n"

1313"Language-Team: Basque <eu@li.org>\n"

14−"Language: eu\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -803,8 +802,8 @@ msgstr "%1 〉"

803802

804803#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

805804#~ msgstr ""

806−#~ "Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala "

807−#~ "eskura izateko"

805+#~ "Pasatu hatza ezkerretik abiarazlea erakutsi eta aplikazioak berehala eskura "

806+#~ "izateko"

808807

809808#~ msgid "Confirm"

810809#~ msgstr "Berretsi"

@@ -814,6 +813,3 @@ msgstr "%1 〉"

814813

815814#~ msgid "Please re-enter"

816815#~ msgstr "Errepikatu"

817−

818−#~ msgid "Click here to finish."

819−#~ msgstr "Egin klik hemen amaitzeko."

po/fa.po+13−13

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-11 15:43+0000\n"

1212"Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"

1313"Language-Team: Persian <fa@li.org>\n"

14−"Language: fa\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=1; plural=0;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -122,7 +121,8 @@ msgstr "دستگاه قفل شد"

122121

123122#: qml/Components/DelayedLockscreen.qml:64

124123msgid "You have been locked out due to too many failed passphrase attempts."

125−msgstr "شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای عبارت‌عبور قفل شده‌اید."

124+msgstr ""

125+"شما به دلیل تلاش‌های بسیار زیاد شکست خورده برای عبارت‌عبور قفل شده‌اید."

126126

127127#: qml/Components/DelayedLockscreen.qml:65

128128msgid "You have been locked out due to too many failed passcode attempts."

@@ -574,7 +574,8 @@ msgstr "سیم‌کارتی افزوده و دستگاهتان را شروع م

574574

575575#: qml/Wizard/Pages/20-sim.qml:59

576576msgid "Without it, you won’t be able to make calls or use text messaging."

577−msgstr "بدون آن، نخواهید توانست تماس گرفته با از پیام‌رسانی متنی استفاده کنید."

577+msgstr ""

578+"بدون آن، نخواهید توانست تماس گرفته با از پیام‌رسانی متنی استفاده کنید."

578579

579580#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

580581msgid "Skip"

@@ -644,7 +645,8 @@ msgstr "فقط با استفاده از جی‌پی‌اس (دقّت کم‌تر

644645

645646#: qml/Wizard/Pages/50-location.qml:86

646647msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

647−msgstr "با استفاده از جی‌پی‌اس، بی‌سیم ناشناس و اطّلاعات شبکه‌ی سلّولی (پیشنهاد شده)"

648+msgstr ""

649+"با استفاده از جی‌پی‌اس، بی‌سیم ناشناس و اطّلاعات شبکه‌ی سلّولی (پیشنهاد شده)"

648650

649651#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

650652#: qml/Wizard/Pages/50-location.qml:103

@@ -680,7 +682,8 @@ msgid ""

680682"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

681683"Privacy</b>"

682684msgstr ""

683−"این می‌تواند در <b>تنظیمات سامانه</b> ذیل <b>امنیت و محرمانگی</b> غیرفعَال شود"

685+"این می‌تواند در <b>تنظیمات سامانه</b> ذیل <b>امنیت و محرمانگی</b> غیرفعَال "

686+"شود"

684687

685688#: qml/Wizard/Pages/80-finished.qml:24

686689msgid "All done"

@@ -747,8 +750,8 @@ msgstr "%1 〉"

747750#~ "You have now mastered the edge gestures and can start using the "

748751#~ "phone<br><br>Tap on the screen to start"

749752#~ msgstr ""

750−#~ "هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید "

751−#~ "استفاده از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"

753+#~ "هم اکنون در استفاده از ژست های حرکتی مهارت لازم را دارید و می‌توانید استفاده "

754+#~ "از تلفن را آغاز کنید<br><br>برای شروع صفحه را لمس کنید"

752755

753756#~ msgid "Confirm"

754757#~ msgstr "تأیید"

@@ -803,6 +806,3 @@ msgstr "%1 〉"

803806

804807#~ msgid "Manage Scopes"

805808#~ msgstr "مدیریت حوزه‌ها"

806−

807−#~ msgid "Click here to finish."

808−#~ msgstr "برای پایان اینجا کلیک کنید."

po/fi.po+5−8

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-04 18:32+0000\n"

1212"Last-Translator: Jiri Grönroos <Unknown>\n"

1313"Language-Team: Finnish <fi@li.org>\n"

14−"Language: fi\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -127,7 +126,8 @@ msgstr ""

127126

128127#: qml/Components/DelayedLockscreen.qml:65

129128msgid "You have been locked out due to too many failed passcode attempts."

130−msgstr "Laite on lukittu liian monen virheellisen suojakoodiyrityksen jälkeen."

129+msgstr ""

130+"Laite on lukittu liian monen virheellisen suojakoodiyrityksen jälkeen."

131131

132132#: qml/Components/DelayedLockscreen.qml:74

133133#, qt-format

@@ -810,6 +810,3 @@ msgstr "%1 〉"

810810

811811#~ msgid "Please re-enter"

812812#~ msgstr "Anna uudelleen"

813−

814−#~ msgid "Click here to finish."

815−#~ msgstr "Viimeistele napsauttamalla tästä."

po/fo.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/fr.po+5−9

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-27 11:47+0000\n"

1212"Last-Translator: Anne <anneonyme017@gmail.com>\n"

1313"Language-Team: French <fr@li.org>\n"

14−"Language: fr\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=2; plural=n > 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -786,8 +785,8 @@ msgstr "%1 〉"

786785

787786#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

788787#~ msgstr ""

789−#~ "Faites glisser votre doigt à partir du bord gauche pour afficher le "

790−#~ "lanceur d'applications."

788+#~ "Faites glisser votre doigt à partir du bord gauche pour afficher le lanceur "

789+#~ "d'applications."

791790

792791#~ msgid "Power off"

793792#~ msgstr "Éteindre"

@@ -827,6 +826,3 @@ msgstr "%1 〉"

827826

828827#~ msgid "Please re-enter"

829828#~ msgstr "Veuillez ressaisir"

830−

831−#~ msgid "Click here to finish."

832−#~ msgstr "Cliquez ici pour terminer."

po/ga.po+2−2

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

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

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

1717"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n==2 ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/gd.po+8−12

@@ -6,19 +6,19 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-16 10:56+0000\n"

1212"Last-Translator: GunChleoc <Unknown>\n"

1313"Language-Team: Fòram na Gàidhlig\n"

14−"Language: gd\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : "

1918"(n > 2 && n < 20) ? 2 : 3;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

21+"Language: gd\n"

2222

2323#: plugins/LightDM/Greeter.cpp:112

2424msgid "Password: "

@@ -740,8 +740,8 @@ msgstr "%1 〉"

740740

741741#~ msgid "Try swiping from the right edge to unlock the phone"

742742#~ msgstr ""

743−#~ "Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a "

744−#~ "thoirt far an fhòn"

743+#~ "Feuch is dèan grad-shlaighdeadh a-steach on oir dheas gus a' ghlas a thoirt "

744+#~ "far an fhòn"

745745

746746#~ msgid "Right edge"

747747#~ msgstr "An oir dheas"

@@ -793,9 +793,8 @@ msgstr "%1 〉"

793793#~ "You have now mastered the edge gestures and can start using the "

794794#~ "phone<br><br>Tap on the screen to start"

795795#~ msgstr ""

796−#~ "Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn "

797−#~ "dhut am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson "

798−#~ "tòiseachadh"

796+#~ "Fhuair thu air na gluasadan oire ceart a dhèanamh a-nis agus is urrainn dhut "

797+#~ "am fòn a chleachdadh<br><br>Thoir gnogag air an sgrìn airson tòiseachadh"

799798

800799#~ msgid "All"

801800#~ msgstr "Na h-uile"

@@ -833,8 +832,5 @@ msgstr "%1 〉"

833832#~ msgid "Manage Scopes"

834833#~ msgstr "Stiùirich na sgòpaichean"

835834

836−#~ msgid "Click here to finish."

837−#~ msgstr "Briog an-seo gus crìoch a chur air."

838−

839835#~ msgid "Please re-enter"

840836#~ msgstr "Cuir a-steach i a-rithist"

po/gl.po+5−8

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-08-01 03:25+0000\n"

1212"Last-Translator: Marcos Lans <Unknown>\n"

1313"Language-Team: Galician <gl@li.org>\n"

14−"Language: gl\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -576,7 +575,8 @@ msgstr "Engada unha tarxeta SIM e reinicie o dispositivo"

576575

577576#: qml/Wizard/Pages/20-sim.qml:59

578577msgid "Without it, you won’t be able to make calls or use text messaging."

579−msgstr "Sen ela, non poderá realizar chamadas nin usar a mensaxería de texto."

578+msgstr ""

579+"Sen ela, non poderá realizar chamadas nin usar a mensaxería de texto."

580580

581581#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

582582msgid "Skip"

@@ -808,6 +808,3 @@ msgstr "%1 〉"

808808

809809#~ msgid "Please re-enter"

810810#~ msgstr "Introducir de novo"

811−

812−#~ msgid "Click here to finish."

813−#~ msgstr "Prema aquí para rematar."

po/gv.po+2−2

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

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

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

1717"Plural-Forms: nplurals=3; plural=n == 1 ? 0 : (n == 2 ? 1 : 2);\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/he.po+5−9

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-12 08:47+0000\n"

1212"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

1313"Language-Team: Hebrew <he@li.org>\n"

14−"Language: he\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -755,8 +754,8 @@ msgstr ""

755754#~ "You have now mastered the edge gestures and can start using the "

756755#~ "phone<br><br>Tap on the screen to start"

757756#~ msgstr ""

758−#~ "ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח "

759−#~ "לשימושך<br><br>נא לגעת במסך כדי להתחיל"

757+#~ "ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך<br><br>נא "

758+#~ "לגעת במסך כדי להתחיל"

760759

761760#~ msgid "Power off"

762761#~ msgstr "כיבוי"

@@ -772,6 +771,3 @@ msgstr ""

772771

773772#~ msgid "Favorites"

774773#~ msgstr "מועדפים"

775−

776−#~ msgid "Click here to finish."

777−#~ msgstr "יש ללחוץ כאן כדי לסיים."

po/hi.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/hr.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

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

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2121

2222#: plugins/LightDM/Greeter.cpp:112

2323msgid "Password: "

po/hu.po+14−18

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11−"PO-Revision-Date: 2015-08-26 07:51+0000\n"

11+"PO-Revision-Date: 2015-09-21 12:40+0000\n"

1212"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

1313"Language-Team: Hungarian <hu@li.org>\n"

14−"Language: hu\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-22 06:01+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -74,7 +73,7 @@ msgstr "%a %p. %I.%M"

7473#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"

7574#: plugins/Utils/relativetimeformatter.cpp:190

7675msgid "%a %d %b %l:%M %p"

77−msgstr "%d. %b. %a, %p. %I.%M"

76+msgstr "%b. %d., %a %p. %I.%M"

7877

7978#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

8079#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.

@@ -114,11 +113,11 @@ msgstr "%a %H.%M"

114113#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"

115114#: plugins/Utils/relativetimeformatter.cpp:234

116115msgid "%a %d %b %H:%M"

117−msgstr "%d. %b., %a %H.%M"

116+msgstr "%b. %d., %a %H.%M"

118117

119118#: qml/Components/DelayedLockscreen.qml:49

120119msgid "Device Locked"

121−msgstr "Eszköz lezárva"

120+msgstr "Az eszköz zárolva"

122121

123122#: qml/Components/DelayedLockscreen.qml:64

124123msgid "You have been locked out due to too many failed passphrase attempts."

@@ -554,7 +553,7 @@ msgstr "Folytatás"

554553

555554#: qml/Wizard/Pages/passwd-set.qml:61

556555msgid "Choose your passcode"

557−msgstr "Jelkód kiválasztása"

556+msgstr "Jelkód megadása"

558557

559558#: qml/Wizard/Pages/passwd-set.qml:68

560559msgid "Passphrase must be 4 characters long"

@@ -562,11 +561,11 @@ msgstr "A jelmondat legalább 4 karakter hosszú legyen"

562561

563562#: qml/Wizard/Pages/10-welcome.qml:27

564563msgid "Hi!"

565−msgstr "Üdv!"

564+msgstr "Üdvözöljük!"

566565

567566#: qml/Wizard/Pages/10-welcome.qml:44

568567msgid "Welcome to your Ubuntu phone."

569−msgstr "Üdvözöljük az Ubuntu telefonos változatában."

568+msgstr "Köszöntjük az Ubuntu telefonos változatában."

570569

571570#: qml/Wizard/Pages/10-welcome.qml:52

572571msgid "Let’s get started."

@@ -574,12 +573,12 @@ msgstr "Kezdjünk is bele."

574573

575574#: qml/Wizard/Pages/20-sim.qml:25

576575msgid "Add a SIM card and restart your device"

577−msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközét"

576+msgstr "Helyezzen be egy SIM kártyát és indítsa újra az eszközt"

578577

579578#: qml/Wizard/Pages/20-sim.qml:59

580579msgid "Without it, you won’t be able to make calls or use text messaging."

581580msgstr ""

582−"Anélkül nem indíthat vagy fogadhat hívásokat és nem küldhet vagy fogadhat "

581+"Anélkül nem indíthat vagy fogadhat hívásokat, és nem küldhet vagy fogadhat "

583582"üzeneteket."

584583

585584#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

@@ -768,8 +767,8 @@ msgstr "%1 〉"

768767#~ "You have now mastered the edge gestures and can start using the "

769768#~ "phone<br><br>Tap on the screen to start"

770769#~ msgstr ""

771−#~ "Elsajátította a gesztusokat, és megkezdheti a telefon használatát."

772−#~ "<br><br>Koppintson a képernyőre a kezdéshez."

770+#~ "Elsajátította a gesztusokat, és megkezdheti a telefon "

771+#~ "használatát.<br><br>Koppintson a képernyőre a kezdéshez."

773772

774773#~ msgid "Try swiping from the top edge to access the indicators"

775774#~ msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"

@@ -812,6 +811,3 @@ msgstr "%1 〉"

812811

813812#~ msgid "Please re-enter"

814813#~ msgstr "Próbálja újra"

815−

816−#~ msgid "Click here to finish."

817−#~ msgstr "Kattintson ide a befejezéshez."

po/hy.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/ia.po+5−9

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-08-25 19:31+0000\n"

1212"Last-Translator: karm <melo@carmu.com>\n"

1313"Language-Team: Interlingua <ia@li.org>\n"

14−"Language: ia\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -671,8 +670,8 @@ msgstr "No, del toto"

671670#: qml/Wizard/Pages/50-location.qml:124

672671msgid "You can change your mind later in <b>System Settings</b>."

673672msgstr ""

674−"Tu pote cambiar tu desiderata plus tarde in <b>Configurationes del systema</"

675−"b>."

673+"Tu pote cambiar tu desiderata plus tarde in <b>Configurationes del "

674+"systema</b>."

676675

677676#: qml/Wizard/Pages/60-reporting.qml:24

678677msgid "Improving your experience"

@@ -805,6 +804,3 @@ msgstr "%1 〉"

805804#~ msgstr ""

806805#~ "Tu es ora maestrate le gestos del bordo e pote initiar usar le "

807806#~ "telephono<br><br>colpar sur le schermo pro initiar"

808−

809−#~ msgid "Click here to finish."

810−#~ msgstr "Clicca ci pro finir"

po/id.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/is.po+2−2

@@ -17,8 +17,8 @@ msgstr ""

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

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

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

20−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

20+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

21+"X-Generator: Launchpad (build 17746)\n"

2222"Language: is\n"

2323

2424#: plugins/LightDM/Greeter.cpp:112

po/it.po+6−10

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11−"PO-Revision-Date: 2015-07-04 11:34+0000\n"

11+"PO-Revision-Date: 2015-09-18 08:24+0000\n"

1212"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"

1313"Language-Team: Italian <it@li.org>\n"

14−"Language: it\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -30,7 +29,7 @@ msgstr "Blocca scorciatoia"

3029

3130#: plugins/Unity/Launcher/launcheritem.cpp:52

3231msgid "Quit"

33−msgstr ""

32+msgstr "Esci"

3433

3534#: plugins/Unity/Launcher/launcheritem.cpp:106

3635msgid "Unpin shortcut"

@@ -464,7 +463,7 @@ msgstr "Rispondi"

464463

465464#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204

466465msgid "Call back"

467−msgstr ""

466+msgstr "Richiama"

468467

469468#: qml/Panel/Indicators/ModemInfoItem.qml:105

470469msgid "Unlock SIM"

@@ -817,9 +816,6 @@ msgstr "%1 〉"

817816#~ msgid "Please re-enter"

818817#~ msgstr "Inserire nuovamente"

819818

820−#~ msgid "Click here to finish."

821−#~ msgstr "Fare clic qui per terminare."

822−

823819#~ msgid "Swipe up again to close the settings screen"

824820#~ msgstr ""

825821#~ "Far scorrere nuovamente verso l'alto per chiudere la schermata delle "

po/ja.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/km.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/kn.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/ko.po+9−23

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2014-08-19 13:02+0000\n"

1212"Last-Translator: MinSik CHO <Unknown>\n"

1313"Language-Team: Korean <ko@li.org>\n"

14−"Language: ko\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=1; plural=0;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -336,17 +335,13 @@ msgstr "마지막 시도입니다."

336335msgid ""

337336"If passphrase is entered incorrectly, your phone will conduct a factory "

338337"reset and all personal data will be deleted."

339−msgstr ""

340−"이번에도 올바르지 않은 암호문을 입력하면 휴대 전화를 공장 초기화하여 모든 개"

341−"인 정보를 삭제합니다."

338+msgstr "이번에도 올바르지 않은 암호문을 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

342339

343340#: qml/Greeter/NarrowView.qml:59

344341msgid ""

345342"If passcode is entered incorrectly, your phone will conduct a factory reset "

346343"and all personal data will be deleted."

347−msgstr ""

348−"이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 "

349−"개인 정보를 삭제합니다."

344+msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

350345

351346#: qml/Greeter/NarrowView.qml:116

352347#, qt-format

@@ -649,8 +644,7 @@ msgstr "GPS와 익명 와이파이 통신사 네트워크를 사용(추천)"

649644msgid ""

650645"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

651646"conditions</a>."

652−msgstr ""

653−"이 옵션을 선택하면 자동으로 <a href='%1'>노키아 HERE 사용 조건에 동의합니다."

647+msgstr "이 옵션을 선택하면 자동으로 <a href='%1'>노키아 HERE 사용 조건에 동의합니다."

654648

655649#: qml/Wizard/Pages/50-location.qml:112

656650msgid "Not at all"

@@ -668,17 +662,13 @@ msgstr "사용자 경험 개선"

668662msgid ""

669663"Your phone is set up to automatically report errors to Canonical and its "

670664"partners, the makers of the operating system."

671−msgstr ""

672−"사용자의 전화를 자동으로 오류 보고를 운영 체제를 만든 캐노니컬 사와 협력사로 "

673−"보내도록 설정했습니다."

665+msgstr "사용자의 전화를 자동으로 오류 보고를 운영 체제를 만든 캐노니컬 사와 협력사로 보내도록 설정했습니다."

674666

675667#: qml/Wizard/Pages/60-reporting.qml:43

676668msgid ""

677669"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

678670"Privacy</b>"

679−msgstr ""

680−"이 서비스는 <b>보안 &amp; 사생활 보호</b>에서 언제든 사용하지 않도록 설정할 "

681−"수 있습니다."

671+msgstr "이 서비스는 <b>보안 &amp; 사생활 보호</b>에서 언제든 사용하지 않도록 설정할 수 있습니다."

682672

683673#: qml/Wizard/Pages/80-finished.qml:24

684674msgid "All done"

@@ -775,8 +765,7 @@ msgstr "%1 〉"

775765#~ "You have now mastered the edge gestures and can start using the "

776766#~ "phone<br><br>Tap on the screen to start"

777767#~ msgstr ""

778−#~ "여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용"

779−#~ "할 수 있습니다. <br><br> 스크린을 터치해서 시작하세요."

768+#~ "여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. <br><br> 스크린을 터치해서 시작하세요."

780769

781770#~ msgid "Loading. Please Wait..."

782771#~ msgstr "불러오는 중 입니다. 짐시 기다려주십시오..."

@@ -801,6 +790,3 @@ msgstr "%1 〉"

801790

802791#~ msgid "Please re-enter"

803792#~ msgstr "다시 입력해주십시오."

804−

805−#~ msgid "Click here to finish."

806−#~ msgstr "끝내려면 눌러주십시오."

po/ku.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/ky.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/lo.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/lt.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

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

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

1818"(n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2121

2222#: plugins/LightDM/Greeter.cpp:112

2323msgid "Password: "

po/lv.po+2−2

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

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

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

1717"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/ml.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/mr.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/ms.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/my.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/nb.po+3−7

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-05 19:44+0000\n"

1212"Last-Translator: Mathias Bynke <Unknown>\n"

1313"Language-Team: Norwegian Bokmal <nb@li.org>\n"

14−"Language: nb\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -810,6 +809,3 @@ msgstr "%1 〉"

810809

811810#~ msgid "Please re-enter"

812811#~ msgstr "Skriv inn på nytt"

813−

814−#~ msgid "Click here to finish."

815−#~ msgstr "Trykk her for å fullføre."

po/nl.po+6−11

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-07 07:14+0000\n"

1212"Last-Translator: Hannie Dumoleyn <Unknown>\n"

1313"Language-Team: Dutch <nl@li.org>\n"

14−"Language: nl\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -759,8 +758,7 @@ msgstr "%1 〉"

759758#~ msgstr "Linkerrand"

760759

761760#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

762−#~ msgstr ""

763−#~ "Veeg vanaf links om de Starter te tonen voor snelle toegang tot apps"

761+#~ msgstr "Veeg vanaf links om de Starter te tonen voor snelle toegang tot apps"

764762

765763#~ msgid "Right edge"

766764#~ msgstr "Rechterrand"

@@ -769,8 +767,8 @@ msgstr "%1 〉"

769767#~ "You have now mastered the edge gestures and can start using the "

770768#~ "phone<br><br>Tap on the screen to start"

771769#~ msgstr ""

772−#~ "Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen "

773−#~ "met het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"

770+#~ "Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "

771+#~ "het gebruiken van de telefoon<br><br>Tik op het scherm om te beginnen"

774772

775773#~ msgid "Try swiping from the top edge to access the indicators"

776774#~ msgstr "Veeg vanuit de bovenrand om de indicatoren te bekijken"

@@ -816,6 +814,3 @@ msgstr "%1 〉"

816814

817815#~ msgid "Please re-enter"

818816#~ msgstr "Herhaal deze a.u.b."

819−

820−#~ msgid "Click here to finish."

821−#~ msgstr "Klik hier om te stoppen."

po/nn.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/oc.po+2−2

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

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

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

1717"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/or.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/pa.po+15−16

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-04-24 04:29+0000\n"

1212"Last-Translator: Gursharnjit_Singh <ubuntuser13@gmail.com>\n"

1313"Language-Team: Punjabi <pa@li.org>\n"

14−"Language: pa\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -340,16 +339,16 @@ msgid ""

340339"If passphrase is entered incorrectly, your phone will conduct a factory "

341340"reset and all personal data will be deleted."

342341msgstr ""

343−"ਜੇਕਰ ਗਲਤ ਵਾਕ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ ਅਤੇ ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ "

344−"ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"

342+"ਜੇਕਰ ਗਲਤ ਵਾਕ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ ਅਤੇ "

343+"ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"

345344

346345#: qml/Greeter/NarrowView.qml:59

347346msgid ""

348347"If passcode is entered incorrectly, your phone will conduct a factory reset "

349348"and all personal data will be deleted."

350349msgstr ""

351−"ਜੇਕਰ ਗਲਤ ਪਾਸਕੋਡ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ ਅਤੇ ਸਾਰਾ ਨਿੱਜੀ "

352−"ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"

350+"ਜੇਕਰ ਗਲਤ ਪਾਸਕੋਡ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ "

351+"ਅਤੇ ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"

353352

354353#: qml/Greeter/NarrowView.qml:116

355354#, qt-format

@@ -590,7 +589,8 @@ msgstr "ਲਾਕ ਸੁਰੱਖਿਆ"

590589

591590#: qml/Wizard/Pages/30-passwd-type.qml:74

592591msgid "Please select how you’d like to unlock your phone."

593−msgstr "ਕਿਰਪਾ ਕਰਕੇ ਚੁਣੋ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਕਿਸ ਤਰ੍ਹਾਂ ਅਣ-ਲਾਕ ਕਰਨਾ ਪਸੰਦ ਕਰੋਗੇ।"

592+msgstr ""

593+"ਕਿਰਪਾ ਕਰਕੇ ਚੁਣੋ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਕਿਸ ਤਰ੍ਹਾਂ ਅਣ-ਲਾਕ ਕਰਨਾ ਪਸੰਦ ਕਰੋਗੇ।"

594594

595595#: qml/Wizard/Pages/30-passwd-type.qml:97

596596msgctxt "Label: Type of security method"

@@ -656,7 +656,8 @@ msgid ""

656656"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

657657"conditions</a>."

658658msgstr ""

659−"ਇਸ ਵਿਕਲਪ ਨੂੰ ਚੁਣਨ ਦੁਆਰਾ, ਤੁਸੀਂ ਨੋਕੀਆ HERE <a href='#'>ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ</a>ਨੂੰ ਪ੍ਰਵਾਨ ਕਰਦੇ ਹੋ।"

659+"ਇਸ ਵਿਕਲਪ ਨੂੰ ਚੁਣਨ ਦੁਆਰਾ, ਤੁਸੀਂ ਨੋਕੀਆ HERE <a href='#'>ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ</a>ਨੂੰ "

660+"ਪ੍ਰਵਾਨ ਕਰਦੇ ਹੋ।"

660661

661662#: qml/Wizard/Pages/50-location.qml:112

662663msgid "Not at all"

@@ -675,15 +676,16 @@ msgid ""

675676"Your phone is set up to automatically report errors to Canonical and its "

676677"partners, the makers of the operating system."

677678msgstr ""

678−"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕੈਨੋਨੀਕਲ ਅਤੇ ਉਸਦੇ ਸਾਥੀਆਂ, ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਦੇ ਨਿਰਮਾਤਾਵਾਂ ਨੂੰ ਆਪਣੇ ਆਪ ਖਾਮੀ ਸੂਚਨਾਵਾਂ "

679−"ਭੇਜਣ ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ।"

679+"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕੈਨੋਨੀਕਲ ਅਤੇ ਉਸਦੇ ਸਾਥੀਆਂ, ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਦੇ ਨਿਰਮਾਤਾਵਾਂ ਨੂੰ "

680+"ਆਪਣੇ ਆਪ ਖਾਮੀ ਸੂਚਨਾਵਾਂ ਭੇਜਣ ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ।"

680681

681682#: qml/Wizard/Pages/60-reporting.qml:43

682683msgid ""

683684"This can be disabled in <b>System Settings</b> under <b>Security &amp; "

684685"Privacy</b>"

685686msgstr ""

686−"ਇਸ ਨੂੰ <b>ਸਿਸਟਮ ਸੈਟਿੰਗ</b> ਅਧੀਨ <b>ਸੁਰੱਖਿਆ &amp; ਪਰਦੇਦਾਰੀ</b>ਵਿੱਚ ਬੰਦ ਕੀਤਾ ਜਾ ਸਕਦਾ"

687+"ਇਸ ਨੂੰ <b>ਸਿਸਟਮ ਸੈਟਿੰਗ</b> ਅਧੀਨ <b>ਸੁਰੱਖਿਆ &amp; ਪਰਦੇਦਾਰੀ</b>ਵਿੱਚ ਬੰਦ ਕੀਤਾ "

688+"ਜਾ ਸਕਦਾ"

687689

688690#: qml/Wizard/Pages/80-finished.qml:24

689691msgid "All done"

@@ -751,6 +753,3 @@ msgstr "%1 〉"

751753

752754#~ msgid "Please re-enter"

753755#~ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ-ਦਰਜ ਕਰੋ"

754−

755−#~ msgid "Click here to finish."

756−#~ msgstr "ਸਮਾਪਤੀ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ।"

po/pl.po+7−11

@@ -6,19 +6,18 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-12 09:46+0000\n"

1212"Last-Translator: Seweryn Opyd <Unknown>\n"

1313"Language-Team: Polish <pl@li.org>\n"

14−"Language: pl\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

1918"|| n%100>=20) ? 1 : 2;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2221

2322#: plugins/LightDM/Greeter.cpp:112

2423msgid "Password: "

@@ -757,8 +756,8 @@ msgstr "%1 〉"

757756

758757#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

759758#~ msgstr ""

760−#~ "Przeciągnięcie od lewej krawędzi, uruchamia aktywator szybkiego dostępu "

761−#~ "do aplikacji"

759+#~ "Przeciągnięcie od lewej krawędzi, uruchamia aktywator szybkiego dostępu do "

760+#~ "aplikacji"

762761

763762#~ msgid "Well done"

764763#~ msgstr "Udało się!"

@@ -773,8 +772,8 @@ msgstr "%1 〉"

773772#~ "You have now mastered the edge gestures and can start using the "

774773#~ "phone<br><br>Tap on the screen to start"

775774#~ msgstr ""

776−#~ "Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do pracy."

777−#~ "<br><br>Dotknij ekranu by rozpocząć"

775+#~ "Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "

776+#~ "pracy.<br><br>Dotknij ekranu by rozpocząć"

778777

779778#~ msgid "Log out"

780779#~ msgstr "Wyloguj"

@@ -802,6 +801,3 @@ msgstr "%1 〉"

802801

803802#~ msgid "Please re-enter"

804803#~ msgstr "Proszę wprowadź ponownie"

805−

806−#~ msgid "Click here to finish."

807−#~ msgstr "Kliknij tutaj, by zakończyć."

po/pt.po+6−11

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-29 10:01+0000\n"

1212"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"

1313"Language-Team: Portuguese <pt@li.org>\n"

14−"Language: pt\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -802,19 +801,15 @@ msgstr "%1 〉"

802801#~ "You have now mastered the edge gestures and can start using the "

803802#~ "phone<br><br>Tap on the screen to start"

804803#~ msgstr ""

805−#~ "Já domina os gestos das margens, pode começar a usar o "

806−#~ "telefone<br><br>Toque no ecrã para começar"

804+#~ "Já domina os gestos das margens, pode começar a usar o telefone<br><br>Toque "

805+#~ "no ecrã para começar"

807806

808807#~ msgid "Store"

809808#~ msgstr "Store"

810809

811810#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

812811#~ msgstr ""

813−#~ "Deslize da margem esquerda para mostrar o lançador para acesso rápido às "

814−#~ "apps"

815−

816−#~ msgid "Click here to finish."

817−#~ msgstr "Clique aqui para finalizar."

812+#~ "Deslize da margem esquerda para mostrar o lançador para acesso rápido às apps"

818813

819814#~ msgid "Shut down"

820815#~ msgstr "Desligar"

po/pt_BR.po+3−7

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-08-05 04:40+0000\n"

1212"Last-Translator: Julio Alexander Sieg <julio.sieg@gmail.com>\n"

1313"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

14−"Language: pt_BR\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=2; plural=n > 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -815,6 +814,3 @@ msgstr "%1 〉"

815814

816815#~ msgid "Please re-enter"

817816#~ msgstr "Por favor, digite novamente"

818−

819−#~ msgid "Click here to finish."

820−#~ msgstr "Clique aqui para finalizar."

po/ro.po+7−9

@@ -6,19 +6,18 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-06 17:47+0000\n"

1212"Last-Translator: Meriuță Cornel <meriutacornel@neacornel.eu>\n"

1313"Language-Team: Romanian <ro@li.org>\n"

14−"Language: ro\n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "

1918"== 0) && (n != 0))) ? 2: 1));\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2221

2322#: plugins/LightDM/Greeter.cpp:112

2423msgid "Password: "

@@ -588,7 +587,8 @@ msgstr "Adăugați un card SIM și reporniți dispozitivul dumneavoastră"

588587

589588#: qml/Wizard/Pages/20-sim.qml:59

590589msgid "Without it, you won’t be able to make calls or use text messaging."

591−msgstr "Fără acesta, nu veți putea efectua apeluri sau utiliza mesajele text."

590+msgstr ""

591+"Fără acesta, nu veți putea efectua apeluri sau utiliza mesajele text."

592592

593593#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

594594msgid "Skip"

@@ -677,7 +677,8 @@ msgstr "Deloc"

677677

678678#: qml/Wizard/Pages/50-location.qml:124

679679msgid "You can change your mind later in <b>System Settings</b>."

680−msgstr "Puteți să modificați opțiunea utilizând <b>Configurări de sistem</b>."

680+msgstr ""

681+"Puteți să modificați opțiunea utilizând <b>Configurări de sistem</b>."

681682

682683#: qml/Wizard/Pages/60-reporting.qml:24

683684msgid "Improving your experience"

@@ -824,6 +825,3 @@ msgstr "%1 〉"

824825

825826#~ msgid "Please re-enter"

826827#~ msgstr "Introduceți din nou"

827−

828−#~ msgid "Click here to finish."

829−#~ msgstr "Apăsați aici pentru a termina."

po/ru.po+10−14

@@ -6,19 +6,18 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-06 05:33+0000\n"

1212"Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"

1313"Language-Team: Russian <ru@li.org>\n"

14−"Language: ru\n"

1514"MIME-Version: 1.0\n"

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

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

18−"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"

19−"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2221

2322#: plugins/LightDM/Greeter.cpp:112

2423msgid "Password: "

@@ -674,7 +673,8 @@ msgstr "Нет (никогда)"

674673

675674#: qml/Wizard/Pages/50-location.qml:124

676675msgid "You can change your mind later in <b>System Settings</b>."

677−msgstr "Изменить свой выбор можно позднее, перейдя в <b>Параметры системы</b>."

676+msgstr ""

677+"Изменить свой выбор можно позднее, перейдя в <b>Параметры системы</b>."

678678

679679#: qml/Wizard/Pages/60-reporting.qml:24

680680msgid "Improving your experience"

@@ -755,8 +755,7 @@ msgstr "%1 〉"

755755

756756#~ msgid "Try swiping from the top edge to access the indicators"

757757#~ msgstr ""

758−#~ "Попробуйте переместить палец от верхнего края вниз для доступа к "

759−#~ "индикаторам"

758+#~ "Попробуйте переместить палец от верхнего края вниз для доступа к индикаторам"

760759

761760#~ msgid "Close"

762761#~ msgstr "Закрыть"

@@ -775,8 +774,8 @@ msgstr "%1 〉"

775774

776775#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

777776#~ msgstr ""

778−#~ "Переместите палец от левого края вправо для открытия лаунчера для "

779−#~ "быстрого доступа к приложениям"

777+#~ "Переместите палец от левого края вправо для открытия лаунчера для быстрого "

778+#~ "доступа к приложениям"

780779

781780#~ msgid ""

782781#~ "You have now mastered the edge gestures and can start using the "

@@ -823,6 +822,3 @@ msgstr "%1 〉"

823822

824823#~ msgid "Manage Scopes"

825824#~ msgstr "Настройки поиска"

826−

827−#~ msgid "Click here to finish."

828−#~ msgstr "Нажмите для завершения."

po/shn.po+2−2

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

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

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

1717"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/si.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/sk.po+2−2

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

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

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

1717"Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/sl.po+5−9

@@ -6,19 +6,18 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-06 21:10+0000\n"

1212"Last-Translator: Sasa Batistic <Unknown>\n"

1313"Language-Team: Slovenian <sl@li.org>\n"

14−"Language: sl\n"

1514"MIME-Version: 1.0\n"

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

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

18−"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"

19−"%100==4 ? 3 : 0);\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

17+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "

18+"n%100==4 ? 3 : 0);\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2221

2322#: plugins/LightDM/Greeter.cpp:112

2423msgid "Password: "

@@ -818,6 +817,3 @@ msgstr "%1 〉"

818817

819818#~ msgid "Please re-enter"

820819#~ msgstr "Ponovno vnesite"

821−

822−#~ msgid "Click here to finish."

823−#~ msgstr "Kliknite tu za zaključek."

po/sq.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/sr.po+6−6

@@ -7,19 +7,19 @@

77msgid ""

88msgstr ""

99"Project-Id-Version: unity\n"

10−"Report-Msgid-Bugs-To: \n"

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

1111"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1212"PO-Revision-Date: 2015-09-16 16:20+0000\n"

1313"Last-Translator: Bojan Bogdanović <Unknown>\n"

1414"Language-Team: српски <xfce4@xfce4.org>\n"

15−"Language: sr\n"

1615"MIME-Version: 1.0\n"

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

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

19−"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"

20−"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

21−"X-Launchpad-Export-Date: 2015-09-17 05:46+0000\n"

22−"X-Generator: Launchpad (build 17737)\n"

18+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

19+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

20+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

21+"X-Generator: Launchpad (build 17746)\n"

22+"Language: sr\n"

2323

2424#: plugins/LightDM/Greeter.cpp:112

2525msgid "Password: "

po/sv.po+10−11

@@ -6,18 +6,18 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-12 22:17+0000\n"

1212"Last-Translator: Josef Andersson <Unknown>\n"

1313"Language-Team: Swedish\n"

14−"Language: sv\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

20+"Language: sv\n"

2121

2222#: plugins/LightDM/Greeter.cpp:112

2323msgid "Password: "

@@ -578,7 +578,8 @@ msgstr "Lägg till ett SIM-kort och starta om din enhet"

578578

579579#: qml/Wizard/Pages/20-sim.qml:59

580580msgid "Without it, you won’t be able to make calls or use text messaging."

581−msgstr "Utan det kommer du inte att kunna ringa eller skicka textmeddelanden."

581+msgstr ""

582+"Utan det kommer du inte att kunna ringa eller skicka textmeddelanden."

582583

583584#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

584585msgid "Skip"

@@ -648,7 +649,8 @@ msgstr "Använd endast GPS (sämre precision)"

648649

649650#: qml/Wizard/Pages/50-location.qml:86

650651msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

651−msgstr "Använd GPS, anonymiserad Wi-Fi och mobil nätverksinfo (rekommenderas)"

652+msgstr ""

653+"Använd GPS, anonymiserad Wi-Fi och mobil nätverksinfo (rekommenderas)"

652654

653655#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

654656#: qml/Wizard/Pages/50-location.qml:103

@@ -656,8 +658,8 @@ msgid ""

656658"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

657659"conditions</a>."

658660msgstr ""

659−"Genom att välja detta alternativ godkänner du <a href='#'>användarvillkoren</"

660−"a> för Nokia HERE."

661+"Genom att välja detta alternativ godkänner du <a "

662+"href='#'>användarvillkoren</a> för Nokia HERE."

661663

662664#: qml/Wizard/Pages/50-location.qml:112

663665msgid "Not at all"

@@ -808,6 +810,3 @@ msgstr "%1 〉"

808810

809811#~ msgid "Please re-enter"

810812#~ msgstr "Ange igen"

811−

812−#~ msgid "Click here to finish."

813−#~ msgstr "Klicka här för att slutföra."

po/sw.po+3−7

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

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

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-17 20:02+0000\n"

1212"Last-Translator: Valentine <mwangi_valentino@yahoo.com>\n"

1313"Language-Team: Swahili <sw@li.org>\n"

14−"Language: sw\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -720,6 +719,3 @@ msgstr ""

720719

721720#~ msgid "Please re-enter"

722721#~ msgstr "Tafadhali bonyeza tena"

723−

724−#~ msgid "Click here to finish."

725−#~ msgstr "Click hapa umalize."

po/ta.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020"Language: ta\n"

2121

2222#: plugins/LightDM/Greeter.cpp:112

po/te.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/th.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/tr.po+3−7

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-03-22 15:56+0000\n"

1212"Last-Translator: Arda Ünlü <aarda.uunlu@gmail.com>\n"

1313"Language-Team: Turkish <tr@li.org>\n"

14−"Language: tr\n"

1514"MIME-Version: 1.0\n"

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

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

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

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -802,6 +801,3 @@ msgstr "%1 〉"

802801

803802#~ msgid "Please re-enter"

804803#~ msgstr "Lütfen yeniden girin"

805−

806−#~ msgid "Click here to finish."

807−#~ msgstr "Bitirmek için buraya tıklayın."

po/ug.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/uk.po+8−13

@@ -6,19 +6,18 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-04 05:53+0000\n"

1212"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"

1313"Language-Team: Ukrainian <uk@li.org>\n"

14−"Language: uk\n"

1514"MIME-Version: 1.0\n"

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

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

18−"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"

19−"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20+"X-Generator: Launchpad (build 17746)\n"

2221

2322#: plugins/LightDM/Greeter.cpp:112

2423msgid "Password: "

@@ -773,8 +772,7 @@ msgstr "%1 〉"

773772#~ msgstr "Пропустити вступ"

774773

775774#~ msgid "Try swiping from the right edge to unlock the phone"

776−#~ msgstr ""

777−#~ "Спробуйте провести пальцем від правою краю, щоб розблокувати телефон"

775+#~ msgstr "Спробуйте провести пальцем від правою краю, щоб розблокувати телефон"

778776

779777#~ msgid "Right edge"

780778#~ msgstr "Правий край"

@@ -783,8 +781,8 @@ msgstr "%1 〉"

783781#~ "You have now mastered the edge gestures and can start using the "

784782#~ "phone<br><br>Tap on the screen to start"

785783#~ msgstr ""

786−#~ "Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер "

787−#~ "телефоном можна користуватися.<br><br>Торкніться екрана, щоб розпочати."

784+#~ "Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "

785+#~ "можна користуватися.<br><br>Торкніться екрана, щоб розпочати."

788786

789787#~ msgid "All"

790788#~ msgstr "Все"

@@ -824,6 +822,3 @@ msgstr "%1 〉"

824822

825823#~ msgid "Please re-enter"

826824#~ msgstr "Ввведіть ще раз"

827−

828−#~ msgid "Click here to finish."

829−#~ msgstr "Натисніть тут, щоб завершити."

po/ur.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/uz.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/vi.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/xh.po+2−2

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

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

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

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

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/zh_CN.po+7−15

@@ -6,18 +6,17 @@

66msgid ""

77msgstr ""

88"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

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

1010"POT-Creation-Date: 2015-08-25 14:53+0200\n"

1111"PO-Revision-Date: 2015-07-27 10:26+0000\n"

1212"Last-Translator: Ian Li <Unknown>\n"

1313"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"

14−"Language: \n"

1514"MIME-Version: 1.0\n"

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

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

1817"Plural-Forms: nplurals=1; plural=0;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2120

2221#: plugins/LightDM/Greeter.cpp:112

2322msgid "Password: "

@@ -338,15 +337,13 @@ msgstr "这是您最后的尝试机会。"

338337msgid ""

339338"If passphrase is entered incorrectly, your phone will conduct a factory "

340339"reset and all personal data will be deleted."

341−msgstr ""

342−"如果输入的密语不正确，您的手机将恢复到出厂设置并且所有的个人数据将被删除。"

340+msgstr "如果输入的密语不正确，您的手机将恢复到出厂设置并且所有的个人数据将被删除。"

343341

344342#: qml/Greeter/NarrowView.qml:59

345343msgid ""

346344"If passcode is entered incorrectly, your phone will conduct a factory reset "

347345"and all personal data will be deleted."

348−msgstr ""

349−"如果输入的密码不正确，您的手机将恢复到出厂设置并且所有的个人数据将被删除。"

346+msgstr "如果输入的密码不正确，您的手机将恢复到出厂设置并且所有的个人数据将被删除。"

350347

351348#: qml/Greeter/NarrowView.qml:116

352349#, qt-format

@@ -667,8 +664,7 @@ msgstr "改善您的体验"

667664msgid ""

668665"Your phone is set up to automatically report errors to Canonical and its "

669666"partners, the makers of the operating system."

670−msgstr ""

671−"您的手机设置为自动向操作系统的制造商Canonical 及其合作伙伴发送错误报告。"

667+msgstr "您的手机设置为自动向操作系统的制造商Canonical 及其合作伙伴发送错误报告。"

672668

673669#: qml/Wizard/Pages/60-reporting.qml:43

674670msgid ""

@@ -755,8 +751,7 @@ msgstr "%1 〉"

755751#~ msgid ""

756752#~ "You have now mastered the edge gestures and can start using the "

757753#~ "phone<br><br>Tap on the screen to start"

758−#~ msgstr ""

759−#~ "您现在已经掌握了边缘滑动手势，可以开始使用手机了<br><br>请点击屏幕开始使用"

754+#~ msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了<br><br>请点击屏幕开始使用"

760755

761756#~ msgid "All"

762757#~ msgstr "所有"

@@ -775,6 +770,3 @@ msgstr "%1 〉"

775770

776771#~ msgid "Please re-enter"

777772#~ msgstr "请重新输入"

778−

779−#~ msgid "Click here to finish."

780−#~ msgstr "点击这里完成。"

po/zh_HK.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020

2121#: plugins/LightDM/Greeter.cpp:112

2222msgid "Password: "

po/zh_TW.po+2−2

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

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

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

1717"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

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

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

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

2020"Language: zh_TW\n"

2121

2222#: plugins/LightDM/Greeter.cpp:112

qml/Dash/PreviewListView.qml+12−4

@@ -101,18 +101,26 @@ Item {

101101

102102 isCurrent: ListView.isCurrentItem

103103

104− previewModel: {

104+ readonly property var previewStack: {

105105 if (root.open) {

106106 if (index === root.initialIndex) {

107− return root.initialIndexPreviewStack.getPreviewModel(0);

107+ return root.initialIndexPreviewStack;

108108 } else {

109− var previewStack = root.scope.preview(result, root.categoryId);

110− return previewStack.getPreviewModel(0);

109+ return root.scope.preview(result, root.categoryId);

111110 }

112111 } else {

113112 return null;

114113 }

115114 }

115+

116+ previewModel: {

117+ if (previewStack) {

118+ return previewStack.getPreviewModel(0);

119+ } else {

120+ return null;

121+ }

122+ }

123+

116124 scopeStyle: root.scopeStyle

117125 }

118126 }

qml/Greeter/Infographics.qml+1−1

@@ -73,7 +73,7 @@ Item {

7373 notification.hideAnim.start()

7474 }

7575

76− visible: model.label !== ""

76+ visible: model.username !== ""

7777

7878 Component.onCompleted: startShowAnimation()

7979

src/Dash/main.cpp+1−1

@@ -101,7 +101,7 @@ int main(int argc, const char *argv[])

101101 mouseTouchAdaptor = MouseTouchAdaptor::instance();

102102 }

103103

104− QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");

104+ QUrl source(::qmlDirectory() + "/Dash/DashApplication.qml");

105105 prependImportPaths(view->engine(), ::overrideImportPaths());

106106 appendImportPaths(view->engine(), ::fallbackImportPaths());

107107

src/Panel/Indicators/client/indicatorsclient.cpp+1−1

@@ -36,7 +36,7 @@ IndicatorsClient::IndicatorsClient(int &argc, char **argv)

3636 QStringList args = m_application->arguments();

3737

3838 m_view = new QQuickView;

39− m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()+"Panel/Indicators/client/"));

39+ m_view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory() + "/Panel/Indicators/client/"));

4040 prependImportPaths(m_view->engine(), ::overrideImportPaths());

4141 appendImportPaths(m_view->engine(), ::fallbackImportPaths());

4242

src/main.cpp+1−1

@@ -105,7 +105,7 @@ int main(int argc, const char *argv[])

105105 mouseTouchAdaptor = MouseTouchAdaptor::instance();

106106 }

107107

108− QUrl source(::qmlDirectory()+"OrientedShell.qml");

108+ QUrl source(::qmlDirectory() + "/OrientedShell.qml");

109109 prependImportPaths(view->engine(), ::overrideImportPaths());

110110 if (!isMirServer) {

111111 prependImportPaths(view->engine(), ::nonMirImportPaths());

tests/CMakeLists.txt+9−3

@@ -22,11 +22,17 @@ add_subdirectory(uqmlscene)

2222add_executable(qmlscene ALIAS uqmlscene)

2323import_executables(dbus-test-runner)

2424

25+set(UNITY_PLUGINPATH "${CMAKE_BINARY_DIR}/plugins" CACHE PATH "Path to pre-built unity8 plugin dir.")

26+set(UNITY_MOCKPATH "${CMAKE_BINARY_DIR}/tests/mocks" CACHE PATH "Path to pre-built unity8 mock dir.")

27+

28+# Pre-built mocks have preference, pre-built plugins replace local build

2529set(UNITY_IMPORT_PATHS

30+ ${UNITY_MOCKPATH}

2631 ${CMAKE_BINARY_DIR}/tests/mocks

2732 ${CMAKE_BINARY_DIR}/tests/utils/modules

28− ${CMAKE_BINARY_DIR}/plugins

33+ ${UNITY_PLUGINPATH}

2934)

35+list(REMOVE_DUPLICATES UNITY_IMPORT_PATHS)

3036set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")

3137

3238macro(unity8_parse_arguments)

@@ -40,8 +46,8 @@ macro(unity8_parse_arguments)

4046 set(ld_paths)

4147 if(U8TEST_LIGHTDM)

4248 list(APPEND ld_paths

43− ${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics

44− ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm

49+ ${UNITY_MOCKPATH}/libusermetrics

50+ ${UNITY_MOCKPATH}/IntegratedLightDM/liblightdm

4551 )

4652 endif()

4753

tests/autopilot/unity8/fixture_setup.py+1−1

@@ -74,7 +74,7 @@ class LaunchUnityWithFakeSensors(fixtures.Fixture):

7474 def _get_lightdm_mock_path(self):

7575 lib_path = get_mocks_library_path()

7676 lightdm_mock_path = os.path.abspath(

77− os.path.join(lib_path, "LightDM", "liblightdm")

77+ os.path.join(lib_path, "IntegratedLightDM", "liblightdm")

7878 )

7979

8080 if not os.path.exists(lightdm_mock_path):

tests/autopilot/unity8/shell/tests/__init__.py+1−1

@@ -261,7 +261,7 @@ class UnityTestCase(AutopilotTestCase):

261261 def _get_lightdm_mock_path(self):

262262 lib_path = get_mocks_library_path()

263263 lightdm_mock_path = os.path.abspath(

264− os.path.join(lib_path, "LightDM", "liblightdm")

264+ os.path.join(lib_path, "IntegratedLightDM", "liblightdm")

265265 )

266266

267267 if not os.path.exists(lightdm_mock_path):

tests/mocks/AccountsService/AccountsService.cpp+1−1

@@ -24,7 +24,7 @@ AccountsService::AccountsService(QObject* parent)

2424 : QObject(parent),

2525 m_enableLauncherWhileLocked(true),

2626 m_enableIndicatorsWhileLocked(true),

27− m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),

27+ m_backgroundFile(qmlDirectory() + "/graphics/phone_background.jpg"),

2828 m_statsWelcomeScreen(true),

2929 m_failedLogins(0),

3030 m_demoEdges(false),

tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt+1−1

@@ -14,5 +14,5 @@ set_target_properties(MockLightDM PROPERTIES

1414 OUTPUT_NAME lightdm-qt5-2)

1515

1616install(TARGETS MockLightDM

17− DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/liblightdm

17+ DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/liblightdm

1818 )

tests/mocks/Ubuntu/CMakeLists.txt+1

@@ -5,3 +5,4 @@ add_subdirectory(SystemImage)

55add_subdirectory(SystemSettings)

66add_subdirectory(Telephony)

77add_subdirectory(Thumbnailer)

8+add_subdirectory(Web)

tests/mocks/Ubuntu/Web/CMakeLists.txtnew file+1

@@ -0,0 +1 @@

1+add_unity8_mock(Ubuntu.Web 0.2 Ubuntu/Web)

tests/mocks/Ubuntu/Web/WebView.qmlnew file+25

@@ -0,0 +1,25 @@

1+/*

2+ * Copyright (C) 2015 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+

18+import QtQuick 2.0

19+

20+Item {

21+ property url url

22+ property int loadProgress: 0

23+

24+ onUrlChanged: loadProgress = 100

25+}

tests/mocks/Ubuntu/Web/qmldirnew file+4

@@ -0,0 +1,4 @@

1+module Ubuntu.Web

2+typeinfo Web.qmltypes

3+

4+WebView 0.2 WebView.qml

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

@@ -18,6 +18,7 @@ set(FakeUnityApplicationQml_SOURCES

1818 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h

1919 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h

2020 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceItemInterface.h

21+ resources/surfaces.qrc

2122)

2223

2324add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})

tests/mocks/Unity/Application/MirSurface.cpp+2−2

@@ -22,7 +22,7 @@ MirSurface::MirSurface(const QString& name,

2222 Mir::Type type,

2323 Mir::State state,

2424 const QUrl& screenshot,

25− const QString &qmlFilePath)

25+ const QUrl &qmlFilePath)

2626 : unity::shell::application::MirSurfaceInterface(nullptr)

2727 , m_name(name)

2828 , m_type(type)

@@ -87,7 +87,7 @@ void MirSurface::setLive(bool live)

8787 }

8888}

8989

90−QString MirSurface::qmlFilePath() const

90+QUrl MirSurface::qmlFilePath() const

9191{

9292 return m_qmlFilePath;

9393}

tests/mocks/Unity/Application/MirSurface.h+3−3

@@ -38,7 +38,7 @@ public:

3838 Mir::Type type,

3939 Mir::State state,

4040 const QUrl& screenshot,

41− const QString &qmlFilePath = QString());

41+ const QUrl &qmlFilePath = QUrl());

4242 virtual ~MirSurface();

4343

4444 ////

@@ -76,7 +76,7 @@ public:

7676 /////

7777 // internal mock stuff

7878

79− QString qmlFilePath() const;

79+ QUrl qmlFilePath() const;

8080

8181 QUrl screenshotUrl() const;

8282 void setScreenshotUrl(QUrl);

@@ -102,7 +102,7 @@ private:

102102 Mir::State m_state;

103103 Mir::OrientationAngle m_orientationAngle;

104104 QUrl m_screenshotUrl;

105− QString m_qmlFilePath;

105+ QUrl m_qmlFilePath;

106106 bool m_live;

107107 int m_viewCount;

108108 bool m_activeFocus;

tests/mocks/Unity/Application/MirSurfaceItem.cpp+3−4

@@ -215,12 +215,11 @@ void MirSurfaceItem::setSurface(MirSurfaceInterface* surface)

215215 QQuickView *quickView =

216216 qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);

217217

218− QString qmlComponentFilePath;

218+ QUrl qmlComponentFilePath;

219219 if (!m_qmlSurface->qmlFilePath().isEmpty()) {

220− qmlComponentFilePath.append(m_qmlSurface->qmlFilePath());

220+ qmlComponentFilePath = m_qmlSurface->qmlFilePath();

221221 } else {

222− qmlComponentFilePath = QString("%1/Unity/Application/MirSurfaceItem.qml")

223− .arg(mockPluginsDir());

222+ qmlComponentFilePath = QUrl("qrc:///Unity/Application/MirSurfaceItem.qml");

224223 }

225224

226225 m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlComponentFilePath);

tests/mocks/Unity/Application/VirtualKeyboard.cpp+2−4

@@ -26,10 +26,8 @@ VirtualKeyboard::VirtualKeyboard()

2626 : MirSurface("input-method",

2727 Mir::InputMethodType,

2828 Mir::MinimizedState,

29− QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png")

30− .arg(qmlDirectory()),

31− QString("%1/Unity/Application/VirtualKeyboard.qml")

32− .arg(mockPluginsDir()))

29+ QUrl("qrc:///Unity/Application/vkb_portrait.png"),

30+ QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))

3331{

3432}

3533

tests/mocks/Unity/Application/MirSurfaceItem.qml → tests/mocks/Unity/Application/resources/MirSurfaceItem.qmlrenamed

The content is the same.

tests/mocks/Unity/Application/VirtualKeyboard.qml → tests/mocks/Unity/Application/resources/VirtualKeyboard.qmlrenamed

The content is the same.

tests/mocks/Unity/Application/resources/surfaces.qrcnew file+7

@@ -0,0 +1,7 @@

1+<RCC>

2+ <qresource prefix="/Unity/Application">

3+ <file>VirtualKeyboard.qml</file>

4+ <file>MirSurfaceItem.qml</file>

5+ <file>vkb_portrait.png</file>

6+ </qresource>

7+</RCC>

tests/mocks/Unity/Application/resources/vkb_portrait.pngnew file

Binary file not shown.

tests/mocks/Unity/Launcher/MockLauncherItem.cpp+1−1

@@ -29,7 +29,7 @@ MockLauncherItem::MockLauncherItem(const QString &appId, const QString& desktopF

2929 m_appId(appId),

3030 m_desktopFile(desktopFile),

3131 m_name(name),

32− m_icon(qmlDirectory() + "graphics/applicationIcons/" + icon + ".png"),

32+ m_icon(qmlDirectory() + "/graphics/applicationIcons/" + icon + ".png"),

3333 m_pinned(false),

3434 m_running(false),

3535 m_recent(false),

tests/mocks/Unity/fake_previewstack.cpp+2−2

@@ -21,8 +21,8 @@

2121#include "fake_previewmodel.h"

2222#include "fake_scope.h"

2323

24−PreviewStack::PreviewStack(QObject* parent, Scope *scope)

25− : unity::shell::scopes::PreviewStackInterface(parent)

24+PreviewStack::PreviewStack(Scope *scope)

25+ : unity::shell::scopes::PreviewStackInterface(nullptr)

2626{

2727 m_previews << new PreviewModel(this, scope);

2828}

tests/mocks/Unity/fake_previewstack.h+1−1

@@ -32,7 +32,7 @@ class PreviewStack : public unity::shell::scopes::PreviewStackInterface

3232 Q_OBJECT

3333

3434public:

35− explicit PreviewStack(QObject* parent = 0, Scope* scope = 0);

35+ explicit PreviewStack(Scope* scope = 0);

3636 virtual ~PreviewStack();

3737

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

tests/mocks/Unity/fake_resultsmodel.cpp+1−1

@@ -78,7 +78,7 @@ ResultsModel::data(const QModelIndex& index, int role) const

7878 case RoleTitle:

7979 return QString("Title.%1.%2").arg(m_categoryId).arg(index.row());

8080 case RoleArt:

81− return qmlDirectory() + "graphics/applicationIcons/dash.png";

81+ return qmlDirectory() + "/graphics/applicationIcons/dash.png";

8282 case RoleSubtitle:

8383 return QString("Subtitle.%1.%2").arg(m_categoryId).arg(index.row());

8484 case RoleMascot:

tests/mocks/Unity/fake_scope.cpp+3−5

@@ -201,9 +201,7 @@ PreviewStack* Scope::preview(QVariant const& result, QString const& /*categoryId

201201 if (m_returnNullPreview) {

202202 return nullptr;

203203 } else {

204− // This probably leaks, do we don't care

205− // it's a test after all

206− return new PreviewStack(this, this);

204+ return new PreviewStack(this);

207205 }

208206}

209207

@@ -253,11 +251,11 @@ QVariantMap Scope::customizations() const

253251 m["foreground-color"] = "blue";

254252 m["page-header"] = h;

255253 } else if (m_id == "MockScope4") {

256− h["navigation-background"] = QUrl(sourceDirectory() + "tests/qmltests/Dash/artwork/background.png");

254+ h["navigation-background"] = QUrl(sourceDirectory() + "/tests/qmltests/Dash/artwork/background.png");

257255 m["page-header"] = h;

258256 } else if (m_id == "MockScope5") {

259257 h["background"] = "gradient:///lightgrey/grey";

260− h["logo"] = QUrl(sourceDirectory() + "tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg");

258+ h["logo"] = QUrl(sourceDirectory() + "/tests/qmltests/Dash/tst_PageHeader/logo-ubuntu-orange.svg");

261259 h["divider-color"] = "red";

262260 h["navigation-background"] = "color:///black";

263261 m["page-header"] = h;

tests/mocks/Unity/fake_scopesoverview.cpp+1−1

@@ -308,7 +308,7 @@ QVariant ScopesOverviewResultsModel::data(const QModelIndex& index, int role) co

308308 case RoleSubtitle:

309309 return scope && scope->name() == "Videos this is long ab cd ef gh ij kl" ? "tube, movies, cinema, pictures, art, moving images, magic in a box" : QString();

310310 case RoleArt:

311− return qmlDirectory() + "graphics/applicationIcons/dash.png";

311+ return qmlDirectory() + "/graphics/applicationIcons/dash.png";

312312 case RoleMascot:

313313 case RoleEmblem:

314314 case RoleSummary:

tests/mocks/libusermetrics/UserMetrics.cpp+1−5

@@ -416,11 +416,7 @@ UserMetrics::~UserMetrics()

416416

417417QString UserMetrics::label() const

418418{

419− if (d_ptr->m_label.isEmpty()) {

420− return "No data";

421− } else {

422− return d_ptr->m_label;

423− }

419+ return d_ptr->m_label;

424420}

425421

426422QString UserMetrics::username() const

tests/plugins/Dash/CMakeLists.txt−1

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

2323remove_definitions(-DQT_NO_KEYWORDS)

2424

2525add_definitions(-DDASHVIEWSTEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")

26−add_definitions(-DBUILT_PLUGINS_DIR="${CMAKE_BINARY_DIR}/plugins")

2726

2827macro(add_lvwph_test FILENAME TESTNAME)

2928 add_executable(${TESTNAME}TestExec

tests/plugins/Dash/cardcreatortest.cpp−1

@@ -35,7 +35,6 @@ private Q_SLOTS:

3535 void init()

3636 {

3737 view = new QQuickView();

38− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

3938 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/cardcreatortest.qml"));

4039 view->show();

4140 QTest::qWaitForWindowExposed(view);

tests/plugins/Dash/horizontaljournaltest.cpp−1

@@ -123,7 +123,6 @@ private Q_SLOTS:

123123 {

124124 view = new QQuickView();

125125 view->setResizeMode(QQuickView::SizeRootObjectToView);

126− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

127126

128127 model = new WidthModel();

129128 QStringList widthList;

tests/plugins/Dash/horizontaljournaltry.cpp−1

@@ -63,7 +63,6 @@ int main(int argc, char *argv[])

6363

6464 QQuickView *view = new QQuickView();

6565 view->setResizeMode(QQuickView::SizeRootObjectToView);

66− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

6766

6867 QWidthModela model;

6968 QStringList heightList;

tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp−1

@@ -168,7 +168,6 @@ private Q_SLOTS:

168168 void init()

169169 {

170170 view = new QQuickView();

171− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

172171 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsectionexternalmodel.qml"));

173172 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

174173 QVERIFY(lvwph);

tests/plugins/Dash/listviewwithpageheadersectiontest.cpp−1

@@ -133,7 +133,6 @@ private Q_SLOTS:

133133 void init()

134134 {

135135 view = new QQuickView();

136− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

137136 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsection.qml"));

138137 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

139138 model = view->rootObject()->findChild<QQmlListModel*>();

tests/plugins/Dash/listviewwithpageheadertest.cpp−1

@@ -119,7 +119,6 @@ private Q_SLOTS:

119119 void init()

120120 {

121121 view = new QQuickView();

122− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

123122 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertest.qml"));

124123 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

125124 model = view->rootObject()->findChild<QQmlListModel*>();

tests/plugins/Dash/organicgridtest.cpp−1

@@ -126,7 +126,6 @@ private Q_SLOTS:

126126 {

127127 view = new QQuickView();

128128 view->setResizeMode(QQuickView::SizeRootObjectToView);

129− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

130129

131130 model = new DummyModel();

132131 model->setCount(21);

tests/plugins/Dash/organicgridtry.cpp−1

@@ -73,7 +73,6 @@ int main(int argc, char *argv[])

7373

7474 QQuickView *view = new QQuickView();

7575 view->setResizeMode(QQuickView::SizeRootObjectToView);

76− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

7776

7877 DummyModel model;

7978 model.setCount(3);

tests/plugins/Dash/verticaljournaltest.cpp−1

@@ -125,7 +125,6 @@ private Q_SLOTS:

125125 {

126126 view = new QQuickView();

127127 view->setResizeMode(QQuickView::SizeRootObjectToView);

128− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

129128

130129 model = new HeightModel();

131130 QStringList heightList;

tests/plugins/Dash/verticaljournaltry.cpp−1

@@ -63,7 +63,6 @@ int main(int argc, char *argv[])

6363

6464 QQuickView *view = new QQuickView();

6565 view->setResizeMode(QQuickView::SizeRootObjectToView);

66− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

6766

6867 QHeightModel model;

6968 QStringList heightList;

tests/plugins/IntegratedLightDM/CMakeLists.txt+1−1

@@ -25,7 +25,7 @@ add_unity8_uitest(GreeterDBus dbus-test-runner

2525 ARG_PREFIX "--parameter"

2626 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>

2727 DEPENDS MockLightDM

28− IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks

28+ IMPORT_PATHS ${UNITY_MOCKPATH}

2929 LIGHTDM

3030 )

3131

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+3−7

@@ -14,9 +14,6 @@ include_directories(

1414

1515export_qmlfiles(UbuntuGesturesTest .)

1616

17−add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

18−add_definitions(-DTESTS_UTILS_MODULES_DIR="${CMAKE_BINARY_DIR}/tests/utils/modules")

19−

2017macro(build_gesture_test CLASSNAME)

2118 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp TestItem.cpp)

2219 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)

@@ -26,7 +23,7 @@ endmacro()

2623macro(add_gesture_unit_test CLASSNAME)

2724 build_gesture_test(${CLASSNAME})

2825 add_unity8_unittest(${CLASSNAME} ${CLASSNAME}TestExec

29− ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures

26+ ENVIRONMENT LD_LIBRARY_PATH=${UNITY_PLUGINPATH}/Ubuntu/Gestures

3027 DEPENDS UbuntuGesturesTest-qmlfiles

3128 ${ARGN}

3229 )

@@ -35,12 +32,11 @@ endmacro()

3532macro(add_gesture_ui_test CLASSNAME)

3633 build_gesture_test(${CLASSNAME})

3734 add_unity8_uitest(${CLASSNAME} ${CLASSNAME}TestExec

38− ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures

35+ ENVIRONMENT LD_LIBRARY_PATH=${UNITY_PLUGINPATH}/Ubuntu/Gestures

3936 DEPENDS UbuntuGesturesTest-qmlfiles

4037 ${ARGN}

4138 )

42− add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins

43− ${CMAKE_BINARY_DIR}/tests/utils/modules)

39+ add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${UNITY_PLUGINPATH})

4440endmacro()

4541

4642add_gesture_ui_test(DirectionalDragArea)

tests/plugins/Ubuntu/Gestures/GestureTest.cpp−2

@@ -44,8 +44,6 @@ void GestureTest::init()

4444{

4545 m_view = new QQuickView;

4646 m_view->setResizeMode(QQuickView::SizeRootObjectToView);

47− m_view->engine()->addImportPath(QStringLiteral(UBUNTU_GESTURES_PLUGIN_DIR));

48− m_view->engine()->addImportPath(QStringLiteral(TESTS_UTILS_MODULES_DIR));

4947 m_view->setSource(QUrl::fromLocalFile(m_qmlFilename));

5048 m_view->show();

5149 QVERIFY(QTest::qWaitForWindowExposed(m_view));

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp−1

@@ -119,7 +119,6 @@ QQuickView *tst_TouchGate::createView()

119119 QQuickView *window = new QQuickView(0);

120120 window->setResizeMode(QQuickView::SizeRootObjectToView);

121121 window->resize(720, 720);

122− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

123122

124123 return window;

125124}

tests/qmltests/CMakeLists.txt+2−2

@@ -1,7 +1,7 @@

11

22add_subdirectory(Components)

33

4−add_unity8_qmltest(. OrientedShell)

4+add_unity8_qmltest(. OrientedShell LIGHTDM)

55add_unity8_qmltest(. Shell LIGHTDM)

66add_unity8_qmltest(. ShellWithPin LIGHTDM)

77add_unity8_qmltest(Components Background)

@@ -18,7 +18,7 @@ add_unity8_qmltest(Components Showable)

1818add_unity8_qmltest(Components ZoomableImage)

1919add_unity8_qmltest(Dash Dash)

2020add_unity8_qmltest(Dash DashContent)

21−add_unity8_qmltest(Dash DashShell)

21+add_unity8_qmltest(Dash DashShell LIGHTDM)

2222add_unity8_qmltest(Dash Card)

2323add_unity8_qmltest(Dash CardCarousel)

2424add_unity8_qmlbenchmark(Dash CardBenchmark 1000)

tests/qmltests/Components/CMakeLists.txt+1−4

@@ -1,6 +1,4 @@

1−add_definitions(-DUBUNTU_GESTURES_PLUGIN_DIR="${CMAKE_BINARY_DIR}/plugins")

21add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")

3−add_definitions(-DTESTS_UTILS_MODULES_DIR="${CMAKE_BINARY_DIR}/tests/utils/modules")

42

53########## tst_DragHandle

64

@@ -17,8 +15,7 @@ qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)

1715target_link_libraries(DragHandleTestExec UbuntuGesturesQml UbuntuGestures)

1816

1917add_unity8_uitest(DragHandle DragHandleTestExec ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures)

20−add_manual_qml_test(. DragHandle IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins ${CMAKE_BINARY_DIR}/tests/utils/modules)

21−

18+add_manual_qml_test(. DragHandle IMPORT_PATHS ${UNITY_PLUGINPATH})

2219

2320########## tst_EdgeDragEvaluator

2421add_executable(EdgeDragEvaluatorTestExec tst_EdgeDragEvaluator.cpp)

tests/qmltests/Components/tst_DragHandle.cpp−2

@@ -113,9 +113,7 @@ QQuickView *tst_DragHandle::createView()

113113{

114114 QQuickView *window = new QQuickView(0);

115115 window->setResizeMode(QQuickView::SizeRootObjectToView);

116− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

117116 window->engine()->addImportPath(QLatin1String(TEST_DIR));

118− window->engine()->addImportPath(QStringLiteral(TESTS_UTILS_MODULES_DIR));

119117

120118 return window;

121119}

tests/qmltests/Components/tst_EdgeDragEvaluator.cpp−1

@@ -99,7 +99,6 @@ QQuickView *tst_EdgeDragEvaluator::createView()

9999{

100100 QQuickView *window = new QQuickView(0);

101101 window->setResizeMode(QQuickView::SizeRootObjectToView);

102− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

103102 window->engine()->addImportPath(QLatin1String(TEST_DIR));

104103

105104 return window;

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

@@ -473,14 +473,14 @@ Rectangle {

473473

474474 card.cardData["mascot"] = "somethingbroken2";

475475 card.cardDataChanged();

476− compare(mascotImage.image.status, Image.Error);

476+ compare(mascotImage.status, Image.Error);

477477

478478 cardTool.components["mascot"] = {"fallback": Qt.resolvedUrl("artwork/emblem.png")};

479479 cardTool.componentsChanged();

480480 card.cardData["mascot"] = "somethingbroken2";

481481 card.cardDataChanged();

482482 waitForRendering(card);

483− tryCompare(mascotImage.image, "status", Image.Ready);

483+ tryCompare(mascotImage, "status", Image.Ready);

484484 }

485485

486486 function test_font_weights_data() {

tests/qmltests/Greeter/tst_Infographics.qml+4−3

@@ -74,15 +74,16 @@ Item {

7474

7575 function test_set_username_data() {

7676 return [

77− { username: "has-password", label: "<b>19</b> minutes talk time" },

78− { username: "two-factor", label: "No data" },

79− { username: "", label: "No data" },

77+ { username: "has-password", label: "<b>19</b> minutes talk time", visible: true },

78+ { username: "two-factor", label: "", visible: true },

79+ { username: "", label: "", visible: false },

8080 ]

8181 }

8282

8383 function test_set_username(data) {

8484 infographicModel.username = data.username

8585 tryCompare(label, "text", data.label)

86+ compare(infographic.visible, data.visible);

8687 }

8788 }

8889

tools/scopetool.cpp+1−1

@@ -89,7 +89,7 @@ int main(int argc, char *argv[])

8989 view->setTitle(QGuiApplication::applicationName());

9090 view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));

9191

92− QUrl source(::qmlDirectory() + "ScopeTool.qml");

92+ QUrl source(::qmlDirectory() + "/ScopeTool.qml");

9393 prependImportPaths(view->engine(), ::overrideImportPaths());

9494 prependImportPaths(view->engine(), ::nonMirImportPaths());

9595 appendImportPaths(view->engine(), ::fallbackImportPaths());