05deaa2 · unity8 · git.iko.soy

CMakeLists.txt+2−1

compare with xenial

unifiedsplit

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

13

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

15

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

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

17set(CMAKE_AUTOMOC ON)

18+set(CMAKE_AUTORCC ON)

18

19

19# enable QML debugging

20# enable QML debugging

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

21string(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)

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

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

129 else()

130+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})

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

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

131 endif()

132 endif()

132

133

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+

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

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

2

25

3 [ Albert Astals Cid ]

26 [ 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() {

33 return installed;

34}

35

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+

36inline QString translationDirectory() {

46inline QString translationDirectory() {

37 if (isRunningInstalled()) {

47 if (isRunningInstalled()) {

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

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

39 } else {

49 } else {

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

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

41 }

51 }

42}

52}

43

53

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

45 if (isRunningInstalled()) {

55 if (isRunningInstalled()) {

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

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

47 } else {

57 } else {

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

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

49 }

59 }

50}

60}

51

61

52inline QStringList overrideImportPaths() {

62inline QStringList overrideImportPaths() {

53 QStringList paths;

63 QStringList paths;

54 if (!isRunningInstalled()) {

64 if (!isRunningInstalled()) {

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

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

56 }

66 }

57 return paths;

67 return paths;

58}

68}

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

62 if (isRunningInstalled()) {

72 if (isRunningInstalled()) {

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

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

64 } else {

74 } else {

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

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

66 }

76 }

67 return paths;

77 return paths;

68}

78}

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

77 } else {

87 } else {

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

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

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

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

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

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

81 }

91 }

82 return paths;

92 return paths;

83}

93}

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

86 if (isRunningInstalled()) {

96 if (isRunningInstalled()) {

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

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

88 } else {

98 } else {

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

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

90 }

100 }

91}

101}

92

102

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

99 return dirs;

109 return dirs;

100}

110}

101

111

102−inline QString sourceDirectory() {

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

104−}

105−

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

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

107{

113{

108 QStringList importPathList = engine->importPathList();

114 QStringList importPathList = engine->importPathList();

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

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

33 OUTPUT_NAME lightdm-qt5-2)

34

35install(TARGETS MockLightDM-demo-shared

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

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

37 )

plugins/ScreenGrabber/screengrabber.cpp+4−2

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

19#include <QDir>

20#include <QDateTime>

21#include <QStandardPaths>

22+#include <QTemporaryDir>

22#include <QtGui/QImage>

23#include <QtGui/QImage>

23#include <QtGui/QGuiApplication>

24#include <QtGui/QGuiApplication>

24#include <QtQuick/QQuickWindow>

25#include <QtQuick/QQuickWindow>

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

42 QDir screenshotsDir;

43 QDir screenshotsDir;

43 if (qEnvironmentVariableIsSet("UNITY_TESTING")) {

44 if (qEnvironmentVariableIsSet("UNITY_TESTING")) {

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

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

45− QStandardPaths::setTestModeEnabled(true);

46+ QTemporaryDir tDir;

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

47+ tDir.setAutoRemove(false);

48+ screenshotsDir = tDir.path();

47 } else {

49 } else {

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

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

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

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

plugins/Wizard/System.cpp+11−3

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

33 // Register the argument needed for UpdateActivationEnvironment below

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

35

36+ if(!wizardEnabled()) {

36− m_fsWatcher.addPath(wizardEnabledPath());

37+ m_fsWatcher.addPath(wizardEnabledPath());

38+ }

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

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

38}

40}

39

41

40QString System::wizardEnabledPath()

42QString System::wizardEnabledPath()

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

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

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

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

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

61 m_fsWatcher.addPath(wizardEnabledPath());

63 m_fsWatcher.addPath(wizardEnabledPath());

62− wizardEnabledChanged();

64+ Q_EMIT wizardEnabledChanged();

63 }

65 }

64}

66}

65

67

68+void System::watcherFileChanged()

69+{

70+ Q_EMIT wizardEnabledChanged();

71+ m_fsWatcher.removePath(wizardEnabledPath());

72+}

73+

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

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

67{

75{

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

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

plugins/Wizard/System.h+3

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

38Q_SIGNALS:

39 void wizardEnabledChanged();

40

41+private Q_SLOTS:

42+ void watcherFileChanged();

43+

41private:

44private:

42 Q_DISABLE_COPY(System)

45 Q_DISABLE_COPY(System)

43

46

po/am.po+4−9

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: am\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

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

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

795#~ "phone Tap on the screen to start"

794#~ "phone Tap on the screen to start"

796#~ msgstr ""

795#~ msgstr ""

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

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

798−#~ "ለመጀመር"

799

797

800#~ msgid "Restart"

798#~ msgid "Restart"

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

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

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

805

803

806#~ msgid "Please re-enter"

804#~ msgid "Please re-enter"

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

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

808−

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

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

po/ar.po+7−10

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: ar\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

18"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"

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

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

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

22

21

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

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

24msgid "Password: "

23msgid "Password: "

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

593

592

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

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

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

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

595+msgstr ""

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

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

597

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

599msgid "Skip"

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

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

784#~ "phone Tap on the screen to start"

785#~ msgstr ""

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

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

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

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

788

789#~ msgid "Please re-enter"

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

791−

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

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

po/ast.po+9−11

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: ast\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

126

125

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

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

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

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

128+msgstr ""

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

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

130

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

132#, qt-format

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

648

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

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

651+msgstr ""

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

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

652

653

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

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

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

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

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

741

742

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

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

743#~ msgstr ""

744#~ msgstr ""

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

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

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

746+#~ "a les aplicaciones"

746

747

747#~ msgid "Well done"

748#~ msgid "Well done"

748#~ msgstr "Bien fecho"

749#~ msgstr "Bien fecho"

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

808#~ msgid "Manage Scopes"

809#~ msgid "Manage Scopes"

809#~ msgstr "Xestionar ámbitos"

810#~ msgstr "Xestionar ámbitos"

810

811

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

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

813−

814#~ msgid "Please re-enter"

812#~ msgid "Please re-enter"

815#~ msgstr "Por favor, reintroduzla"

813#~ msgstr "Por favor, reintroduzla"

po/az.po+2−2

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

po/be.po+9−12

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: be\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

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

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

22

21

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

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

24msgid "Password: "

23msgid "Password: "

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

123

122

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

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

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

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

125+msgstr ""

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

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

127

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

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

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

773

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

775#~ msgstr ""

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

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

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

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

778

779#~ msgid "Skip intro"

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

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

804

805#~ msgid "Please re-enter"

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

807−

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

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

po/bg.po+2−2

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

po/br.po+11−15

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: br\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

594

593

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

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

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

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

596+msgstr ""

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

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

598

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

600msgctxt "Label: Type of security method"

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

652

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

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

655+msgstr ""

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

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

656

657

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

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

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

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

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

758

759

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

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

760#~ msgstr ""

761#~ msgstr ""

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

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

762−#~ "wel."

763

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

765#~ msgstr ""

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

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

767−#~ "arventennoù"

768

767

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

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

770#~ msgstr ""

769#~ msgstr ""

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

772

771

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

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

774#~ msgstr ""

773#~ msgstr ""

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

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

776−#~ "arloadoù prim."

775+#~ "prim."

777

776

778#~ msgid "Well done"

777#~ msgid "Well done"

779#~ msgstr "Gourc'hemennoù !"

778#~ msgstr "Gourc'hemennoù !"

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

819

818

820#~ msgid "Please re-enter"

819#~ msgid "Please re-enter"

821#~ msgstr "Adverkañ, mar plij"

820#~ 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 ""

16"Content-Transfer-Encoding: 8bit\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-16 05:49+0000\n"

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

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

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

21

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

23msgid "Password: "

po/ca.po+6−11

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: ca\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

756

755

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

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

758#~ msgstr ""

757#~ msgstr ""

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

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

760−#~ "indicadors"

761

759

762#~ msgid "Close"

760#~ msgid "Close"

763#~ msgstr "Tanca"

761#~ msgstr "Tanca"

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

769

767

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

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

771#~ msgstr ""

769#~ msgstr ""

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

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

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

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

774

772

775#~ msgid "Skip intro"

773#~ msgid "Skip intro"

776#~ msgstr "Omet la introducció"

774#~ msgstr "Omet la introducció"

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

824

822

825#~ msgid "Manage Scopes"

823#~ msgid "Manage Scopes"

826#~ msgstr "Gestioneu les lents"

824#~ 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 ""

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

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

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

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

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

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

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

20

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

22msgid "Password: "

po/ce.po+2−2

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

po/ckb.po+2−2

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

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

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

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

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

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

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

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

20

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

22msgid "Password: "

po/cs.po+10−11

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: cs\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

17"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"

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

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

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

20+"Language: cs\n"

21

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

23msgid "Password: "

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

122

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

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

125+msgstr ""

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

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

126

127

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

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

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

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

130+msgstr ""

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

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

130

132

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

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

132#, qt-format

134#, qt-format

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

689"This can be disabled in System Settings under Security & "

691"This can be disabled in System Settings under Security & "

690"Privacy"

692"Privacy"

691msgstr ""

693msgstr ""

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

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

693−"b>"

695+"soukromí"

694

696

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

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

696msgid "All done"

698msgid "All done"

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

770

772

771#~ msgid "Please re-enter"

773#~ msgid "Please re-enter"

772#~ msgstr "Vložte znovu"

774#~ 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 @@

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: cy\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

19"2 : 3;\n"

18"2 : 3;\n"

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

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

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

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

22

21

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

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

24msgid "Password: "

23msgid "Password: "

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

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

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

669"conditions</a>."

668"conditions</a>."

670msgstr ""

669msgstr ""

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

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

672−"a> Nokia HERE."

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

673

672

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

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

675msgid "Not at all"

674msgid "Not at all"

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

726#, qt-format

725#, qt-format

727msgid "%1 〉"

726msgid "%1 〉"

728msgstr "%1 〉"

727msgstr "%1 〉"

729−

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

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

po/da.po+6−11

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

7msgid ""

8msgstr ""

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

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

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

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

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

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

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

15−"Language: da\n"

16"MIME-Version: 1.0\n"

15"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

22

21

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

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

24msgid "Password: "

23msgid "Password: "

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

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

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

758

757

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

758#~ 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"

762

760

763#~ msgid "Well done"

761#~ msgid "Well done"

764#~ msgstr "Godt gjort"

762#~ msgstr "Godt gjort"

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

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

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

777#~ "phone Tap on the screen to start"

775#~ "phone Tap on the screen to start"

778#~ msgstr ""

776#~ msgstr ""

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

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

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

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

781

779

782#~ msgid "Please re-enter"

780#~ msgid "Please re-enter"

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

781#~ 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 @@

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: de\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

476

475

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

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

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

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

478+msgstr ""

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

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

480

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

482msgid "Tap here to finish."

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

817

818#~ msgid "Please re-enter"

819#~ 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 @@

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: el\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

478

477

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

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

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

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

480+msgstr ""

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

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

482

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

484msgid "Tap here to finish."

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

819

820#~ msgid "Power"

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

822−

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

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

po/en_AU.po+3−7

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: \n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

808

807

809#~ msgid "Please re-enter"

808#~ msgid "Please re-enter"

810#~ msgstr "Please re-enter"

809#~ 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 @@

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: \n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

30

29

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

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

32msgid "Quit"

31msgid "Quit"

33−msgstr ""

32+msgstr "Quit"

34

33

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

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

36msgid "Unpin shortcut"

35msgid "Unpin shortcut"

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

460

459

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

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

462msgid "Call back"

461msgid "Call back"

463−msgstr ""

462+msgstr "Call back"

464

463

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

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

466msgid "Unlock SIM"

465msgid "Unlock SIM"

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

808

807

809#~ msgid "Please re-enter"

808#~ msgid "Please re-enter"

810#~ msgstr "Please re-enter"

809#~ 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 ""

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

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

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

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

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

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

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

20

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

22msgid "Password: "

po/es.po+5−9

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: es\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

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

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

775#~ "phone Tap on the screen to start"

774#~ "phone Tap on the screen to start"

776#~ msgstr ""

775#~ msgstr ""

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

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

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

777+#~ "la pantalla para comenzar"

779

778

780#~ msgid "Power off"

779#~ msgid "Power off"

781#~ msgstr "Apagar"

780#~ msgstr "Apagar"

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

815

814

816#~ msgid "Manage Scopes"

815#~ msgid "Manage Scopes"

817#~ msgstr "Administrar Scopes"

816#~ 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 @@

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: eu\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

803

802

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

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

805#~ msgstr ""

804#~ msgstr ""

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

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

807−#~ "eskura izateko"

806+#~ "izateko"

808

807

809#~ msgid "Confirm"

808#~ msgid "Confirm"

810#~ msgstr "Berretsi"

809#~ msgstr "Berretsi"

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

814

813

815#~ msgid "Please re-enter"

814#~ msgid "Please re-enter"

816#~ msgstr "Errepikatu"

815#~ msgstr "Errepikatu"

817−

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

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

po/fa.po+13−13

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: fa\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

122

121

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

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

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

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

124+msgstr ""

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

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

126

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

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

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

574

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

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

577+msgstr ""

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

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

578

579

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

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

580msgid "Skip"

581msgid "Skip"

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

644

645

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

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

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

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

648+msgstr ""

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

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

648

650

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

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

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

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

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

680"This can be disabled in System Settings under Security & "

682"This can be disabled in System Settings under Security & "

681"Privacy"

683"Privacy"

682msgstr ""

684msgstr ""

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

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

686+"شود"

684

687

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

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

686msgid "All done"

689msgid "All done"

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

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

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

748#~ "phone Tap on the screen to start"

751#~ "phone Tap on the screen to start"

749#~ msgstr ""

752#~ msgstr ""

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

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

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

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

752

755

753#~ msgid "Confirm"

756#~ msgid "Confirm"

754#~ msgstr "تأیید"

757#~ msgstr "تأیید"

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

803

806

804#~ msgid "Manage Scopes"

807#~ msgid "Manage Scopes"

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

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

806−

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

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

po/fi.po+5−8

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: fi\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

127

126

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

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

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

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

129+msgstr ""

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

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

131

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

133#, qt-format

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

810

811#~ msgid "Please re-enter"

812#~ 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 ""

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

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

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

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

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

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

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

20

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

22msgid "Password: "

po/fr.po+5−9

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: fr\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

21

20

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

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

23msgid "Password: "

22msgid "Password: "

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

786

785

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

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

788#~ msgstr ""

787#~ msgstr ""

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

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

790−#~ "lanceur d'applications."

789+#~ "d'applications."

791

790

792#~ msgid "Power off"

791#~ msgid "Power off"

793#~ msgstr "Éteindre"

792#~ msgstr "Éteindre"

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

827

826

828#~ msgid "Please re-enter"

827#~ msgid "Please re-enter"

829#~ msgstr "Veuillez ressaisir"

828#~ 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 ""

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

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

17"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"

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

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

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

20

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

22msgid "Password: "

po/gd.po+8−12

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

6msgid ""

7msgstr ""

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

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

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

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

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

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

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

14−"Language: gd\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

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

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

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

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

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

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

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

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

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

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

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

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

21+"Language: gd\n"

22

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

24msgid "Password: "

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

740

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

742#~ msgstr ""

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

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

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

744+#~ "far an fhòn"

745

746#~ msgid "Right edge"

747#~ msgstr "An oir dheas"

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

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

794#~ "phone Tap on the screen to start"

795#~ msgstr ""

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

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

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

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

798−#~ "tòiseachadh"

799

798

800#~ msgid "All"

799#~ msgid "All"

801#~ msgstr "Na h-uile"

800#~ msgstr "Na h-uile"

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

833#~ msgid "Manage Scopes"

832#~ msgid "Manage Scopes"

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

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

835

834

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

837−#~ msgstr "Briog an-seo gus crìoch a chur air."

838−

839#~ msgid "Please re-enter"

835#~ msgid "Please re-enter"

840#~ msgstr "Cuir a-steach i a-rithist"

836#~ msgstr "Cuir a-steach i a-rithist"

po/gl.po+5−8

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-08-01 03:25+0000\n"

12"Last-Translator: Marcos Lans <Unknown>\n"

13"Language-Team: Galician <gl@li.org>\n"

14−"Language: gl\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -576,7 +575,8 @@ msgstr "Engada unha tarxeta SIM e reinicie o dispositivo"

576

575

577#: qml/Wizard/Pages/20-sim.qml:59

576#: qml/Wizard/Pages/20-sim.qml:59

578msgid "Without it, you won’t be able to make calls or use text messaging."

577msgid "Without it, you won’t be able to make calls or use text messaging."

578+msgstr ""

579−msgstr "Sen ela, non poderá realizar chamadas nin usar a mensaxería de texto."

579+"Sen ela, non poderá realizar chamadas nin usar a mensaxería de texto."

580

581#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

582msgid "Skip"

@@ -808,6 +808,3 @@ msgstr "%1 〉"

808

809#~ msgid "Please re-enter"

810#~ 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 ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"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"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/he.po+5−9

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-12 08:47+0000\n"

12"Last-Translator: Yaron <sh.yaron@gmail.com>\n"

13"Language-Team: Hebrew <he@li.org>\n"

14−"Language: he\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -755,8 +754,8 @@ msgstr ""

755#~ "You have now mastered the edge gestures and can start using the "

754#~ "You have now mastered the edge gestures and can start using the "

756#~ "phone Tap on the screen to start"

755#~ "phone Tap on the screen to start"

757#~ msgstr ""

756#~ msgstr ""

758−#~ "ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח "

757+#~ "ברגעים אלו סיימת את התמחותך בשימוש במחוות קצה והטלפון פתוח לשימושך נא "

759−#~ "לשימושך נא לגעת במסך כדי להתחיל"

758+#~ "לגעת במסך כדי להתחיל"

760

759

761#~ msgid "Power off"

760#~ msgid "Power off"

762#~ msgstr "כיבוי"

761#~ msgstr "כיבוי"

@@ -772,6 +771,3 @@ msgstr ""

772

771

773#~ msgid "Favorites"

772#~ msgid "Favorites"

774#~ msgstr "מועדפים"

773#~ msgstr "מועדפים"

775−

776−#~ msgid "Click here to finish."

777−#~ msgstr "יש ללחוץ כאן כדי לסיים."

po/hi.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/hr.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\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-16 05:50+0000\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

20+"X-Generator: Launchpad (build 17746)\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

po/hu.po+14−18

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 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"

12"Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"

13"Language-Team: Hungarian <hu@li.org>\n"

14−"Language: hu\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-22 06:01+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17749)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -74,7 +73,7 @@ msgstr "%a %p. %I.%M"

74#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"

73#. en_GB example: "%a %b %d\u2003%l:%M %p" --> "Fri 31 Oct 1:00 PM"

75#: plugins/Utils/relativetimeformatter.cpp:190

74#: plugins/Utils/relativetimeformatter.cpp:190

76msgid "%a %d %b %l:%M %p"

75msgid "%a %d %b %l:%M %p"

77−msgstr "%d. %b. %a, %p. %I.%M"

76+msgstr "%b. %d., %a %p. %I.%M"

78

77

79#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

78#. Translators, please edit/rearrange these strftime(3) tokens to suit your locale!

80#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.

79#. This format string is used for showing, on a 24-hour clock, times that happen yesterday.

@@ -114,11 +113,11 @@ msgstr "%a %H.%M"

114#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"

113#. en_GB example: "%a %b %d\u2003%H:%M" --> "Fri 31 Oct 13:00"

115#: plugins/Utils/relativetimeformatter.cpp:234

114#: plugins/Utils/relativetimeformatter.cpp:234

116msgid "%a %d %b %H:%M"

115msgid "%a %d %b %H:%M"

117−msgstr "%d. %b., %a %H.%M"

116+msgstr "%b. %d., %a %H.%M"

118

117

119#: qml/Components/DelayedLockscreen.qml:49

118#: qml/Components/DelayedLockscreen.qml:49

120msgid "Device Locked"

119msgid "Device Locked"

121−msgstr "Eszköz lezárva"

120+msgstr "Az eszköz zárolva"

122

121

123#: qml/Components/DelayedLockscreen.qml:64

122#: qml/Components/DelayedLockscreen.qml:64

124msgid "You have been locked out due to too many failed passphrase attempts."

123msgid "You have been locked out due to too many failed passphrase attempts."

@@ -554,7 +553,7 @@ msgstr "Folytatás"

554

553

555#: qml/Wizard/Pages/passwd-set.qml:61

554#: qml/Wizard/Pages/passwd-set.qml:61

556msgid "Choose your passcode"

555msgid "Choose your passcode"

557−msgstr "Jelkód kiválasztása"

556+msgstr "Jelkód megadása"

558

557

559#: qml/Wizard/Pages/passwd-set.qml:68

558#: qml/Wizard/Pages/passwd-set.qml:68

560msgid "Passphrase must be 4 characters long"

559msgid "Passphrase must be 4 characters long"

@@ -562,11 +561,11 @@ msgstr "A jelmondat legalább 4 karakter hosszú legyen"

562

561

563#: qml/Wizard/Pages/10-welcome.qml:27

562#: qml/Wizard/Pages/10-welcome.qml:27

564msgid "Hi!"

563msgid "Hi!"

565−msgstr "Üdv!"

564+msgstr "Üdvözöljük!"

566

565

567#: qml/Wizard/Pages/10-welcome.qml:44

566#: qml/Wizard/Pages/10-welcome.qml:44

568msgid "Welcome to your Ubuntu phone."

567msgid "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."

570

569

571#: qml/Wizard/Pages/10-welcome.qml:52

570#: qml/Wizard/Pages/10-welcome.qml:52

572msgid "Let’s get started."

571msgid "Let’s get started."

@@ -574,12 +573,12 @@ msgstr "Kezdjünk is bele."

574

573

575#: qml/Wizard/Pages/20-sim.qml:25

574#: qml/Wizard/Pages/20-sim.qml:25

576msgid "Add a SIM card and restart your device"

575msgid "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"

578

577

579#: qml/Wizard/Pages/20-sim.qml:59

578#: qml/Wizard/Pages/20-sim.qml:59

580msgid "Without it, you won’t be able to make calls or use text messaging."

579msgid "Without it, you won’t be able to make calls or use text messaging."

581msgstr ""

580msgstr ""

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 "

583"üzeneteket."

582"üzeneteket."

584

583

585#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

584#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

@@ -768,8 +767,8 @@ msgstr "%1 〉"

768#~ "You have now mastered the edge gestures and can start using the "

767#~ "You have now mastered the edge gestures and can start using the "

769#~ "phone Tap on the screen to start"

768#~ "phone Tap on the screen to start"

770#~ msgstr ""

769#~ msgstr ""

771−#~ "Elsajátította a gesztusokat, és megkezdheti a telefon használatát."

770+#~ "Elsajátította a gesztusokat, és megkezdheti a telefon "

772−#~ " Koppintson a képernyőre a kezdéshez."

771+#~ "használatát. Koppintson a képernyőre a kezdéshez."

773

772

774#~ msgid "Try swiping from the top edge to access the indicators"

773#~ msgid "Try swiping from the top edge to access the indicators"

775#~ msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"

774#~ msgstr "Az állapotmenük eléréséhez csúsztassa ujját a felső szélről"

@@ -812,6 +811,3 @@ msgstr "%1 〉"

812

811

813#~ msgid "Please re-enter"

812#~ msgid "Please re-enter"

814#~ msgstr "Próbálja újra"

813#~ 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 ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/ia.po+5−9

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-08-25 19:31+0000\n"

12"Last-Translator: karm <melo@carmu.com>\n"

13"Language-Team: Interlingua <ia@li.org>\n"

14−"Language: ia\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -671,8 +670,8 @@ msgstr "No, del toto"

671#: qml/Wizard/Pages/50-location.qml:124

670#: qml/Wizard/Pages/50-location.qml:124

672msgid "You can change your mind later in System Settings."

671msgid "You can change your mind later in System Settings."

673msgstr ""

672msgstr ""

674−"Tu pote cambiar tu desiderata plus tarde in Configurationes del systema</"

673+"Tu pote cambiar tu desiderata plus tarde in Configurationes del "

675−"b>."

674+"systema."

676

675

677#: qml/Wizard/Pages/60-reporting.qml:24

676#: qml/Wizard/Pages/60-reporting.qml:24

678msgid "Improving your experience"

677msgid "Improving your experience"

@@ -805,6 +804,3 @@ msgstr "%1 〉"

805#~ msgstr ""

804#~ msgstr ""

806#~ "Tu es ora maestrate le gestos del bordo e pote initiar usar le "

805#~ "Tu es ora maestrate le gestos del bordo e pote initiar usar le "

807#~ "telephono colpar sur le schermo pro initiar"

806#~ "telephono 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 ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/is.po+2−2

@@ -17,8 +17,8 @@ msgstr ""

17"Content-Type: text/plain; charset=UTF-8\n"

18"Content-Transfer-Encoding: 8bit\n"

19"Plural-Forms: nplurals=2; plural=n != 1;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

20+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

21+"X-Generator: Launchpad (build 17746)\n"

22"Language: is\n"

23

24#: plugins/LightDM/Greeter.cpp:112

po/it.po+6−10

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 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"

12"Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"

13"Language-Team: Italian <it@li.org>\n"

14−"Language: it\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -30,7 +29,7 @@ msgstr "Blocca scorciatoia"

30

29

31#: plugins/Unity/Launcher/launcheritem.cpp:52

30#: plugins/Unity/Launcher/launcheritem.cpp:52

32msgid "Quit"

31msgid "Quit"

33−msgstr ""

32+msgstr "Esci"

34

33

35#: plugins/Unity/Launcher/launcheritem.cpp:106

34#: plugins/Unity/Launcher/launcheritem.cpp:106

36msgid "Unpin shortcut"

35msgid "Unpin shortcut"

@@ -464,7 +463,7 @@ msgstr "Rispondi"

464

463

465#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204

464#: qml/Panel/Indicators/MessageMenuItemFactory.qml:204

466msgid "Call back"

465msgid "Call back"

467−msgstr ""

466+msgstr "Richiama"

468

467

469#: qml/Panel/Indicators/ModemInfoItem.qml:105

468#: qml/Panel/Indicators/ModemInfoItem.qml:105

470msgid "Unlock SIM"

469msgid "Unlock SIM"

@@ -817,9 +816,6 @@ msgstr "%1 〉"

817#~ msgid "Please re-enter"

816#~ msgid "Please re-enter"

818#~ msgstr "Inserire nuovamente"

817#~ msgstr "Inserire nuovamente"

819

818

820−#~ msgid "Click here to finish."

821−#~ msgstr "Fare clic qui per terminare."

822−

823#~ msgid "Swipe up again to close the settings screen"

819#~ msgid "Swipe up again to close the settings screen"

824#~ msgstr ""

820#~ msgstr ""

825#~ "Far scorrere nuovamente verso l'alto per chiudere la schermata delle "

821#~ "Far scorrere nuovamente verso l'alto per chiudere la schermata delle "

po/ja.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/km.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/kn.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/ko.po+9−23

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2014-08-19 13:02+0000\n"

12"Last-Translator: MinSik CHO <Unknown>\n"

13"Language-Team: Korean <ko@li.org>\n"

14−"Language: ko\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=1; plural=0;\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -336,17 +335,13 @@ msgstr "마지막 시도입니다."

336msgid ""

335msgid ""

337"If passphrase is entered incorrectly, your phone will conduct a factory "

336"If passphrase is entered incorrectly, your phone will conduct a factory "

338"reset and all personal data will be deleted."

337"reset and all personal data will be deleted."

339−msgstr ""

340−"이번에도 올바르지 않은 암호문을 입력하면 휴대 전화를 공장 초기화하여 모든 개"

338+msgstr "이번에도 올바르지 않은 암호문을 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

341−"인 정보를 삭제합니다."

342

339

343#: qml/Greeter/NarrowView.qml:59

340#: qml/Greeter/NarrowView.qml:59

344msgid ""

341msgid ""

345"If passcode is entered incorrectly, your phone will conduct a factory reset "

342"If passcode is entered incorrectly, your phone will conduct a factory reset "

346"and all personal data will be deleted."

343"and all personal data will be deleted."

347−msgstr ""

348−"이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 "

344+msgstr "이번에도 올바르지 않은 패스코드를 입력하면 휴대 전화를 공장 초기화하여 모든 개인 정보를 삭제합니다."

349−"개인 정보를 삭제합니다."

350

345

351#: qml/Greeter/NarrowView.qml:116

346#: qml/Greeter/NarrowView.qml:116

352#, qt-format

347#, qt-format

@@ -649,8 +644,7 @@ msgstr "GPS와 익명 와이파이 통신사 네트워크를 사용(추천)"

649msgid ""

644msgid ""

650"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

645"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

651"conditions</a>."

646"conditions</a>."

652−msgstr ""

653−"이 옵션을 선택하면 자동으로 <a href='%1'>노키아 HERE 사용 조건에 동의합니다."

647+msgstr "이 옵션을 선택하면 자동으로 <a href='%1'>노키아 HERE 사용 조건에 동의합니다."

654

648

655#: qml/Wizard/Pages/50-location.qml:112

649#: qml/Wizard/Pages/50-location.qml:112

656msgid "Not at all"

650msgid "Not at all"

@@ -668,17 +662,13 @@ msgstr "사용자 경험 개선"

668msgid ""

662msgid ""

669"Your phone is set up to automatically report errors to Canonical and its "

663"Your phone is set up to automatically report errors to Canonical and its "

670"partners, the makers of the operating system."

664"partners, the makers of the operating system."

671−msgstr ""

672−"사용자의 전화를 자동으로 오류 보고를 운영 체제를 만든 캐노니컬 사와 협력사로 "

665+msgstr "사용자의 전화를 자동으로 오류 보고를 운영 체제를 만든 캐노니컬 사와 협력사로 보내도록 설정했습니다."

673−"보내도록 설정했습니다."

674

666

675#: qml/Wizard/Pages/60-reporting.qml:43

667#: qml/Wizard/Pages/60-reporting.qml:43

676msgid ""

668msgid ""

677"This can be disabled in System Settings under Security & "

669"This can be disabled in System Settings under Security & "

678"Privacy"

670"Privacy"

679−msgstr ""

680−"이 서비스는 보안 & 사생활 보호에서 언제든 사용하지 않도록 설정할 "

671+msgstr "이 서비스는 보안 & 사생활 보호에서 언제든 사용하지 않도록 설정할 수 있습니다."

681−"수 있습니다."

682

672

683#: qml/Wizard/Pages/80-finished.qml:24

673#: qml/Wizard/Pages/80-finished.qml:24

684msgid "All done"

674msgid "All done"

@@ -775,8 +765,7 @@ msgstr "%1 〉"

775#~ "You have now mastered the edge gestures and can start using the "

765#~ "You have now mastered the edge gestures and can start using the "

776#~ "phone Tap on the screen to start"

766#~ "phone Tap on the screen to start"

777#~ msgstr ""

767#~ msgstr ""

778−#~ "여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용"

768+#~ "여러분은 가장자리에서 끌어오기 제스쳐를 완벽히 익히셨고 휴대 전화를 사용할 수 있습니다. 스크린을 터치해서 시작하세요."

779−#~ "할 수 있습니다. 스크린을 터치해서 시작하세요."

780

769

781#~ msgid "Loading. Please Wait..."

770#~ msgid "Loading. Please Wait..."

782#~ msgstr "불러오는 중 입니다. 짐시 기다려주십시오..."

771#~ msgstr "불러오는 중 입니다. 짐시 기다려주십시오..."

@@ -801,6 +790,3 @@ msgstr "%1 〉"

801

790

802#~ msgid "Please re-enter"

791#~ msgid "Please re-enter"

803#~ msgstr "다시 입력해주십시오."

792#~ msgstr "다시 입력해주십시오."

804−

805−#~ msgid "Click here to finish."

806−#~ msgstr "끝내려면 눌러주십시오."

po/ku.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/ky.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/lo.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/lt.po+2−2

@@ -16,8 +16,8 @@ msgstr ""

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

18"(n%100<10 || n%100>=20) ? 1 : 2;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

20+"X-Generator: Launchpad (build 17746)\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

po/lv.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"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"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/ml.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/mr.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/ms.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/my.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/nb.po+3−7

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-05 19:44+0000\n"

12"Last-Translator: Mathias Bynke <Unknown>\n"

13"Language-Team: Norwegian Bokmal <nb@li.org>\n"

14−"Language: nb\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -810,6 +809,3 @@ msgstr "%1 〉"

810

809

811#~ msgid "Please re-enter"

810#~ msgid "Please re-enter"

812#~ msgstr "Skriv inn på nytt"

811#~ 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 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-07 07:14+0000\n"

12"Last-Translator: Hannie Dumoleyn <Unknown>\n"

13"Language-Team: Dutch <nl@li.org>\n"

14−"Language: nl\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -759,8 +758,7 @@ msgstr "%1 〉"

759#~ msgstr "Linkerrand"

758#~ msgstr "Linkerrand"

760

759

761#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

760#~ 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"

764

762

765#~ msgid "Right edge"

763#~ msgid "Right edge"

766#~ msgstr "Rechterrand"

764#~ msgstr "Rechterrand"

@@ -769,8 +767,8 @@ msgstr "%1 〉"

769#~ "You have now mastered the edge gestures and can start using the "

767#~ "You have now mastered the edge gestures and can start using the "

770#~ "phone Tap on the screen to start"

768#~ "phone Tap on the screen to start"

771#~ msgstr ""

769#~ msgstr ""

772−#~ "Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen "

770+#~ "Nu u de bewegingen vanuit de randen onder de knie heeft, kunt u beginnen met "

773−#~ "met het gebruiken van de telefoon Tik op het scherm om te beginnen"

771+#~ "het gebruiken van de telefoon Tik op het scherm om te beginnen"

774

772

775#~ msgid "Try swiping from the top edge to access the indicators"

773#~ msgid "Try swiping from the top edge to access the indicators"

776#~ msgstr "Veeg vanuit de bovenrand om de indicatoren te bekijken"

774#~ msgstr "Veeg vanuit de bovenrand om de indicatoren te bekijken"

@@ -816,6 +814,3 @@ msgstr "%1 〉"

816

814

817#~ msgid "Please re-enter"

815#~ msgid "Please re-enter"

818#~ msgstr "Herhaal deze a.u.b."

816#~ 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 ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/oc.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/or.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n!=1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/pa.po+15−16

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-04-24 04:29+0000\n"

12"Last-Translator: Gursharnjit_Singh <ubuntuser13@gmail.com>\n"

13"Language-Team: Punjabi <pa@li.org>\n"

14−"Language: pa\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -340,16 +339,16 @@ msgid ""

340"If passphrase is entered incorrectly, your phone will conduct a factory "

339"If passphrase is entered incorrectly, your phone will conduct a factory "

341"reset and all personal data will be deleted."

340"reset and all personal data will be deleted."

342msgstr ""

341msgstr ""

343−"ਜੇਕਰ ਗਲਤ ਵਾਕ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ ਅਤੇ ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ "

342+"ਜੇਕਰ ਗਲਤ ਵਾਕ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ ਅਤੇ "

344−"ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"

343+"ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"

345

344

346#: qml/Greeter/NarrowView.qml:59

345#: qml/Greeter/NarrowView.qml:59

347msgid ""

346msgid ""

348"If passcode is entered incorrectly, your phone will conduct a factory reset "

347"If passcode is entered incorrectly, your phone will conduct a factory reset "

349"and all personal data will be deleted."

348"and all personal data will be deleted."

350msgstr ""

349msgstr ""

351−"ਜੇਕਰ ਗਲਤ ਪਾਸਕੋਡ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ ਅਤੇ ਸਾਰਾ ਨਿੱਜੀ "

350+"ਜੇਕਰ ਗਲਤ ਪਾਸਕੋਡ ਦਰਜ ਹੋਇਆ, ਤੁਹਾਡਾ ਫ਼ੋਨ ਇੱਕ ਫ਼ੋਨ ਇੱਕ ਫ਼ੈਕਟਰੀ ਰੀਸੈੱਟ ਚਾਲੂ ਕਰੇਗਾ "

352−"ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"

351+"ਅਤੇ ਸਾਰਾ ਨਿੱਜੀ ਡਾਟਾ ਹਟਾ ਦਿੱਤਾ ਜਾਵੇਗਾ।"

353

352

354#: qml/Greeter/NarrowView.qml:116

353#: qml/Greeter/NarrowView.qml:116

355#, qt-format

354#, qt-format

@@ -590,7 +589,8 @@ msgstr "ਲਾਕ ਸੁਰੱਖਿਆ"

590

589

591#: qml/Wizard/Pages/30-passwd-type.qml:74

590#: qml/Wizard/Pages/30-passwd-type.qml:74

592msgid "Please select how you’d like to unlock your phone."

591msgid "Please select how you’d like to unlock your phone."

592+msgstr ""

593−msgstr "ਕਿਰਪਾ ਕਰਕੇ ਚੁਣੋ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਕਿਸ ਤਰ੍ਹਾਂ ਅਣ-ਲਾਕ ਕਰਨਾ ਪਸੰਦ ਕਰੋਗੇ।"

593+"ਕਿਰਪਾ ਕਰਕੇ ਚੁਣੋ ਤੁਸੀਂ ਆਪਣੇ ਫ਼ੋਨ ਨੂੰ ਕਿਸ ਤਰ੍ਹਾਂ ਅਣ-ਲਾਕ ਕਰਨਾ ਪਸੰਦ ਕਰੋਗੇ।"

594

595#: qml/Wizard/Pages/30-passwd-type.qml:97

596msgctxt "Label: Type of security method"

@@ -656,7 +656,8 @@ msgid ""

656"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

657"conditions</a>."

658msgstr ""

659−"ਇਸ ਵਿਕਲਪ ਨੂੰ ਚੁਣਨ ਦੁਆਰਾ, ਤੁਸੀਂ ਨੋਕੀਆ HERE <a href='#'>ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ</a>ਨੂੰ ਪ੍ਰਵਾਨ ਕਰਦੇ ਹੋ।"

659+"ਇਸ ਵਿਕਲਪ ਨੂੰ ਚੁਣਨ ਦੁਆਰਾ, ਤੁਸੀਂ ਨੋਕੀਆ HERE <a href='#'>ਨਿਯਮ ਅਤੇ ਸ਼ਰਤਾਂ</a>ਨੂੰ "

660+"ਪ੍ਰਵਾਨ ਕਰਦੇ ਹੋ।"

660

661

661#: qml/Wizard/Pages/50-location.qml:112

662#: qml/Wizard/Pages/50-location.qml:112

662msgid "Not at all"

663msgid "Not at all"

@@ -675,15 +676,16 @@ msgid ""

675"Your phone is set up to automatically report errors to Canonical and its "

676"Your phone is set up to automatically report errors to Canonical and its "

676"partners, the makers of the operating system."

677"partners, the makers of the operating system."

677msgstr ""

678msgstr ""

678−"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕੈਨੋਨੀਕਲ ਅਤੇ ਉਸਦੇ ਸਾਥੀਆਂ, ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਦੇ ਨਿਰਮਾਤਾਵਾਂ ਨੂੰ ਆਪਣੇ ਆਪ ਖਾਮੀ ਸੂਚਨਾਵਾਂ "

679+"ਤੁਹਾਡੇ ਫ਼ੋਨ ਨੂੰ ਕੈਨੋਨੀਕਲ ਅਤੇ ਉਸਦੇ ਸਾਥੀਆਂ, ਓਪਰੇਟਿੰਗ ਸਿਸਟਮ ਦੇ ਨਿਰਮਾਤਾਵਾਂ ਨੂੰ "

679−"ਭੇਜਣ ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ।"

680+"ਆਪਣੇ ਆਪ ਖਾਮੀ ਸੂਚਨਾਵਾਂ ਭੇਜਣ ਲਈ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ।"

680

681

681#: qml/Wizard/Pages/60-reporting.qml:43

682#: qml/Wizard/Pages/60-reporting.qml:43

682msgid ""

683msgid ""

683"This can be disabled in System Settings under Security & "

684"This can be disabled in System Settings under Security & "

684"Privacy"

685"Privacy"

685msgstr ""

686msgstr ""

686−"ਇਸ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗ ਅਧੀਨ ਸੁਰੱਖਿਆ & ਪਰਦੇਦਾਰੀਵਿੱਚ ਬੰਦ ਕੀਤਾ ਜਾ ਸਕਦਾ"

687+"ਇਸ ਨੂੰ ਸਿਸਟਮ ਸੈਟਿੰਗ ਅਧੀਨ ਸੁਰੱਖਿਆ & ਪਰਦੇਦਾਰੀਵਿੱਚ ਬੰਦ ਕੀਤਾ "

688+"ਜਾ ਸਕਦਾ"

687

689

688#: qml/Wizard/Pages/80-finished.qml:24

690#: qml/Wizard/Pages/80-finished.qml:24

689msgid "All done"

691msgid "All done"

@@ -751,6 +753,3 @@ msgstr "%1 〉"

751

753

752#~ msgid "Please re-enter"

754#~ msgid "Please re-enter"

753#~ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ-ਦਰਜ ਕਰੋ"

755#~ msgstr "ਕਿਰਪਾ ਕਰਕੇ ਮੁੜ-ਦਰਜ ਕਰੋ"

754−

755−#~ msgid "Click here to finish."

756−#~ msgstr "ਸਮਾਪਤੀ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ।"

po/pl.po+7−11

@@ -6,19 +6,18 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-12 09:46+0000\n"

12"Last-Translator: Seweryn Opyd <Unknown>\n"

13"Language-Team: Polish <pl@li.org>\n"

14−"Language: pl\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

17"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "

19"|| n%100>=20) ? 1 : 2;\n"

18"|| n%100>=20) ? 1 : 2;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

20+"X-Generator: Launchpad (build 17746)\n"

22

21

23#: plugins/LightDM/Greeter.cpp:112

22#: plugins/LightDM/Greeter.cpp:112

24msgid "Password: "

23msgid "Password: "

@@ -757,8 +756,8 @@ msgstr "%1 〉"

757

756

758#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

757#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

759#~ msgstr ""

758#~ msgstr ""

760−#~ "Przeciągnięcie od lewej krawędzi, uruchamia aktywator szybkiego dostępu "

759+#~ "Przeciągnięcie od lewej krawędzi, uruchamia aktywator szybkiego dostępu do "

761−#~ "do aplikacji"

760+#~ "aplikacji"

762

761

763#~ msgid "Well done"

762#~ msgid "Well done"

764#~ msgstr "Udało się!"

763#~ msgstr "Udało się!"

@@ -773,8 +772,8 @@ msgstr "%1 〉"

773#~ "You have now mastered the edge gestures and can start using the "

772#~ "You have now mastered the edge gestures and can start using the "

774#~ "phone Tap on the screen to start"

773#~ "phone Tap on the screen to start"

775#~ msgstr ""

774#~ msgstr ""

776−#~ "Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do pracy."

775+#~ "Wydawanie poleceń krawędzi zostało opanowane. Urządzenie gotowe do "

777−#~ " Dotknij ekranu by rozpocząć"

776+#~ "pracy. Dotknij ekranu by rozpocząć"

778

777

779#~ msgid "Log out"

778#~ msgid "Log out"

780#~ msgstr "Wyloguj"

779#~ msgstr "Wyloguj"

@@ -802,6 +801,3 @@ msgstr "%1 〉"

802

801

803#~ msgid "Please re-enter"

802#~ msgid "Please re-enter"

804#~ msgstr "Proszę wprowadź ponownie"

803#~ 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 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-29 10:01+0000\n"

12"Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"

13"Language-Team: Portuguese <pt@li.org>\n"

14−"Language: pt\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -802,19 +801,15 @@ msgstr "%1 〉"

802#~ "You have now mastered the edge gestures and can start using the "

801#~ "You have now mastered the edge gestures and can start using the "

803#~ "phone Tap on the screen to start"

802#~ "phone Tap on the screen to start"

804#~ msgstr ""

803#~ msgstr ""

805−#~ "Já domina os gestos das margens, pode começar a usar o "

804+#~ "Já domina os gestos das margens, pode começar a usar o telefone Toque "

806−#~ "telefone Toque no ecrã para começar"

805+#~ "no ecrã para começar"

807

806

808#~ msgid "Store"

807#~ msgid "Store"

809#~ msgstr "Store"

808#~ msgstr "Store"

810

809

811#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

810#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

812#~ msgstr ""

811#~ msgstr ""

813−#~ "Deslize da margem esquerda para mostrar o lançador para acesso rápido às "

812+#~ "Deslize da margem esquerda para mostrar o lançador para acesso rápido às apps"

814−#~ "apps"

815−

816−#~ msgid "Click here to finish."

817−#~ msgstr "Clique aqui para finalizar."

818

813

819#~ msgid "Shut down"

814#~ msgid "Shut down"

820#~ msgstr "Desligar"

815#~ msgstr "Desligar"

po/pt_BR.po+3−7

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-08-05 04:40+0000\n"

12"Last-Translator: Julio Alexander Sieg <julio.sieg@gmail.com>\n"

13"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"

14−"Language: pt_BR\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n > 1;\n"

17"Plural-Forms: nplurals=2; plural=n > 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -815,6 +814,3 @@ msgstr "%1 〉"

815

814

816#~ msgid "Please re-enter"

815#~ msgid "Please re-enter"

817#~ msgstr "Por favor, digite novamente"

816#~ 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 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-06 17:47+0000\n"

12"Last-Translator: Meriuță Cornel <meriutacornel@neacornel.eu>\n"

13"Language-Team: Romanian <ro@li.org>\n"

14−"Language: ro\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "

17"Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "

19"== 0) && (n != 0))) ? 2: 1));\n"

18"== 0) && (n != 0))) ? 2: 1));\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

20+"X-Generator: Launchpad (build 17746)\n"

22

21

23#: plugins/LightDM/Greeter.cpp:112

22#: plugins/LightDM/Greeter.cpp:112

24msgid "Password: "

23msgid "Password: "

@@ -588,7 +587,8 @@ msgstr "Adăugați un card SIM și reporniți dispozitivul dumneavoastră"

588

587

589#: qml/Wizard/Pages/20-sim.qml:59

588#: qml/Wizard/Pages/20-sim.qml:59

590msgid "Without it, you won’t be able to make calls or use text messaging."

589msgid "Without it, you won’t be able to make calls or use text messaging."

590+msgstr ""

591−msgstr "Fără acesta, nu veți putea efectua apeluri sau utiliza mesajele text."

591+"Fără acesta, nu veți putea efectua apeluri sau utiliza mesajele text."

592

593#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

594msgid "Skip"

@@ -677,7 +677,8 @@ msgstr "Deloc"

677

678#: qml/Wizard/Pages/50-location.qml:124

679msgid "You can change your mind later in System Settings."

680+msgstr ""

680−msgstr "Puteți să modificați opțiunea utilizând Configurări de sistem."

681+"Puteți să modificați opțiunea utilizând Configurări de sistem."

681

682

682#: qml/Wizard/Pages/60-reporting.qml:24

683#: qml/Wizard/Pages/60-reporting.qml:24

683msgid "Improving your experience"

684msgid "Improving your experience"

@@ -824,6 +825,3 @@ msgstr "%1 〉"

824

825

825#~ msgid "Please re-enter"

826#~ msgid "Please re-enter"

826#~ msgstr "Introduceți din nou"

827#~ 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 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-06 05:33+0000\n"

12"Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"

13"Language-Team: Russian <ru@li.org>\n"

14−"Language: ru\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18−"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

19−"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

20+"X-Generator: Launchpad (build 17746)\n"

22

21

23#: plugins/LightDM/Greeter.cpp:112

22#: plugins/LightDM/Greeter.cpp:112

24msgid "Password: "

23msgid "Password: "

@@ -674,7 +673,8 @@ msgstr "Нет (никогда)"

674

673

675#: qml/Wizard/Pages/50-location.qml:124

674#: qml/Wizard/Pages/50-location.qml:124

676msgid "You can change your mind later in System Settings."

675msgid "You can change your mind later in System Settings."

676+msgstr ""

677−msgstr "Изменить свой выбор можно позднее, перейдя в Параметры системы."

677+"Изменить свой выбор можно позднее, перейдя в Параметры системы."

678

679#: qml/Wizard/Pages/60-reporting.qml:24

680msgid "Improving your experience"

@@ -755,8 +755,7 @@ msgstr "%1 〉"

755

756#~ msgid "Try swiping from the top edge to access the indicators"

757#~ msgstr ""

758−#~ "Попробуйте переместить палец от верхнего края вниз для доступа к "

758+#~ "Попробуйте переместить палец от верхнего края вниз для доступа к индикаторам"

759−#~ "индикаторам"

760

759

761#~ msgid "Close"

760#~ msgid "Close"

762#~ msgstr "Закрыть"

761#~ msgstr "Закрыть"

@@ -775,8 +774,8 @@ msgstr "%1 〉"

775

774

776#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

775#~ msgid "Swipe from the left to reveal the launcher for quick access to apps"

777#~ msgstr ""

776#~ msgstr ""

778−#~ "Переместите палец от левого края вправо для открытия лаунчера для "

777+#~ "Переместите палец от левого края вправо для открытия лаунчера для быстрого "

779−#~ "быстрого доступа к приложениям"

778+#~ "доступа к приложениям"

780

779

781#~ msgid ""

780#~ msgid ""

782#~ "You have now mastered the edge gestures and can start using the "

781#~ "You have now mastered the edge gestures and can start using the "

@@ -823,6 +822,3 @@ msgstr "%1 〉"

823

822

824#~ msgid "Manage Scopes"

823#~ msgid "Manage Scopes"

825#~ msgstr "Настройки поиска"

824#~ msgstr "Настройки поиска"

826−

827−#~ msgid "Click here to finish."

828−#~ msgstr "Нажмите для завершения."

po/shn.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=(n == 1) ? 0 : 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/si.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/sk.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"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"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/sl.po+5−9

@@ -6,19 +6,18 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-06 21:10+0000\n"

12"Last-Translator: Sasa Batistic <Unknown>\n"

13"Language-Team: Slovenian <sl@li.org>\n"

14−"Language: sl\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18−"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"

17+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || "

19−"%100==4 ? 3 : 0);\n"

18+"n%100==4 ? 3 : 0);\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

20+"X-Generator: Launchpad (build 17746)\n"

22

21

23#: plugins/LightDM/Greeter.cpp:112

22#: plugins/LightDM/Greeter.cpp:112

24msgid "Password: "

23msgid "Password: "

@@ -818,6 +817,3 @@ msgstr "%1 〉"

818

817

819#~ msgid "Please re-enter"

818#~ msgid "Please re-enter"

820#~ msgstr "Ponovno vnesite"

819#~ 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 ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:49+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/sr.po+6−6

@@ -7,19 +7,19 @@

7msgid ""

8msgstr ""

9"Project-Id-Version: unity\n"

10−"Report-Msgid-Bugs-To: \n"

10+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

11"POT-Creation-Date: 2015-08-25 14:53+0200\n"

12"PO-Revision-Date: 2015-09-16 16:20+0000\n"

13"Last-Translator: Bojan Bogdanović <Unknown>\n"

14"Language-Team: српски <xfce4@xfce4.org>\n"

15−"Language: sr\n"

16"MIME-Version: 1.0\n"

15"MIME-Version: 1.0\n"

17"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Type: text/plain; charset=UTF-8\n"

18"Content-Transfer-Encoding: 8bit\n"

17"Content-Transfer-Encoding: 8bit\n"

19−"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"

18+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

20−"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

19+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

21−"X-Launchpad-Export-Date: 2015-09-17 05:46+0000\n"

20+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

22−"X-Generator: Launchpad (build 17737)\n"

21+"X-Generator: Launchpad (build 17746)\n"

22+"Language: sr\n"

23

24#: plugins/LightDM/Greeter.cpp:112

25msgid "Password: "

po/sv.po+10−11

@@ -6,18 +6,18 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-12 22:17+0000\n"

12"Last-Translator: Josef Andersson <Unknown>\n"

13"Language-Team: Swedish\n"

14−"Language: sv\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20+"Language: sv\n"

21

22#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

@@ -578,7 +578,8 @@ msgstr "Lägg till ett SIM-kort och starta om din enhet"

578

579#: qml/Wizard/Pages/20-sim.qml:59

580msgid "Without it, you won’t be able to make calls or use text messaging."

581+msgstr ""

581−msgstr "Utan det kommer du inte att kunna ringa eller skicka textmeddelanden."

582+"Utan det kommer du inte att kunna ringa eller skicka textmeddelanden."

582

583

583#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

584#: qml/Wizard/Pages/20-sim.qml:73 qml/Wizard/Pages/40-wifi.qml:215

584msgid "Skip"

585msgid "Skip"

@@ -648,7 +649,8 @@ msgstr "Använd endast GPS (sämre precision)"

648

649

649#: qml/Wizard/Pages/50-location.qml:86

650#: qml/Wizard/Pages/50-location.qml:86

650msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

651msgid "Using GPS, anonymized Wi-Fi and cellular network info (recommended)"

652+msgstr ""

651−msgstr "Använd GPS, anonymiserad Wi-Fi och mobil nätverksinfo (rekommenderas)"

653+"Använd GPS, anonymiserad Wi-Fi och mobil nätverksinfo (rekommenderas)"

652

654

653#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

655#. Translators: HERE is a trademark for Nokia's location service, you probably shouldn't translate it

654#: qml/Wizard/Pages/50-location.qml:103

656#: qml/Wizard/Pages/50-location.qml:103

@@ -656,8 +658,8 @@ msgid ""

656"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

658"By selecting this option you agree to the Nokia HERE <a href='#'>terms and "

657"conditions</a>."

659"conditions</a>."

658msgstr ""

660msgstr ""

659−"Genom att välja detta alternativ godkänner du <a href='#'>användarvillkoren</"

661+"Genom att välja detta alternativ godkänner du <a "

660−"a> för Nokia HERE."

662+"href='#'>användarvillkoren</a> för Nokia HERE."

661

663

662#: qml/Wizard/Pages/50-location.qml:112

664#: qml/Wizard/Pages/50-location.qml:112

663msgid "Not at all"

665msgid "Not at all"

@@ -808,6 +810,3 @@ msgstr "%1 〉"

808

810

809#~ msgid "Please re-enter"

811#~ msgid "Please re-enter"

810#~ msgstr "Ange igen"

812#~ 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 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity8\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-17 20:02+0000\n"

12"Last-Translator: Valentine <mwangi_valentino@yahoo.com>\n"

13"Language-Team: Swahili <sw@li.org>\n"

14−"Language: sw\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -720,6 +719,3 @@ msgstr ""

720

719

721#~ msgid "Please re-enter"

720#~ msgid "Please re-enter"

722#~ msgstr "Tafadhali bonyeza tena"

721#~ 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 ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20"Language: ta\n"

21

22#: plugins/LightDM/Greeter.cpp:112

po/te.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/th.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/tr.po+3−7

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-03-22 15:56+0000\n"

12"Last-Translator: Arda Ünlü <aarda.uunlu@gmail.com>\n"

13"Language-Team: Turkish <tr@li.org>\n"

14−"Language: tr\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=2; plural=n != 1;\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -802,6 +801,3 @@ msgstr "%1 〉"

802

801

803#~ msgid "Please re-enter"

802#~ msgid "Please re-enter"

804#~ msgstr "Lütfen yeniden girin"

803#~ 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 ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/uk.po+8−13

@@ -6,19 +6,18 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-04 05:53+0000\n"

12"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"

13"Language-Team: Ukrainian <uk@li.org>\n"

14−"Language: uk\n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18−"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"

17+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "

19−"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

18+"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"

20−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

19+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

21−"X-Generator: Launchpad (build 17737)\n"

20+"X-Generator: Launchpad (build 17746)\n"

22

21

23#: plugins/LightDM/Greeter.cpp:112

22#: plugins/LightDM/Greeter.cpp:112

24msgid "Password: "

23msgid "Password: "

@@ -773,8 +772,7 @@ msgstr "%1 〉"

773#~ msgstr "Пропустити вступ"

772#~ msgstr "Пропустити вступ"

774

773

775#~ msgid "Try swiping from the right edge to unlock the phone"

774#~ msgid "Try swiping from the right edge to unlock the phone"

776−#~ msgstr ""

777−#~ "Спробуйте провести пальцем від правою краю, щоб розблокувати телефон"

775+#~ msgstr "Спробуйте провести пальцем від правою краю, щоб розблокувати телефон"

778

776

779#~ msgid "Right edge"

777#~ msgid "Right edge"

780#~ msgstr "Правий край"

778#~ msgstr "Правий край"

@@ -783,8 +781,8 @@ msgstr "%1 〉"

783#~ "You have now mastered the edge gestures and can start using the "

781#~ "You have now mastered the edge gestures and can start using the "

784#~ "phone Tap on the screen to start"

782#~ "phone Tap on the screen to start"

785#~ msgstr ""

783#~ msgstr ""

786−#~ "Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер "

784+#~ "Вами налаштовано дії у відповідь на дотики на краях екрана. Тепер телефоном "

787−#~ "телефоном можна користуватися. Торкніться екрана, щоб розпочати."

785+#~ "можна користуватися. Торкніться екрана, щоб розпочати."

788

786

789#~ msgid "All"

787#~ msgid "All"

790#~ msgstr "Все"

788#~ msgstr "Все"

@@ -824,6 +822,3 @@ msgstr "%1 〉"

824

822

825#~ msgid "Please re-enter"

823#~ msgid "Please re-enter"

826#~ msgstr "Ввведіть ще раз"

824#~ msgstr "Ввведіть ще раз"

827−

828−#~ msgid "Click here to finish."

829−#~ msgstr "Натисніть тут, щоб завершити."

po/ur.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/uz.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/vi.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/xh.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=2; plural=n != 1;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/zh_CN.po+7−15

@@ -6,18 +6,17 @@

6msgid ""

7msgstr ""

8"Project-Id-Version: unity\n"

9−"Report-Msgid-Bugs-To: \n"

9+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"

10"POT-Creation-Date: 2015-08-25 14:53+0200\n"

11"PO-Revision-Date: 2015-07-27 10:26+0000\n"

12"Last-Translator: Ian Li <Unknown>\n"

13"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"

14−"Language: \n"

15"MIME-Version: 1.0\n"

14"MIME-Version: 1.0\n"

16"Content-Type: text/plain; charset=UTF-8\n"

15"Content-Type: text/plain; charset=UTF-8\n"

17"Content-Transfer-Encoding: 8bit\n"

16"Content-Transfer-Encoding: 8bit\n"

18"Plural-Forms: nplurals=1; plural=0;\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

19−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

20−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

21

20

22#: plugins/LightDM/Greeter.cpp:112

21#: plugins/LightDM/Greeter.cpp:112

23msgid "Password: "

22msgid "Password: "

@@ -338,15 +337,13 @@ msgstr "这是您最后的尝试机会。"

338msgid ""

337msgid ""

339"If passphrase is entered incorrectly, your phone will conduct a factory "

338"If passphrase is entered incorrectly, your phone will conduct a factory "

340"reset and all personal data will be deleted."

339"reset and all personal data will be deleted."

341−msgstr ""

342−"如果输入的密语不正确，您的手机将恢复到出厂设置并且所有的个人数据将被删除。"

340+msgstr "如果输入的密语不正确，您的手机将恢复到出厂设置并且所有的个人数据将被删除。"

343

341

344#: qml/Greeter/NarrowView.qml:59

342#: qml/Greeter/NarrowView.qml:59

345msgid ""

343msgid ""

346"If passcode is entered incorrectly, your phone will conduct a factory reset "

344"If passcode is entered incorrectly, your phone will conduct a factory reset "

347"and all personal data will be deleted."

345"and all personal data will be deleted."

348−msgstr ""

349−"如果输入的密码不正确，您的手机将恢复到出厂设置并且所有的个人数据将被删除。"

346+msgstr "如果输入的密码不正确，您的手机将恢复到出厂设置并且所有的个人数据将被删除。"

350

347

351#: qml/Greeter/NarrowView.qml:116

348#: qml/Greeter/NarrowView.qml:116

352#, qt-format

349#, qt-format

@@ -667,8 +664,7 @@ msgstr "改善您的体验"

667msgid ""

664msgid ""

668"Your phone is set up to automatically report errors to Canonical and its "

665"Your phone is set up to automatically report errors to Canonical and its "

669"partners, the makers of the operating system."

666"partners, the makers of the operating system."

670−msgstr ""

671−"您的手机设置为自动向操作系统的制造商Canonical 及其合作伙伴发送错误报告。"

667+msgstr "您的手机设置为自动向操作系统的制造商Canonical 及其合作伙伴发送错误报告。"

672

668

673#: qml/Wizard/Pages/60-reporting.qml:43

669#: qml/Wizard/Pages/60-reporting.qml:43

674msgid ""

670msgid ""

@@ -755,8 +751,7 @@ msgstr "%1 〉"

755#~ msgid ""

751#~ msgid ""

756#~ "You have now mastered the edge gestures and can start using the "

752#~ "You have now mastered the edge gestures and can start using the "

757#~ "phone Tap on the screen to start"

753#~ "phone Tap on the screen to start"

758−#~ msgstr ""

759−#~ "您现在已经掌握了边缘滑动手势，可以开始使用手机了 请点击屏幕开始使用"

754+#~ msgstr "您现在已经掌握了边缘滑动手势，可以开始使用手机了 请点击屏幕开始使用"

760

755

761#~ msgid "All"

756#~ msgid "All"

762#~ msgstr "所有"

757#~ msgstr "所有"

@@ -775,6 +770,3 @@ msgstr "%1 〉"

775

770

776#~ msgid "Please re-enter"

771#~ msgid "Please re-enter"

777#~ msgstr "请重新输入"

772#~ msgstr "请重新输入"

778−

779−#~ msgid "Click here to finish."

780−#~ msgstr "点击这里完成。"

po/zh_HK.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20

21#: plugins/LightDM/Greeter.cpp:112

22msgid "Password: "

po/zh_TW.po+2−2

@@ -15,8 +15,8 @@ msgstr ""

15"Content-Type: text/plain; charset=UTF-8\n"

16"Content-Transfer-Encoding: 8bit\n"

17"Plural-Forms: nplurals=1; plural=0;\n"

18−"X-Launchpad-Export-Date: 2015-09-16 05:50+0000\n"

18+"X-Launchpad-Export-Date: 2015-09-19 05:37+0000\n"

19−"X-Generator: Launchpad (build 17737)\n"

19+"X-Generator: Launchpad (build 17746)\n"

20"Language: zh_TW\n"

21

22#: plugins/LightDM/Greeter.cpp:112

qml/Dash/PreviewListView.qml+12−4

@@ -101,18 +101,26 @@ Item {

101

102 isCurrent: ListView.isCurrentItem

103

104− previewModel: {

104+ readonly property var previewStack: {

105 if (root.open) {

106 if (index === root.initialIndex) {

107− return root.initialIndexPreviewStack.getPreviewModel(0);

107+ return root.initialIndexPreviewStack;

108 } else {

109− var previewStack = root.scope.preview(result, root.categoryId);

109+ return root.scope.preview(result, root.categoryId);

110− return previewStack.getPreviewModel(0);

111 }

110 }

112 } else {

111 } else {

113 return null;

112 return null;

114 }

113 }

115 }

114 }

115+

116+ previewModel: {

117+ if (previewStack) {

118+ return previewStack.getPreviewModel(0);

119+ } else {

120+ return null;

121+ }

122+ }

123+

116 scopeStyle: root.scopeStyle

124 scopeStyle: root.scopeStyle

117 }

125 }

118 }

126 }

qml/Greeter/Infographics.qml+1−1

@@ -73,7 +73,7 @@ Item {

73 notification.hideAnim.start()

74 }

75

76− visible: model.label !== ""

76+ visible: model.username !== ""

77

78 Component.onCompleted: startShowAnimation()

79

src/Dash/main.cpp+1−1

@@ -101,7 +101,7 @@ int main(int argc, const char *argv[])

101 mouseTouchAdaptor = MouseTouchAdaptor::instance();

102 }

103

104− QUrl source(::qmlDirectory()+"Dash/DashApplication.qml");

104+ QUrl source(::qmlDirectory() + "/Dash/DashApplication.qml");

105 prependImportPaths(view->engine(), ::overrideImportPaths());

106 appendImportPaths(view->engine(), ::fallbackImportPaths());

107

src/Panel/Indicators/client/indicatorsclient.cpp+1−1

@@ -36,7 +36,7 @@ IndicatorsClient::IndicatorsClient(int &argc, char **argv)

36 QStringList args = m_application->arguments();

37

38 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/"));

40 prependImportPaths(m_view->engine(), ::overrideImportPaths());

41 appendImportPaths(m_view->engine(), ::fallbackImportPaths());

42

src/main.cpp+1−1

@@ -105,7 +105,7 @@ int main(int argc, const char *argv[])

105 mouseTouchAdaptor = MouseTouchAdaptor::instance();

106 }

107

108− QUrl source(::qmlDirectory()+"OrientedShell.qml");

108+ QUrl source(::qmlDirectory() + "/OrientedShell.qml");

109 prependImportPaths(view->engine(), ::overrideImportPaths());

110 if (!isMirServer) {

111 prependImportPaths(view->engine(), ::nonMirImportPaths());

tests/CMakeLists.txt+9−3

@@ -22,11 +22,17 @@ add_subdirectory(uqmlscene)

22add_executable(qmlscene ALIAS uqmlscene)

23import_executables(dbus-test-runner)

24

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

25set(UNITY_IMPORT_PATHS

29set(UNITY_IMPORT_PATHS

30+ ${UNITY_MOCKPATH}

26 ${CMAKE_BINARY_DIR}/tests/mocks

31 ${CMAKE_BINARY_DIR}/tests/mocks

27 ${CMAKE_BINARY_DIR}/tests/utils/modules

32 ${CMAKE_BINARY_DIR}/tests/utils/modules

28− ${CMAKE_BINARY_DIR}/plugins

33+ ${UNITY_PLUGINPATH}

29)

34)

35+list(REMOVE_DUPLICATES UNITY_IMPORT_PATHS)

30set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")

36set(UNITY_IMPORT_PATHS ${UNITY_IMPORT_PATHS} CACHE INTERNAL "")

31

37

32macro(unity8_parse_arguments)

38macro(unity8_parse_arguments)

@@ -40,8 +46,8 @@ macro(unity8_parse_arguments)

40 set(ld_paths)

46 set(ld_paths)

41 if(U8TEST_LIGHTDM)

47 if(U8TEST_LIGHTDM)

42 list(APPEND ld_paths

48 list(APPEND ld_paths

43− ${CMAKE_BINARY_DIR}/tests/mocks/libusermetrics

49+ ${UNITY_MOCKPATH}/libusermetrics

44− ${CMAKE_BINARY_DIR}/tests/mocks/LightDM/liblightdm

50+ ${UNITY_MOCKPATH}/IntegratedLightDM/liblightdm

45 )

51 )

46 endif()

52 endif()

47

53

tests/autopilot/unity8/fixture_setup.py+1−1

@@ -74,7 +74,7 @@ class LaunchUnityWithFakeSensors(fixtures.Fixture):

74 def _get_lightdm_mock_path(self):

75 lib_path = get_mocks_library_path()

76 lightdm_mock_path = os.path.abspath(

77− os.path.join(lib_path, "LightDM", "liblightdm")

77+ os.path.join(lib_path, "IntegratedLightDM", "liblightdm")

78 )

79

80 if not os.path.exists(lightdm_mock_path):

tests/autopilot/unity8/shell/tests/__init__.py+1−1

@@ -261,7 +261,7 @@ class UnityTestCase(AutopilotTestCase):

261 def _get_lightdm_mock_path(self):

262 lib_path = get_mocks_library_path()

263 lightdm_mock_path = os.path.abspath(

264− os.path.join(lib_path, "LightDM", "liblightdm")

264+ os.path.join(lib_path, "IntegratedLightDM", "liblightdm")

265 )

266

267 if not os.path.exists(lightdm_mock_path):

tests/mocks/AccountsService/AccountsService.cpp+1−1

@@ -24,7 +24,7 @@ AccountsService::AccountsService(QObject* parent)

24 : QObject(parent),

25 m_enableLauncherWhileLocked(true),

26 m_enableIndicatorsWhileLocked(true),

27− m_backgroundFile(qmlDirectory() + "graphics/phone_background.jpg"),

27+ m_backgroundFile(qmlDirectory() + "/graphics/phone_background.jpg"),

28 m_statsWelcomeScreen(true),

29 m_failedLogins(0),

30 m_demoEdges(false),

tests/mocks/IntegratedLightDM/liblightdm/CMakeLists.txt+1−1

@@ -14,5 +14,5 @@ set_target_properties(MockLightDM PROPERTIES

14 OUTPUT_NAME lightdm-qt5-2)

15

16install(TARGETS MockLightDM

17− DESTINATION ${SHELL_INSTALL_QML}/mocks/LightDM/liblightdm

17+ DESTINATION ${SHELL_INSTALL_QML}/mocks/IntegratedLightDM/liblightdm

18 )

tests/mocks/Ubuntu/CMakeLists.txt+1

@@ -5,3 +5,4 @@ add_subdirectory(SystemImage)

5add_subdirectory(SystemSettings)

6add_subdirectory(Telephony)

7add_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+/*

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

18 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h

19 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h

20 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceItemInterface.h

21+ resources/surfaces.qrc

21)

22)

22

23

23add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})

24add_library(FakeUnityApplicationQml MODULE ${FakeUnityApplicationQml_SOURCES})

tests/mocks/Unity/Application/MirSurface.cpp+2−2

@@ -22,7 +22,7 @@ MirSurface::MirSurface(const QString& name,

22 Mir::Type type,

23 Mir::State state,

24 const QUrl& screenshot,

25− const QString &qmlFilePath)

25+ const QUrl &qmlFilePath)

26 : unity::shell::application::MirSurfaceInterface(nullptr)

27 , m_name(name)

28 , m_type(type)

@@ -87,7 +87,7 @@ void MirSurface::setLive(bool live)

87 }

88}

89

90−QString MirSurface::qmlFilePath() const

90+QUrl MirSurface::qmlFilePath() const

91{

92 return m_qmlFilePath;

93}

tests/mocks/Unity/Application/MirSurface.h+3−3

@@ -38,7 +38,7 @@ public:

38 Mir::Type type,

39 Mir::State state,

40 const QUrl& screenshot,

41− const QString &qmlFilePath = QString());

41+ const QUrl &qmlFilePath = QUrl());

42 virtual ~MirSurface();

43

44 ////

@@ -76,7 +76,7 @@ public:

76 /////

77 // internal mock stuff

78

79− QString qmlFilePath() const;

79+ QUrl qmlFilePath() const;

80

81 QUrl screenshotUrl() const;

82 void setScreenshotUrl(QUrl);

@@ -102,7 +102,7 @@ private:

102 Mir::State m_state;

103 Mir::OrientationAngle m_orientationAngle;

104 QUrl m_screenshotUrl;

105− QString m_qmlFilePath;

105+ QUrl m_qmlFilePath;

106 bool m_live;

107 int m_viewCount;

108 bool m_activeFocus;

tests/mocks/Unity/Application/MirSurfaceItem.cpp+3−4

@@ -215,12 +215,11 @@ void MirSurfaceItem::setSurface(MirSurfaceInterface* surface)

215 QQuickView *quickView =

216 qobject_cast<QQuickView*>(QGuiApplication::topLevelWindows()[0]);

217

218− QString qmlComponentFilePath;

218+ QUrl qmlComponentFilePath;

219 if (!m_qmlSurface->qmlFilePath().isEmpty()) {

220− qmlComponentFilePath.append(m_qmlSurface->qmlFilePath());

220+ qmlComponentFilePath = m_qmlSurface->qmlFilePath();

221 } else {

222− qmlComponentFilePath = QString("%1/Unity/Application/MirSurfaceItem.qml")

222+ qmlComponentFilePath = QUrl("qrc:///Unity/Application/MirSurfaceItem.qml");

223− .arg(mockPluginsDir());

224 }

223 }

225

224

226 m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlComponentFilePath);

225 m_qmlContentComponent = new QQmlComponent(quickView->engine(), qmlComponentFilePath);

tests/mocks/Unity/Application/VirtualKeyboard.cpp+2−4

@@ -26,10 +26,8 @@ VirtualKeyboard::VirtualKeyboard()

26 : MirSurface("input-method",

27 Mir::InputMethodType,

28 Mir::MinimizedState,

29− QString("file://%1/Dash/graphics/phone/screenshots/vkb_portrait.png")

29+ QUrl("qrc:///Unity/Application/vkb_portrait.png"),

30− .arg(qmlDirectory()),

31− QString("%1/Unity/Application/VirtualKeyboard.qml")

30+ QUrl("qrc:///Unity/Application/VirtualKeyboard.qml"))

32− .arg(mockPluginsDir()))

33{

31{

34}

32}

35

33

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

29 m_appId(appId),

30 m_desktopFile(desktopFile),

31 m_name(name),

32− m_icon(qmlDirectory() + "graphics/applicationIcons/" + icon + ".png"),

32+ m_icon(qmlDirectory() + "/graphics/applicationIcons/" + icon + ".png"),

33 m_pinned(false),

34 m_running(false),

35 m_recent(false),

tests/mocks/Unity/fake_previewstack.cpp+2−2

@@ -21,8 +21,8 @@

21#include "fake_previewmodel.h"

22#include "fake_scope.h"

23

24−PreviewStack::PreviewStack(QObject* parent, Scope *scope)

24+PreviewStack::PreviewStack(Scope *scope)

25− : unity::shell::scopes::PreviewStackInterface(parent)

25+ : unity::shell::scopes::PreviewStackInterface(nullptr)

26{

27 m_previews << new PreviewModel(this, scope);

28}

tests/mocks/Unity/fake_previewstack.h+1−1

@@ -32,7 +32,7 @@ class PreviewStack : public unity::shell::scopes::PreviewStackInterface

32 Q_OBJECT

33

34public:

35− explicit PreviewStack(QObject* parent = 0, Scope* scope = 0);

35+ explicit PreviewStack(Scope* scope = 0);

36 virtual ~PreviewStack();

37

38 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

78 case RoleTitle:

79 return QString("Title.%1.%2").arg(m_categoryId).arg(index.row());

80 case RoleArt:

81− return qmlDirectory() + "graphics/applicationIcons/dash.png";

81+ return qmlDirectory() + "/graphics/applicationIcons/dash.png";

82 case RoleSubtitle:

83 return QString("Subtitle.%1.%2").arg(m_categoryId).arg(index.row());

84 case RoleMascot:

tests/mocks/Unity/fake_scope.cpp+3−5

@@ -201,9 +201,7 @@ PreviewStack* Scope::preview(QVariant const& result, QString const& /*categoryId

201 if (m_returnNullPreview) {

202 return nullptr;

203 } 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);

207 }

205 }

208}

206}

209

207

@@ -253,11 +251,11 @@ QVariantMap Scope::customizations() const

253 m["foreground-color"] = "blue";

251 m["foreground-color"] = "blue";

254 m["page-header"] = h;

252 m["page-header"] = h;

255 } else if (m_id == "MockScope4") {

253 } 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");

257 m["page-header"] = h;

255 m["page-header"] = h;

258 } else if (m_id == "MockScope5") {

256 } else if (m_id == "MockScope5") {

259 h["background"] = "gradient:///lightgrey/grey";

257 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");

261 h["divider-color"] = "red";

259 h["divider-color"] = "red";

262 h["navigation-background"] = "color:///black";

260 h["navigation-background"] = "color:///black";

263 m["page-header"] = h;

261 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

308 case RoleSubtitle:

309 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();

310 case RoleArt:

311− return qmlDirectory() + "graphics/applicationIcons/dash.png";

311+ return qmlDirectory() + "/graphics/applicationIcons/dash.png";

312 case RoleMascot:

313 case RoleEmblem:

314 case RoleSummary:

tests/mocks/libusermetrics/UserMetrics.cpp+1−5

@@ -416,11 +416,7 @@ UserMetrics::~UserMetrics()

416

417QString UserMetrics::label() const

418{

419− if (d_ptr->m_label.isEmpty()) {

420− return "No data";

421− } else {

422− return d_ptr->m_label;

419+ return d_ptr->m_label;

423− }

424}

420}

425

421

426QString UserMetrics::username() const

422QString UserMetrics::username() const

tests/plugins/Dash/CMakeLists.txt−1

@@ -23,7 +23,6 @@ include_directories(

23remove_definitions(-DQT_NO_KEYWORDS)

24

25add_definitions(-DDASHVIEWSTEST_FOLDER="${CMAKE_CURRENT_SOURCE_DIR}")

26−add_definitions(-DBUILT_PLUGINS_DIR="${CMAKE_BINARY_DIR}/plugins")

27

26

28macro(add_lvwph_test FILENAME TESTNAME)

27macro(add_lvwph_test FILENAME TESTNAME)

29 add_executable(${TESTNAME}TestExec

28 add_executable(${TESTNAME}TestExec

tests/plugins/Dash/cardcreatortest.cpp−1

@@ -35,7 +35,6 @@ private Q_SLOTS:

35 void init()

36 {

37 view = new QQuickView();

38− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

39 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/cardcreatortest.qml"));

38 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/cardcreatortest.qml"));

40 view->show();

39 view->show();

41 QTest::qWaitForWindowExposed(view);

40 QTest::qWaitForWindowExposed(view);

tests/plugins/Dash/horizontaljournaltest.cpp−1

@@ -123,7 +123,6 @@ private Q_SLOTS:

123 {

124 view = new QQuickView();

125 view->setResizeMode(QQuickView::SizeRootObjectToView);

126− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

127

126

128 model = new WidthModel();

127 model = new WidthModel();

129 QStringList widthList;

128 QStringList widthList;

tests/plugins/Dash/horizontaljournaltry.cpp−1

@@ -63,7 +63,6 @@ int main(int argc, char *argv[])

63

64 QQuickView *view = new QQuickView();

65 view->setResizeMode(QQuickView::SizeRootObjectToView);

66− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

67

66

68 QWidthModela model;

67 QWidthModela model;

69 QStringList heightList;

68 QStringList heightList;

tests/plugins/Dash/listviewwithpageheadersectionexternalmodeltest.cpp−1

@@ -168,7 +168,6 @@ private Q_SLOTS:

168 void init()

169 {

170 view = new QQuickView();

171− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

172 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsectionexternalmodel.qml"));

171 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsectionexternalmodel.qml"));

173 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

172 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

174 QVERIFY(lvwph);

173 QVERIFY(lvwph);

tests/plugins/Dash/listviewwithpageheadersectiontest.cpp−1

@@ -133,7 +133,6 @@ private Q_SLOTS:

133 void init()

134 {

135 view = new QQuickView();

136− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

137 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsection.qml"));

136 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertestsection.qml"));

138 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

137 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

139 model = view->rootObject()->findChild<QQmlListModel*>();

138 model = view->rootObject()->findChild<QQmlListModel*>();

tests/plugins/Dash/listviewwithpageheadertest.cpp−1

@@ -119,7 +119,6 @@ private Q_SLOTS:

119 void init()

120 {

121 view = new QQuickView();

122− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

123 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertest.qml"));

122 view->setSource(QUrl::fromLocalFile(DASHVIEWSTEST_FOLDER "/listviewwithpageheadertest.qml"));

124 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

123 lvwph = dynamic_cast<ListViewWithPageHeader*>(view->rootObject()->findChild<QQuickFlickable*>());

125 model = view->rootObject()->findChild<QQmlListModel*>();

124 model = view->rootObject()->findChild<QQmlListModel*>();

tests/plugins/Dash/organicgridtest.cpp−1

@@ -126,7 +126,6 @@ private Q_SLOTS:

126 {

127 view = new QQuickView();

128 view->setResizeMode(QQuickView::SizeRootObjectToView);

129− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

130

129

131 model = new DummyModel();

130 model = new DummyModel();

132 model->setCount(21);

131 model->setCount(21);

tests/plugins/Dash/organicgridtry.cpp−1

@@ -73,7 +73,6 @@ int main(int argc, char *argv[])

73

74 QQuickView *view = new QQuickView();

75 view->setResizeMode(QQuickView::SizeRootObjectToView);

76− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

77

76

78 DummyModel model;

77 DummyModel model;

79 model.setCount(3);

78 model.setCount(3);

tests/plugins/Dash/verticaljournaltest.cpp−1

@@ -125,7 +125,6 @@ private Q_SLOTS:

125 {

126 view = new QQuickView();

127 view->setResizeMode(QQuickView::SizeRootObjectToView);

128− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

129

128

130 model = new HeightModel();

129 model = new HeightModel();

131 QStringList heightList;

130 QStringList heightList;

tests/plugins/Dash/verticaljournaltry.cpp−1

@@ -63,7 +63,6 @@ int main(int argc, char *argv[])

63

64 QQuickView *view = new QQuickView();

65 view->setResizeMode(QQuickView::SizeRootObjectToView);

66− view->engine()->addImportPath(BUILT_PLUGINS_DIR);

67

66

68 QHeightModel model;

67 QHeightModel model;

69 QStringList heightList;

68 QStringList heightList;

tests/plugins/IntegratedLightDM/CMakeLists.txt+1−1

@@ -25,7 +25,7 @@ add_unity8_uitest(GreeterDBus dbus-test-runner

25 ARG_PREFIX "--parameter"

26 ARGS --task $<TARGET_FILE:GreeterDBusTestExec>

27 DEPENDS MockLightDM

28− IMPORT_PATHS ${CMAKE_BINARY_DIR}/tests/mocks

28+ IMPORT_PATHS ${UNITY_MOCKPATH}

29 LIGHTDM

30 )

31

tests/plugins/Ubuntu/Gestures/CMakeLists.txt+3−7

@@ -14,9 +14,6 @@ include_directories(

14

15export_qmlfiles(UbuntuGesturesTest .)

16

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−

20macro(build_gesture_test CLASSNAME)

17macro(build_gesture_test CLASSNAME)

21 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp TestItem.cpp)

18 add_executable(${CLASSNAME}TestExec tst_${CLASSNAME}.cpp GestureTest.cpp TestItem.cpp)

22 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)

19 qt5_use_modules(${CLASSNAME}TestExec Test Core Qml Gui Quick)

@@ -26,7 +23,7 @@ endmacro()

26macro(add_gesture_unit_test CLASSNAME)

23macro(add_gesture_unit_test CLASSNAME)

27 build_gesture_test(${CLASSNAME})

24 build_gesture_test(${CLASSNAME})

28 add_unity8_unittest(${CLASSNAME} ${CLASSNAME}TestExec

25 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

30 DEPENDS UbuntuGesturesTest-qmlfiles

27 DEPENDS UbuntuGesturesTest-qmlfiles

31 ${ARGN}

28 ${ARGN}

32 )

29 )

@@ -35,12 +32,11 @@ endmacro()

35macro(add_gesture_ui_test CLASSNAME)

32macro(add_gesture_ui_test CLASSNAME)

36 build_gesture_test(${CLASSNAME})

33 build_gesture_test(${CLASSNAME})

37 add_unity8_uitest(${CLASSNAME} ${CLASSNAME}TestExec

34 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

39 DEPENDS UbuntuGesturesTest-qmlfiles

36 DEPENDS UbuntuGesturesTest-qmlfiles

40 ${ARGN}

37 ${ARGN}

41 )

38 )

42− add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${CMAKE_BINARY_DIR}/plugins

39+ add_manual_qml_test(. ${CLASSNAME} IMPORT_PATHS ${UNITY_PLUGINPATH})

43− ${CMAKE_BINARY_DIR}/tests/utils/modules)

44endmacro()

40endmacro()

45

41

46add_gesture_ui_test(DirectionalDragArea)

42add_gesture_ui_test(DirectionalDragArea)

tests/plugins/Ubuntu/Gestures/GestureTest.cpp−2

@@ -44,8 +44,6 @@ void GestureTest::init()

44{

45 m_view = new QQuickView;

46 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));

49 m_view->setSource(QUrl::fromLocalFile(m_qmlFilename));

47 m_view->setSource(QUrl::fromLocalFile(m_qmlFilename));

50 m_view->show();

48 m_view->show();

51 QVERIFY(QTest::qWaitForWindowExposed(m_view));

49 QVERIFY(QTest::qWaitForWindowExposed(m_view));

tests/plugins/Ubuntu/Gestures/tst_TouchGate.cpp−1

@@ -119,7 +119,6 @@ QQuickView *tst_TouchGate::createView()

119 QQuickView *window = new QQuickView(0);

120 window->setResizeMode(QQuickView::SizeRootObjectToView);

121 window->resize(720, 720);

122− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

123

122

124 return window;

123 return window;

125}

124}

tests/qmltests/CMakeLists.txt+2−2

@@ -1,7 +1,7 @@

1

2add_subdirectory(Components)

3

4−add_unity8_qmltest(. OrientedShell)

4+add_unity8_qmltest(. OrientedShell LIGHTDM)

5add_unity8_qmltest(. Shell LIGHTDM)

6add_unity8_qmltest(. ShellWithPin LIGHTDM)

7add_unity8_qmltest(Components Background)

@@ -18,7 +18,7 @@ add_unity8_qmltest(Components Showable)

18add_unity8_qmltest(Components ZoomableImage)

19add_unity8_qmltest(Dash Dash)

20add_unity8_qmltest(Dash DashContent)

21−add_unity8_qmltest(Dash DashShell)

21+add_unity8_qmltest(Dash DashShell LIGHTDM)

22add_unity8_qmltest(Dash Card)

23add_unity8_qmltest(Dash CardCarousel)

24add_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")

2add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")

1add_definitions(-DTEST_DIR="${CMAKE_CURRENT_LIST_DIR}")

3−add_definitions(-DTESTS_UTILS_MODULES_DIR="${CMAKE_BINARY_DIR}/tests/utils/modules")

4

2

5########## tst_DragHandle

3########## tst_DragHandle

6

4

@@ -17,8 +15,7 @@ qt5_use_modules(DragHandleTestExec Test Core Qml Gui Quick)

17target_link_libraries(DragHandleTestExec UbuntuGesturesQml UbuntuGestures)

15target_link_libraries(DragHandleTestExec UbuntuGesturesQml UbuntuGestures)

18

16

19add_unity8_uitest(DragHandle DragHandleTestExec ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/plugins/Ubuntu/Gestures)

17add_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)

18+add_manual_qml_test(. DragHandle IMPORT_PATHS ${UNITY_PLUGINPATH})

21−

22

19

23########## tst_EdgeDragEvaluator

20########## tst_EdgeDragEvaluator

24add_executable(EdgeDragEvaluatorTestExec tst_EdgeDragEvaluator.cpp)

21add_executable(EdgeDragEvaluatorTestExec tst_EdgeDragEvaluator.cpp)

tests/qmltests/Components/tst_DragHandle.cpp−2

@@ -113,9 +113,7 @@ QQuickView *tst_DragHandle::createView()

113{

114 QQuickView *window = new QQuickView(0);

115 window->setResizeMode(QQuickView::SizeRootObjectToView);

116− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

117 window->engine()->addImportPath(QLatin1String(TEST_DIR));

116 window->engine()->addImportPath(QLatin1String(TEST_DIR));

118− window->engine()->addImportPath(QStringLiteral(TESTS_UTILS_MODULES_DIR));

119

117

120 return window;

118 return window;

121}

119}

tests/qmltests/Components/tst_EdgeDragEvaluator.cpp−1

@@ -99,7 +99,6 @@ QQuickView *tst_EdgeDragEvaluator::createView()

99{

100 QQuickView *window = new QQuickView(0);

101 window->setResizeMode(QQuickView::SizeRootObjectToView);

102− window->engine()->addImportPath(QLatin1String(UBUNTU_GESTURES_PLUGIN_DIR));

103 window->engine()->addImportPath(QLatin1String(TEST_DIR));

102 window->engine()->addImportPath(QLatin1String(TEST_DIR));

104

103

105 return window;

104 return window;

tests/qmltests/Dash/tst_Card.qml+2−2

@@ -473,14 +473,14 @@ Rectangle {

473

474 card.cardData["mascot"] = "somethingbroken2";

475 card.cardDataChanged();

476− compare(mascotImage.image.status, Image.Error);

476+ compare(mascotImage.status, Image.Error);

477

478 cardTool.components["mascot"] = {"fallback": Qt.resolvedUrl("artwork/emblem.png")};

479 cardTool.componentsChanged();

480 card.cardData["mascot"] = "somethingbroken2";

481 card.cardDataChanged();

482 waitForRendering(card);

483− tryCompare(mascotImage.image, "status", Image.Ready);

483+ tryCompare(mascotImage, "status", Image.Ready);

484 }

485

486 function test_font_weights_data() {

tests/qmltests/Greeter/tst_Infographics.qml+4−3

@@ -74,15 +74,16 @@ Item {

74

75 function test_set_username_data() {

76 return [

77− { username: "has-password", label: "19 minutes talk time" },

77+ { username: "has-password", label: "19 minutes talk time", visible: true },

78− { username: "two-factor", label: "No data" },

78+ { username: "two-factor", label: "", visible: true },

79− { username: "", label: "No data" },

79+ { username: "", label: "", visible: false },

80 ]

81 }

82

83 function test_set_username(data) {

84 infographicModel.username = data.username

85 tryCompare(label, "text", data.label)

86+ compare(infographic.visible, data.visible);

86 }

87 }

88 }

88

89

tools/scopetool.cpp+1−1

@@ -89,7 +89,7 @@ int main(int argc, char *argv[])

89 view->setTitle(QGuiApplication::applicationName());

90 view->engine()->setBaseUrl(QUrl::fromLocalFile(::qmlDirectory()));

91

92− QUrl source(::qmlDirectory() + "ScopeTool.qml");

92+ QUrl source(::qmlDirectory() + "/ScopeTool.qml");

93 prependImportPaths(view->engine(), ::overrideImportPaths());

94 prependImportPaths(view->engine(), ::nonMirImportPaths());

95 appendImportPaths(view->engine(), ::fallbackImportPaths());