ubiquity-slideshow team mailing list archive
-
ubiquity-slideshow team
-
Mailing list archive
-
Message #02115
[Merge] lp:~knome/ubiquity-slideshow-ubuntu/uife-bug-1294619 into lp:ubiquity-slideshow-ubuntu
Pasi Lallinaho has proposed merging lp:~knome/ubiquity-slideshow-ubuntu/uife-bug-1294619 into lp:ubiquity-slideshow-ubuntu.
Requested reviews:
Ubiquity Slideshow (ubiquity-slideshow)
For more details, see:
https://code.launchpad.net/~knome/ubiquity-slideshow-ubuntu/uife-bug-1294619/+merge/211707
Final changes to Xubuntu slideshow. Subject to UIFe, see bug #1294619 for the exception request.
--
https://code.launchpad.net/~knome/ubiquity-slideshow-ubuntu/uife-bug-1294619/+merge/211707
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~knome/ubiquity-slideshow-ubuntu/uife-bug-1294619 into lp:ubiquity-slideshow-ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog 2014-03-18 01:43:07 +0000
+++ debian/changelog 2014-03-19 12:14:35 +0000
@@ -1,3 +1,15 @@
+ubiquity-slideshow-ubuntu (80) UNRELEASED; urgency=medium
+
+ [ Simon Steinbeiss ]
+ * Xubuntu: Update the "Personalize" slide.
+ * Xubuntu: Create Tahr-art for the "Thanks" slide.
+
+ [ Pasi Lallinaho ]
+ * Xubuntu: Many minor visual enhancements.
+ * Update translation templates.
+
+ -- Pasi Lallinaho <pasi@xxxxxxxxxxxxxxxxxx> Wed, 19 Mar 2014 14:07:57 +0200
+
ubiquity-slideshow-ubuntu (79) trusty; urgency=medium
[ Dimitri John Ledkov ]
=== modified file 'po/edubuntu/slideshow-edubuntu.pot'
--- po/edubuntu/slideshow-edubuntu.pot 2014-03-17 17:11:33 +0000
+++ po/edubuntu/slideshow-edubuntu.pot 2014-03-19 12:14:35 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-17 13:10-0400\n"
+"POT-Creation-Date: 2014-03-19 14:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
=== modified file 'po/kubuntu/slideshow-kubuntu.pot'
--- po/kubuntu/slideshow-kubuntu.pot 2014-03-17 17:11:33 +0000
+++ po/kubuntu/slideshow-kubuntu.pot 2014-03-19 12:14:35 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-17 13:10-0400\n"
+"POT-Creation-Date: 2014-03-19 14:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
=== modified file 'po/lubuntu/slideshow-lubuntu.pot'
--- po/lubuntu/slideshow-lubuntu.pot 2014-03-17 17:11:33 +0000
+++ po/lubuntu/slideshow-lubuntu.pot 2014-03-19 12:14:35 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-17 13:10-0400\n"
+"POT-Creation-Date: 2014-03-19 14:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
=== modified file 'po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot'
--- po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot 2014-03-17 17:11:33 +0000
+++ po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot 2014-03-19 12:14:35 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-17 13:10-0400\n"
+"POT-Creation-Date: 2014-03-19 14:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
=== modified file 'po/ubuntu-gnome/slideshow-ubuntu-gnome.pot'
--- po/ubuntu-gnome/slideshow-ubuntu-gnome.pot 2014-03-17 17:11:33 +0000
+++ po/ubuntu-gnome/slideshow-ubuntu-gnome.pot 2014-03-19 12:14:35 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-17 13:10-0400\n"
+"POT-Creation-Date: 2014-03-19 14:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
=== modified file 'po/ubuntu/slideshow-ubuntu.pot'
--- po/ubuntu/slideshow-ubuntu.pot 2014-03-17 17:11:33 +0000
+++ po/ubuntu/slideshow-ubuntu.pot 2014-03-19 12:14:35 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-17 13:10-0400\n"
+"POT-Creation-Date: 2014-03-19 14:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
=== modified file 'po/ubuntustudio/slideshow-ubuntustudio.pot'
--- po/ubuntustudio/slideshow-ubuntustudio.pot 2014-03-17 17:11:33 +0000
+++ po/ubuntustudio/slideshow-ubuntustudio.pot 2014-03-19 12:14:35 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-17 13:10-0400\n"
+"POT-Creation-Date: 2014-03-19 14:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
=== modified file 'po/xubuntu/slideshow-xubuntu.pot'
--- po/xubuntu/slideshow-xubuntu.pot 2014-03-17 17:11:33 +0000
+++ po/xubuntu/slideshow-xubuntu.pot 2014-03-19 12:14:35 +0000
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2014-03-17 13:10-0400\n"
+"POT-Creation-Date: 2014-03-19 14:05+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -42,7 +42,7 @@
#. type: Content of: <div><div><p>
#: slideshows/xubuntu/slides/01_desktop.html:7
msgid ""
-"On the desktop, you will see icons that can be used to access some of the "
+"On the desktop you will see icons that can be used to access some of the "
"most common places on your system. In addition, you will see a single, "
"multipurpose, panel at the top of the screen."
msgstr ""
@@ -53,32 +53,32 @@
msgstr ""
#. type: Content of: <div><div><p>
-#: slideshows/xubuntu/slides/01_desktop.html:15
+#: slideshows/xubuntu/slides/01_desktop.html:17
msgid ""
"On the left hand side, you will see a Xubuntu logo. Click it to open the "
"main menu. We will tell you more about this menu in the next slide."
msgstr ""
#. type: Content of: <div><div><p>
-#: slideshows/xubuntu/slides/01_desktop.html:16
+#: slideshows/xubuntu/slides/01_desktop.html:18
msgid ""
"The middle part of the panel is dedicated to window buttons for open "
"applications."
msgstr ""
#. type: Content of: <div><div><p>
-#: slideshows/xubuntu/slides/01_desktop.html:17
+#: slideshows/xubuntu/slides/01_desktop.html:19
msgid ""
"On the far right, you will see indicators and a clock. Click the clock to "
"see the monthly calendar."
msgstr ""
#. type: Content of: <div><div><p>
-#: slideshows/xubuntu/slides/01_desktop.html:21
+#: slideshows/xubuntu/slides/01_desktop.html:23
msgid ""
"You can customize the panel by right-clicking the panel and selecting "
-"<em>Panel » Panel Preferences</em>. You can also add and remove panels as "
-"you like from this dialog."
+"<em>Panel » Panel Preferences</em>. You can also add and remove panels using "
+"this dialog."
msgstr ""
#. type: Content of: <div><h1>
@@ -126,6 +126,8 @@
#. type: Content of: <div><div><div><p>
#: slideshows/xubuntu/slides/03_personalize.html:10
#: slideshows/xubuntu/slides/03_personalize.html:11
+#: slideshows/xubuntu/slides/04_customize.html:10
+#: slideshows/xubuntu/slides/04_customize.html:11
msgid "<b>»</b>"
msgstr ""
@@ -146,7 +148,27 @@
#. type: Content of: <div><div><p>
#: slideshows/xubuntu/slides/04_customize.html:7
-msgid "Stuff."
+msgid ""
+"Your desktop background is easy to customize and we're providing you with a "
+"selection of beautiful wallpapers. Choose one of the five winners of our "
+"community wallpaper contest – handpicked for you!"
+msgstr ""
+
+#. type: Content of: <div><div><p>
+#: slideshows/xubuntu/slides/04_customize.html:8
+msgid ""
+"Colorize according to your taste! With the newly created theme configuration "
+"tool you can easily fine-tune the looks of some core aspects of the desktop."
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/xubuntu/slides/04_customize.html:10
+msgid "Desktop Settings"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/xubuntu/slides/04_customize.html:11
+msgid "Theme Configuration"
msgstr ""
#. type: Content of: <div><h1>
@@ -260,21 +282,21 @@
"Xubuntu website."
msgstr ""
-#. type: Content of: <div><div><h2>
-#: slideshows/xubuntu/slides/06_support.html:13
-msgid "Live support"
-msgstr ""
-
-#. type: Content of: <div><div><p>
+#. type: Content of: <div><div><div><h2>
#: slideshows/xubuntu/slides/06_support.html:14
+msgid "Real-time support"
+msgstr ""
+
+#. type: Content of: <div><div><div><p>
+#: slideshows/xubuntu/slides/06_support.html:15
msgid ""
"For live, online support, join our IRC channel, <em>#xubuntu</em>, by <a "
"href=\"http://webchat.freenode.net/?channels=xubuntu&nick=xubuntu...";
"&prompt=1\">clicking here</a>."
msgstr ""
-#. type: Content of: <div><div><p>
-#: slideshows/xubuntu/slides/06_support.html:15
+#. type: Content of: <div><div><div><p>
+#: slideshows/xubuntu/slides/06_support.html:16
msgid ""
"The main support channel is English only. For support in other languages, "
"view the full list of <a href=\"https://wiki.ubuntu.com/IRC/ChannelList/Local";
@@ -286,29 +308,29 @@
msgid "Thank you!"
msgstr ""
-#. type: Content of: <div><div><p>
-#: slideshows/xubuntu/slides/07_thanks.html:7
+#. type: Content of: <div><div><div><p>
+#: slideshows/xubuntu/slides/07_thanks.html:8
msgid ""
"We'd love to hear about your experiences with Xubuntu. You can share them on "
"the <a href=\"https://lists.ubuntu.com/mailman/listinfo/xubuntu-users";
"\">Xubuntu users mailing list</a>. In the meantime, thanks for taking the "
-"time to install Xubuntu with us"
+"time to install Xubuntu with us."
msgstr ""
-#. type: Content of: <div><div><p>
-#: slideshows/xubuntu/slides/07_thanks.html:9
+#. type: Content of: <div><div><div><p>
+#: slideshows/xubuntu/slides/07_thanks.html:10
msgid ""
"Xubuntu will always come without fees; feel free to pass on your "
"installation media and let others try Xubuntu as well."
msgstr ""
-#. type: Content of: <div><div><h2>
-#: slideshows/xubuntu/slides/07_thanks.html:11
+#. type: Content of: <div><div><div><h2>
+#: slideshows/xubuntu/slides/07_thanks.html:12
msgid "We need your help!"
msgstr ""
-#. type: Content of: <div><div><p>
-#: slideshows/xubuntu/slides/07_thanks.html:12
+#. type: Content of: <div><div><div><p>
+#: slideshows/xubuntu/slides/07_thanks.html:13
msgid ""
"Want to give something back? The different ways to contribute to the Xubuntu "
"community can all be found on the <a href=\"http://xubuntu.org/devel\";>Get "
=== modified file 'slideshows/xubuntu/slides/06_support.html'
--- slideshows/xubuntu/slides/06_support.html 2014-03-18 01:43:07 +0000
+++ slideshows/xubuntu/slides/06_support.html 2014-03-19 12:14:35 +0000
@@ -9,9 +9,12 @@
<h2>Other resources</h2>
<p>Still have questions? The full list of support methods is available at the <a href="http://xubuntu.org/help";>Help & Support section</a> of the Xubuntu website.</p>
</div>
- <div class="content narrow box">
- <h2>Real-time support</h2>
- <p>For live, online support, join our IRC channel, <em>#xubuntu</em>, by <a href="http://webchat.freenode.net/?channels=xubuntu&nick=xubuntu...&prompt=1";>clicking here</a>.</p>
- <p class="note">The main support channel is English only. For support in other languages, view the full list of <a href="https://wiki.ubuntu.com/IRC/ChannelList/Local";>local support channels</a>.</p>
+ <div class="content narrow chatbubble">
+ <div class="box">
+ <h2>Real-time support</h2>
+ <p>For live, online support, join our IRC channel, <em>#xubuntu</em>, by <a href="http://webchat.freenode.net/?channels=xubuntu&nick=xubuntu...&prompt=1";>clicking here</a>.</p>
+ <p class="note">The main support channel is English only. For support in other languages, view the full list of <a href="https://wiki.ubuntu.com/IRC/ChannelList/Local";>local support channels</a>.</p>
+ </div>
+ <div class="triangle"></div>
</div>
</div>
=== modified file 'slideshows/xubuntu/slides/07_thanks.html'
--- slideshows/xubuntu/slides/07_thanks.html 2014-03-18 01:43:07 +0000
+++ slideshows/xubuntu/slides/07_thanks.html 2014-03-19 12:14:35 +0000
@@ -3,13 +3,14 @@
</div>
<div class="main">
- <div class="content wide">
- <p>We'd love to hear about your experiences with Xubuntu. You can share them on the <a href="https://lists.ubuntu.com/mailman/listinfo/xubuntu-users";>Xubuntu users mailing list</a>. In the meantime, thanks for taking the time to install Xubuntu with us</p>
-
- <p>Xubuntu will always come without fees; feel free to pass on your installation media and let others try Xubuntu as well.</p>
-
- <h2>We need your help!</h2>
- <p>Want to give something back? The different ways to contribute to the Xubuntu community can all be found on the <a href="http://xubuntu.org/devel";>Get Involved</a> section of our website.</p>
+ <div class="tahr">
+ <div class="content wide">
+ <p>We'd love to hear about your experiences with Xubuntu. You can share them on the <a href="https://lists.ubuntu.com/mailman/listinfo/xubuntu-users";>Xubuntu users mailing list</a>. In the meantime, thanks for taking the time to install Xubuntu with us.</p>
+
+ <p>Xubuntu will always come without fees; feel free to pass on your installation media and let others try Xubuntu as well.</p>
+
+ <h2>We need your help!</h2>
+ <p>Want to give something back? The different ways to contribute to the Xubuntu community can all be found on the <a href="http://xubuntu.org/devel";>Get Involved</a> section of our website.</p>
+ </div>
</div>
- <img class="shot narrow leftpad" src="images/art_community.png" />
</div>
=== added file 'slideshows/xubuntu/slides/images/art_tahr.png'
Binary files slideshows/xubuntu/slides/images/art_tahr.png 1970-01-01 00:00:00 +0000 and slideshows/xubuntu/slides/images/art_tahr.png 2014-03-19 12:14:35 +0000 differ
=== modified file 'slideshows/xubuntu/slides/images/shot_greeter.png'
Binary files slideshows/xubuntu/slides/images/shot_greeter.png 2014-03-17 16:40:20 +0000 and slideshows/xubuntu/slides/images/shot_greeter.png 2014-03-19 12:14:35 +0000 differ
=== modified file 'slideshows/xubuntu/slides/images/shot_whiskermenu.png'
Binary files slideshows/xubuntu/slides/images/shot_whiskermenu.png 2014-03-14 23:09:24 +0000 and slideshows/xubuntu/slides/images/shot_whiskermenu.png 2014-03-19 12:14:35 +0000 differ
=== modified file 'slideshows/xubuntu/slides/link/base.css'
--- slideshows/xubuntu/slides/link/base.css 2014-03-18 01:43:07 +0000
+++ slideshows/xubuntu/slides/link/base.css 2014-03-19 12:14:35 +0000
@@ -59,6 +59,7 @@
border-spacing: 0;
}
+
/*
* Self-clearing floats
*
@@ -72,8 +73,9 @@
visibility: hidden;
}
+
/*
- * Main layout
+ * Layout
*
*/
@@ -83,7 +85,6 @@
#slideshow {
background: #0b3a6b url(wall.png) 0 0 no-repeat;
-/* background-image: none; */
color: #fff;
width: 750px;
@@ -92,6 +93,35 @@
overflow: hidden;
}
+.header {
+ display: table-cell;
+ width: 750px;
+
+ padding: 0 100px 0 20px;
+ height: 60px;
+
+ vertical-align: middle;
+
+ background-color: rgba( 0, 0, 0, 0.5 );
+}
+
+.main {
+ font-size: 90%;
+
+ background-image: url(shadow.png);
+ background-position: 0 0;
+ background-repeat: repeat-x;
+
+ padding: 30px 0 0 0;
+
+ height: 330px;
+}
+ .main .content,
+ .main .shot {
+ float: left;
+ }
+
+
/*
* Controls
*
@@ -126,6 +156,7 @@
background-image: url(arrow-next.png);
}
+
/*
* Elements
*
@@ -167,49 +198,56 @@
font-size: 90%;
color: #fff;
}
-
-/*
- * More layout
- *
- */
-
-.header {
- display: table-cell;
- width: 750px;
-
- padding: 0 100px 0 20px;
- height: 60px;
-
- vertical-align: middle;
-
- background-color: rgba( 0, 0, 0, 0.5 );
-}
-
-.main {
- font-size: 90%;
-
- background-image: url(shadow.png);
- background-position: 0 0;
- background-repeat: repeat-x;
-
- padding: 30px 0 0 0;
-}
- .main .content,
- .main .shot {
- float: left;
- }
- .main .content {
- width: 270px;
- padding: 0 20px;
- }
-
- .main .shot {
- margin-left: 10px;
- }
-/*
- * Application paths
- *
- */
+ .main h2:first-child {
+ margin-top: 0;
+ }
+
+
+/*
+ * Different content widths
+ *
+ */
+.main .content { padding: 0 20px; }
+.main .shot { margin-left: 10px; }
+
+.content { width: 270px; }
+.content.full { width: 710px; clear: both; }
+.content.wide { width: 375px; }
+.content.half { width: 335px; }
+.content.narrow { width: 285px; }
+
+.shot.leftpad { margin-left: 30px; }
+.shot.narrow { width: 325px; }
+.shot.narrow.leftpad { width: 295px; }
+.shot.right { float: right; margin-right: 30px; }
+
+
+/*
+ * Common styles
+ *
+ */
+
+/* Rounded-corner box */
+.box {
+ background-color: rgba( 0, 0, 0, 0.2 );
+ border-radius: 10px;
+ padding: 10px 20px;
+}
+
+.box.narrow {
+ width: 275px;
+ margin-bottom: 1em;
+ padding: 10px 20px;
+}
+
+/* Note (smaller text) */
+
+.note {
+ font-size: 85%;
+ line-height: 1.4em;
+}
+
+/* Application paths */
.paths {
width: 300px;
@@ -232,37 +270,25 @@
color: #007fbe;
}
-/* */
-
-.main .content.wide { width: 375px; }
-.main .content.full { width: 710px; clear: both; }
-.main .content.half { width: 335px; }
-.main .content.third { width: 205px; }
-.main .content.narrow { width: 285px; }
-
-.main .shot.leftpad { margin-left: 30px; }
-.main .shot.narrow { width: 325px; }
-.main .shot.narrow.leftpad { width: 295px; }
-.main .shot.right { float: right; margin-right: 30px; }
-
-.main .box {
- background-color: rgba( 0, 0, 0, 0.2 );
- border-radius: 10px;
- padding: 10px 20px;
-}
-
-.main .content.box.narrow {
- width: 275px;
- margin-bottom: 1em;
- padding: 10px 20px;
-}
-
-.main .panelnotes {
+
+/*
+ * Slide-specific styles
+ *
+ */
+
+/* Desktop */
+
+.panel {
+ clear: both;
+ padding: 1em 0 0 0;
+}
+
+.panelnotes {
padding: 0 0 0 20px;
margin: 1em 0 2em 0;
}
-.main .panelnotes p.box {
+.panelnotes p.box {
width: 190px;
height: 6em;
margin-right: 10px;
@@ -271,21 +297,13 @@
-webkit-transition: all 0.5s;
}
-.main .panelnotes p.box:hover,
-.main .panelnotes p.box:active,
-.main .panelnotes p.box:focus {
+.panelnotes p.box:hover,
+.panelnotes p.box:active,
+.panelnotes p.box:focus {
background-color: rgba( 0, 0, 0, 0.3 );
}
-.main h2:first-child { margin-top: 0; }
-.main .note { font-size: 85%; line-height: 1.4em; }
-
-.main .panel {
- clear: both;
- padding: 1em 0 0 0;
-}
-
-/* Panel slide */
+/* Panel highlights, shown with JS */
#panelhighlight {
margin-top: 2px;
@@ -295,5 +313,29 @@
}
#panelhighlight.visible {
- border-bottom: 2px solid rgba( 255, 255, 255, 0.9 );
+ border-bottom: 2px solid #59a61b;
+}
+
+/* Help & Support */
+
+.chatbubble {
+ position: absolute;
+ bottom: 30px;
+ right: 20px;
+}
+
+.triangle {
+ float: right;
+ margin-right: 40px;
+ height: 40px;
+ width: 60px;
+ background: transparent url(triangledown.png) 100% 0 no-repeat;
+}
+
+/* Thanks */
+
+.tahr {
+ height: 330px;
+ background: transparent url(../images/art_tahr.png) 100% 100% no-repeat;
+ border-bottom: 1px solid red;
}
\ No newline at end of file
=== added file 'slideshows/xubuntu/slides/link/triangledown.png'
Binary files slideshows/xubuntu/slides/link/triangledown.png 1970-01-01 00:00:00 +0000 and slideshows/xubuntu/slides/link/triangledown.png 2014-03-19 12:14:35 +0000 differ
Follow ups
