git.iko.soy/unity8
on xenial help sign in
Merged with the prerequisite branch to be able to launch unity.
commit55642cb11299ed42346cc93972105a5d55562340 authorLeo Arias <leo.arias@canonical.com> dateWed 30 Jul 2014, 11:53 (12 years ago) parent8eb7df6b31e023
10 files changed+52−41
compare with xenial
unifiedsplit
debian/changelog+5−2 po/br.po+1−1 po/da.po+5−5 po/el.po+11−11 po/sl.po+4−4 po/ug.po+5−5 po/uk.po+5−5 po/zh_CN.po+8−8 qml/Components/Dialogs.qml+1 src/main.cpp+7
debian/changelog+5−2
@@ -1,4 +1,4 @@
1−unity8 (8.00) UNRELEASED; urgency=medium
1+unity8 (8.00+14.10.20140729-0ubuntu1) utopic; urgency=medium
22
33 [ Gerry Boland ]
44 [ Daniel d'Andrada ]
@@ -10,7 +10,10 @@ unity8 (8.00) UNRELEASED; urgency=medium
1010 * Port phone right-edge spread code to use QtCompositor
1111 * Add right-edge spread animation for tablet
1212
13− -- Gerry Boland <gerry.boland@canonical.com> Thu, 10 Jul 2014 10:34:18 +0100
13+ [ Ubuntu daily release ]
14+ * New rebuild forced
15+
16+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 29 Jul 2014 15:07:32 +0000
1417
1518unity8 (7.90+14.10.20140725-0ubuntu1) utopic; urgency=low
1619
po/br.po+1−1
@@ -14,7 +14,7 @@ msgstr ""
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-28 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-29 06:54+0000\n"
1818"X-Generator: Launchpad (build 17131)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
po/da.po+5−5
@@ -9,13 +9,13 @@ msgstr ""
99"Project-Id-Version: unity8\n"
1010"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1111"POT-Creation-Date: 2014-07-11 14:59+0200\n"
12−"PO-Revision-Date: 2014-07-22 15:46+0000\n"
13−"Last-Translator: Kenneth Ramsussen <kentora@kentora.dk>\n"
12+"PO-Revision-Date: 2014-07-29 23:18+0000\n"
13+"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
1414"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
1515"MIME-Version: 1.0\n"
1616"Content-Type: text/plain; charset=UTF-8\n"
1717"Content-Transfer-Encoding: 8bit\n"
18−"X-Launchpad-Export-Date: 2014-07-26 07:16+0000\n"
18+"X-Launchpad-Export-Date: 2014-07-30 07:08+0000\n"
1919"X-Generator: Launchpad (build 17131)\n"
2020
2121#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -72,7 +72,7 @@ msgid ""
7272"You have now mastered the edge gestures and can start using the "
7373"phone<br><br>Tap on the screen to start"
7474msgstr ""
75−"Du mestrer nu kantgestusserne og kan begynde at bruge telefonen<br><br>Tryk "
75+"Du mestrer nu kantbevægelserne og kan begynde at bruge telefonen<br><br>Tryk "
7676"på skærmen for at starte"
7777
7878#: qml/Components/Lockscreen.qml:214
@@ -174,7 +174,7 @@ msgstr ""
174174
175175#: qml/Panel/ActiveCallHint.qml:90
176176msgid "Conference"
177−msgstr ""
177+msgstr "Konference"
178178
179179#: qml/Panel/Indicators/MenuItemFactory.qml:583
180180msgid "In queue…"
po/el.po+11−11
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-11 14:59+0200\n"
11−"PO-Revision-Date: 2014-07-25 19:27+0000\n"
12−"Last-Translator: George Christofis <geochr22@gmail.com>\n"
11+"PO-Revision-Date: 2014-07-28 16:06+0000\n"
12+"Last-Translator: Chris Taklis (aka Kailor) <ctaklis@gmail.com>\n"
1313"Language-Team: Greek <el@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-26 07:16+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-29 06:54+0000\n"
1818"X-Generator: Launchpad (build 17131)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -111,11 +111,11 @@ msgstr "Λιγότερα"
111111
112112#: qml/Dash/DashApps.qml:37
113113msgid "Recent"
114−msgstr ""
114+msgstr "Πρόσφατα"
115115
116116#: qml/Dash/GenericScopeView.qml:330
117117msgid "See all"
118−msgstr ""
118+msgstr "Εμφάνιση όλων"
119119
120120#: qml/Dash/Previews/PreviewActionCombo.qml:34
121121msgid "More..."
@@ -139,7 +139,7 @@ msgstr "Αποστολή"
139139
140140#: qml/Greeter/Greeter.qml:157
141141msgid "Swipe to unlock"
142−msgstr ""
142+msgstr "Σύρετε για να ξεκλειδώσετε"
143143
144144#: qml/Hud/HudParametrizedActionsPage.qml:132
145145msgid "Confirm"
@@ -175,7 +175,7 @@ msgstr ""
175175
176176#: qml/Panel/ActiveCallHint.qml:90
177177msgid "Conference"
178−msgstr ""
178+msgstr "Συνδιάσκεψη"
179179
180180#: qml/Panel/Indicators/MenuItemFactory.qml:583
181181msgid "In queue…"
@@ -183,19 +183,19 @@ msgstr ""
183183
184184#: qml/Panel/Indicators/MenuItemFactory.qml:587
185185msgid "Downloading"
186−msgstr ""
186+msgstr "Λήψη σε εξέλιξη"
187187
188188#: qml/Panel/Indicators/MenuItemFactory.qml:589
189189msgid "Paused, tap to resume"
190−msgstr ""
190+msgstr "Σταματημένο, αγγίξτε για συνέχιση"
191191
192192#: qml/Panel/Indicators/MenuItemFactory.qml:591
193193msgid "Canceled"
194−msgstr ""
194+msgstr "Ακυρώθηκε"
195195
196196#: qml/Panel/Indicators/MenuItemFactory.qml:593
197197msgid "Finished"
198−msgstr ""
198+msgstr "Ολοκληρώθηκε"
199199
200200#: qml/Panel/Indicators/MenuItemFactory.qml:595
201201msgid "Failed, tap to retry"
po/sl.po+4−4
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-11 14:59+0200\n"
11−"PO-Revision-Date: 2014-07-24 09:01+0000\n"
11+"PO-Revision-Date: 2014-07-28 12:32+0000\n"
1212"Last-Translator: Damir Jerovšek <Unknown>\n"
1313"Language-Team: Slovenian <sl@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-29 06:54+0000\n"
1818"X-Generator: Launchpad (build 17131)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -171,11 +171,11 @@ msgstr "Vnesite PIN kartice SIM"
171171
172172#: qml/Panel/ActiveCallHint.qml:77
173173msgid "Tap to return to call..."
174−msgstr ""
174+msgstr "Tapnite za vrnitev v klic ..."
175175
176176#: qml/Panel/ActiveCallHint.qml:90
177177msgid "Conference"
178−msgstr ""
178+msgstr "Konferenca"
179179
180180#: qml/Panel/Indicators/MenuItemFactory.qml:583
181181msgid "In queue…"
po/ug.po+5−5
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-11 14:59+0200\n"
11−"PO-Revision-Date: 2014-07-21 02:30+0000\n"
11+"PO-Revision-Date: 2014-07-29 04:06+0000\n"
1212"Last-Translator: Gheyret T.Kenji <Unknown>\n"
1313"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-30 07:08+0000\n"
1818"X-Generator: Launchpad (build 17131)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -113,7 +113,7 @@ msgstr "يېقىنقى"
113113
114114#: qml/Dash/GenericScopeView.qml:330
115115msgid "See all"
116−msgstr ""
116+msgstr "ھەممىنى كۆرۈش…"
117117
118118#: qml/Dash/Previews/PreviewActionCombo.qml:34
119119msgid "More..."
@@ -169,11 +169,11 @@ msgstr "سىم(SIM) كارتىڭىزنىڭ PIN نومۇرىنى كىرگۈزۈڭ
169169
170170#: qml/Panel/ActiveCallHint.qml:77
171171msgid "Tap to return to call..."
172−msgstr ""
172+msgstr "سۆزلىشىشكە قايتىش ئۈچۈن چېكىڭ…"
173173
174174#: qml/Panel/ActiveCallHint.qml:90
175175msgid "Conference"
176−msgstr ""
176+msgstr "يىغىن"
177177
178178#: qml/Panel/Indicators/MenuItemFactory.qml:583
179179msgid "In queue…"
po/uk.po+5−5
@@ -8,13 +8,13 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-11 14:59+0200\n"
11−"PO-Revision-Date: 2014-07-13 17:03+0000\n"
11+"PO-Revision-Date: 2014-07-29 07:53+0000\n"
1212"Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
1313"Language-Team: Ukrainian <uk@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-26 07:17+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-30 07:08+0000\n"
1818"X-Generator: Launchpad (build 17131)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
@@ -116,7 +116,7 @@ msgstr "Нещодавні"
116116
117117#: qml/Dash/GenericScopeView.qml:330
118118msgid "See all"
119−msgstr ""
119+msgstr "Детальніше"
120120
121121#: qml/Dash/Previews/PreviewActionCombo.qml:34
122122msgid "More..."
@@ -172,11 +172,11 @@ msgstr "Введіть PIN-код SIM-картки"
172172
173173#: qml/Panel/ActiveCallHint.qml:77
174174msgid "Tap to return to call..."
175−msgstr ""
175+msgstr "Торкніться, щоб повернутися до дзвінка…"
176176
177177#: qml/Panel/ActiveCallHint.qml:90
178178msgid "Conference"
179−msgstr ""
179+msgstr "Конференція"
180180
181181#: qml/Panel/Indicators/MenuItemFactory.qml:583
182182msgid "In queue…"
po/zh_CN.po+8−8
@@ -8,23 +8,23 @@ msgstr ""
88"Project-Id-Version: unity\n"
99"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1010"POT-Creation-Date: 2014-07-11 14:59+0200\n"
11−"PO-Revision-Date: 2014-07-27 15:48+0000\n"
12−"Last-Translator: Aron Xu <Unknown>\n"
11+"PO-Revision-Date: 2014-07-29 02:48+0000\n"
12+"Last-Translator: Luo Lei <luolei@ubuntukylin.com>\n"
1313"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
1414"MIME-Version: 1.0\n"
1515"Content-Type: text/plain; charset=UTF-8\n"
1616"Content-Transfer-Encoding: 8bit\n"
17−"X-Launchpad-Export-Date: 2014-07-28 06:44+0000\n"
17+"X-Launchpad-Export-Date: 2014-07-30 07:08+0000\n"
1818"X-Generator: Launchpad (build 17131)\n"
1919
2020#: plugins/Unity/Launcher/launcheritem.cpp:43
2121#: plugins/Unity/Launcher/launcheritem.cpp:73
2222msgid "Pin shortcut"
23−msgstr ""
23+msgstr "固定快捷方式"
2424
2525#: plugins/Unity/Launcher/launcheritem.cpp:73
2626msgid "Unpin shortcut"
27−msgstr ""
27+msgstr "取消固定快捷方式"
2828
2929#: qml/Components/EdgeDemoOverlay.qml:151
3030msgid "Skip intro"
@@ -167,7 +167,7 @@ msgstr "请输入 SIM PIN"
167167
168168#: qml/Panel/ActiveCallHint.qml:77
169169msgid "Tap to return to call..."
170−msgstr ""
170+msgstr "点击回到通话..."
171171
172172#: qml/Panel/ActiveCallHint.qml:90
173173msgid "Conference"
@@ -175,7 +175,7 @@ msgstr "会议"
175175
176176#: qml/Panel/Indicators/MenuItemFactory.qml:583
177177msgid "In queue…"
178−msgstr ""
178+msgstr "排队中..."
179179
180180#: qml/Panel/Indicators/MenuItemFactory.qml:587
181181msgid "Downloading"
@@ -195,7 +195,7 @@ msgstr "已完成"
195195
196196#: qml/Panel/Indicators/MenuItemFactory.qml:595
197197msgid "Failed, tap to retry"
198−msgstr ""
198+msgstr "下载失败，请点击重试"
199199
200200#: qml/Panel/SearchIndicator.qml:27
201201msgid "Search"
qml/Components/Dialogs.qml+1
@@ -17,6 +17,7 @@
1717import QtQuick 2.0
1818
1919import Unity.Application 0.1
20+import Unity.Session 0.1
2021import Ubuntu.Components 0.1
2122import Ubuntu.Components.Popups 0.1
2223
src/main.cpp+7
@@ -25,6 +25,7 @@
2525#include <QtQml/QQmlContext>
2626#include <QLibrary>
2727#include <QDebug>
28+#include <csignal>
2829#include <libintl.h>
2930
3031// local
@@ -140,6 +141,12 @@ Load the testability driver");
140141 view->setSource(source);
141142 QObject::connect(view->engine(), SIGNAL(quit()), application, SLOT(quit()));
142143
144+ if (!isMirServer && qEnvironmentVariableIsSet("UNITY_MIR_EMITS_SIGSTOP")) {
145+ // Emit SIGSTOP as expected by upstart, under Mir it's qtmir that will raise it.
146+ // see http://upstart.ubuntu.com/cookbook/#expect-stop
147+ raise(SIGSTOP);
148+ }
149+
143150 if (isMirServer || parser.isSet(fullscreenOption)) {
144151 view->showFullScreen();
145152 } else {