on xenial help sign in
Merge oxide_regression_workaround
a34ff2cAlbert Astals Cid
po/am.po+4−4
@@ -8,15 +8,15 @@ msgstr ""
8"Project-Id-Version: unity8\n"
8"Project-Id-Version: unity8\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
9"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
10"POT-Creation-Date: 2015-04-14 16:13+0200\n"
10"POT-Creation-Date: 2015-04-14 16:13+0200\n"
11−"PO-Revision-Date: 2015-03-19 23:16+0000\n"
11+"PO-Revision-Date: 2015-05-24 14:07+0000\n"
12"Last-Translator: samson <Unknown>\n"
12"Last-Translator: samson <Unknown>\n"
13"Language-Team: Amharic <am@li.org>\n"
13"Language-Team: Amharic <am@li.org>\n"
14"MIME-Version: 1.0\n"
14"MIME-Version: 1.0\n"
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
17"Plural-Forms: nplurals=2; plural=n > 1;\n"
18−"X-Launchpad-Export-Date: 2015-04-23 06:47+0000\n"
18+"X-Launchpad-Export-Date: 2015-05-25 06:04+0000\n"
19−"X-Generator: Launchpad (build 17430)\n"
19+"X-Generator: Launchpad (build 17514)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
@@ -371,7 +371,7 @@ msgstr "እዚህ መታ ይድርጉ ለመቀጠል"
371
371
372#: qml/Tutorial/TutorialContent.qml:81
372#: qml/Tutorial/TutorialContent.qml:81
373msgid "Click here to finish."
373msgid "Click here to finish."
374−msgstr ""
374+msgstr "ለመጨረስ እዚህ ይጫኑ"
375
375
376#: qml/Tutorial/TutorialLeftFinish.qml:24
376#: qml/Tutorial/TutorialLeftFinish.qml:24
377msgid "These are the shortcuts to favorite apps"
377msgid "These are the shortcuts to favorite apps"
po/fi.po+2−2
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-05-20 05:29+0000\n"
18+"X-Launchpad-Export-Date: 2015-05-22 05:09+0000\n"
19−"X-Generator: Launchpad (build 17508)\n"
19+"X-Generator: Launchpad (build 17514)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
po/pt.po+2−2
@@ -15,8 +15,8 @@ msgstr ""
15"Content-Type: text/plain; charset=UTF-8\n"
15"Content-Type: text/plain; charset=UTF-8\n"
16"Content-Transfer-Encoding: 8bit\n"
16"Content-Transfer-Encoding: 8bit\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
17"Plural-Forms: nplurals=2; plural=n != 1;\n"
18−"X-Launchpad-Export-Date: 2015-05-20 05:29+0000\n"
18+"X-Launchpad-Export-Date: 2015-05-22 05:09+0000\n"
19−"X-Generator: Launchpad (build 17508)\n"
19+"X-Generator: Launchpad (build 17514)\n"
20
20
21#: plugins/LightDM/Greeter.cpp:112
21#: plugins/LightDM/Greeter.cpp:112
22msgid "Password: "
22msgid "Password: "
tests/qmltests/CMakeLists.txt+1−1
@@ -75,5 +75,5 @@ add_unity8_qmltest(Stages TabletStage)
75add_unity8_qmltest(Stages WindowMoveResizeArea)
75add_unity8_qmltest(Stages WindowMoveResizeArea)
76add_unity8_qmltest(Stages Splash)
76add_unity8_qmltest(Stages Splash)
77add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
77add_unity8_qmltest(Tutorial Tutorial LIGHTDM)
78−add_unity8_qmltest(Wizard Wizard)
78+add_unity8_qmltest(Wizard Wizard ENVIRONMENT "OXIDE_NO_SANDBOX=1")
79add_unity8_qmlunittest(utils/Unity/Test UnityTest)
79add_unity8_qmlunittest(utils/Unity/Test UnityTest)