Jeremy Bicha has proposed merging lp:~jbicha/ubiquity-slideshow-ubuntu/final-ubuntu-gnome-saucy-updates into lp:ubiquity-slideshow-ubuntu.
Requested reviews: Ubiquity Slideshow (ubiquity-slideshow) For more details, see: https://code.launchpad.net/~jbicha/ubiquity-slideshow-ubuntu/final-ubuntu-gnome-saucy-updates/+merge/186576 Sorry for these last minute changes -- https://code.launchpad.net/~jbicha/ubiquity-slideshow-ubuntu/final-ubuntu-gnome-saucy-updates/+merge/186576 Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~jbicha/ubiquity-slideshow-ubuntu/final-ubuntu-gnome-saucy-updates into lp:ubiquity-slideshow-ubuntu.
=== modified file 'po/lubuntu/slideshow-lubuntu.pot' --- po/lubuntu/slideshow-lubuntu.pot 2013-07-26 13:37:59 +0000 +++ po/lubuntu/slideshow-lubuntu.pot 2013-09-19 15:59:54 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-06-25 08:51-0600\n" +"POT-Creation-Date: 2013-09-19 11:57-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -49,21 +49,13 @@ #. type: Content of: <div><div><div><p> #: slideshows/lubuntu/slides/02_browser.html:8 msgid "" -"Browse the web with <em>Chromium</em>, the open-source version of Chrome, a " -"web browser developed by Google. It's safe, stable, fast and even supports " -"your favorite addons/extensions." +"Browse the web using <em>Firefox</em>, the open-source cross-platform web " +"browser used by millions around the world. It's safe, stable, fast and " +"supports customization through add-ons." msgstr "" -#. type: Content of: <div><div><div><p> +#. type: Content of: <div><div><div><h2> #: slideshows/lubuntu/slides/02_browser.html:12 -msgid "" -"Did you know that Lubuntu has its own Chrome extension available for free? " -"Visit the <a href=\"https://chrome.google.com/webstore/detail/"; -"hemkkjpjknkkndhconammdhlhdkjclim\">Chrome Web Store</a> for more information." -msgstr "" - -#. type: Content of: <div><div><div><h2> -#: slideshows/lubuntu/slides/02_browser.html:16 #: slideshows/lubuntu/slides/03_office.html:12 #: slideshows/lubuntu/slides/04_media.html:18 #: slideshows/lubuntu/slides/05_social.html:12 @@ -71,12 +63,12 @@ msgstr "" #. type: Content of: <div><div><div><ul><li><p> -#: slideshows/lubuntu/slides/02_browser.html:20 -msgid "Chromium" +#: slideshows/lubuntu/slides/02_browser.html:16 +msgid "Firefox" msgstr "" #. type: Content of: <div><div><div><h2> -#: slideshows/lubuntu/slides/02_browser.html:23 +#: slideshows/lubuntu/slides/02_browser.html:19 #: slideshows/lubuntu/slides/03_office.html:23 #: slideshows/lubuntu/slides/04_media.html:32 #: slideshows/lubuntu/slides/05_social.html:19 @@ -84,13 +76,13 @@ msgstr "" #. type: Content of: <div><div><div><ul><li><p> -#: slideshows/lubuntu/slides/02_browser.html:27 +#: slideshows/lubuntu/slides/02_browser.html:23 msgid "Flash" msgstr "" #. type: Content of: <div><div><div><ul><li><p> -#: slideshows/lubuntu/slides/02_browser.html:32 -msgid "Firefox" +#: slideshows/lubuntu/slides/02_browser.html:28 +msgid "Chromium" msgstr "" #. type: Content of: <div><h1> === modified file 'po/ubuntu-gnome/slideshow-ubuntu-gnome.pot' --- po/ubuntu-gnome/slideshow-ubuntu-gnome.pot 2013-09-13 02:47:51 +0000 +++ po/ubuntu-gnome/slideshow-ubuntu-gnome.pot 2013-09-19 15:59:54 +0000 @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-09-12 22:45-0300\n" +"POT-Creation-Date: 2013-09-19 11:57-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ -37,16 +37,11 @@ #. type: Content of: <div><div><div><ul><li><p> #: slideshows/ubuntu-gnome/slides/accessibility.html:18 -msgid "Appearance" +msgid "Assistive technologies" msgstr "" #. type: Content of: <div><div><div><ul><li><p> #: slideshows/ubuntu-gnome/slides/accessibility.html:22 -msgid "Assistive technologies" -msgstr "" - -#. type: Content of: <div><div><div><ul><li><p> -#: slideshows/ubuntu-gnome/slides/accessibility.html:26 msgid "Language support" msgstr "" @@ -58,9 +53,10 @@ #. type: Content of: <div><div><div><p> #: slideshows/ubuntu-gnome/slides/browse.html:10 msgid "" -"Bored of waiting to get online? Leave the days of slow surfing behind you. " -"With Firefox already installed, Ubuntu GNOME has everything you need to " -"browse the web." +"Ubuntu GNOME has everything you need to browse the web. Firefox offers " +"powerful personalization, support for cutting-edge web standards, carefully " +"optimized performance, and advanced security while still remaining easy to " +"use." msgstr "" #. type: Content of: <div><div><div><h2> @@ -114,7 +110,7 @@ #. type: Content of: <div><div><div><ul><li><p> #: slideshows/ubuntu-gnome/slides/desktop.html:18 -msgid "Lauch and manage <strong>your apps</strong> from the Dash" +msgid "Launch and manage <strong>your apps</strong> from the Dash" msgstr "" #. type: Content of: <div><div><div><ul><li><p> @@ -129,17 +125,31 @@ #. type: Content of: <div><h1> #: slideshows/ubuntu-gnome/slides/gethelp.html:2 -msgid "Any questions?" +msgid "Help and support" msgstr "" #. type: Content of: <div><div><div><p> #: slideshows/ubuntu-gnome/slides/gethelp.html:10 -msgid "" -"Check out <a href=\"http://askubuntu.com/\";>askubuntu.com</a> for answers to " -"all your Ubuntu questions. There’s a good chance your question will have " -"been answered already and, if not, you’ll find thousands of volunteers eager " -"to help. For more support options, go to <a href=\"http://www.ubuntu.com/"; -"support\">ubuntu.com/support</a>." +msgid "Thank you for choosing and installing Ubuntu GNOME." +msgstr "" + +#. type: Content of: <div><div><div><p> +#: slideshows/ubuntu-gnome/slides/gethelp.html:11 +msgid "" +"Learn more about Ubuntu GNOME from <a href=\"https://wiki.ubuntu.com/"; +"UbuntuGNOME/OneStopPage\">wiki.ubuntu.com/UbuntuGNOME/OneStopPage</a>." +msgstr "" + +#. type: Content of: <div><div><div><p> +#: slideshows/ubuntu-gnome/slides/gethelp.html:12 +msgid "" +"For help and support, go to <a href=\"https://wiki.ubuntu.com/UbuntuGNOME/"; +"ContactUs\">wiki.ubuntu.com/UbuntuGNOME/ContactUs</a>." +msgstr "" + +#. type: Content of: <div><div><div><p> +#: slideshows/ubuntu-gnome/slides/gethelp.html:13 +msgid "Enjoy and have fun!" msgstr "" #. type: Content of: <div><h1> @@ -157,7 +167,7 @@ #. type: Content of: <div><div><div><ul><li><p> #: slideshows/ubuntu-gnome/slides/goa.html:17 -msgid "Acess <strong>your online documents</strong> natively" +msgid "Access <strong>your online documents</strong> natively" msgstr "" #. type: Content of: <div><div><div><ul><li><p> @@ -274,10 +284,10 @@ #. type: Content of: <div><div><div><p> #: slideshows/ubuntu-gnome/slides/usc.html:11 msgid "" -"Ubuntu Software Centre gives you instant access to thousands of great games " +"Ubuntu Software Center gives you instant access to thousands of great games " "and applications — some free and some available commercially. If you see " -"something you like, you can see more information and then install it in just " -"a couple of clicks." +"something you like, you can see more information and install it in just a " +"few clicks." msgstr "" #. type: Content of: <div><h1> @@ -288,7 +298,13 @@ #. type: Content of: <div><div><div><p> #: slideshows/ubuntu-gnome/slides/welcome.html:10 msgid "" -"Fast and full of new features, the latest version of Ubuntu GNOME makes " -"computing easier than ever. Here are just a few cool new things to look out " -"for…" +"Ubuntu GNOME features the GNOME desktop on top of the popular Ubuntu " +"foundation." +msgstr "" + +#. type: Content of: <div><div><div><p> +#: slideshows/ubuntu-gnome/slides/welcome.html:11 +msgid "" +"We believe the combination of Ubuntu and GNOME is the best choice for those " +"looking for a beautiful, simple, and usable operating system." msgstr "" === modified file 'po/xubuntu/slideshow-xubuntu.pot' --- po/xubuntu/slideshow-xubuntu.pot 2013-09-13 02:47:51 +0000 +++ po/xubuntu/slideshow-xubuntu.pot 2013-09-19 15:59:54 +0000 @@ -6,8 +6,79 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2013-09-12 22:45-0300\n" +"#-#-#-#-# 00_welcome.html.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-09-19 11:56-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# 01_internet.html.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-09-19 11:56-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# 02_messaging.html.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-09-19 11:56-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# 03_gmusicbrowser.html.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-09-19 11:56-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# 04_office.html.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-09-19 11:56-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# 05_desktop.html.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-09-19 11:56-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# 06_explore.html.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-09-19 11:57-0300\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"Language-Team: LANGUAGE <[email protected]>\n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"#-#-#-#-# 07_thanks.html.pot (PACKAGE VERSION) #-#-#-#-#\n" +"Project-Id-Version: PACKAGE VERSION\n" +"POT-Creation-Date: 2013-09-19 11:57-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <[email protected]>\n" === modified file 'slideshows/ubuntu-gnome/slides/accessibility.html' --- slideshows/ubuntu-gnome/slides/accessibility.html 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/accessibility.html 2013-09-19 15:59:54 +0000 @@ -14,10 +14,6 @@ <h2 class="subtitle">Customization options</h2> <ul> <li> - <img class="icon" src="icons/themes.png" /> - <p class="caption">Appearance</p> - </li> - <li> <img class="icon" src="icons/access.png" /> <p class="caption">Assistive technologies</p> </li> @@ -29,5 +25,5 @@ </div> </div> - <img class="screenshot" src="screenshots/accessibility.jpg" /> + <img class="screenshot" src="screenshots/accessibility.png" /> </div> === modified file 'slideshows/ubuntu-gnome/slides/browse.html' --- slideshows/ubuntu-gnome/slides/browse.html 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/browse.html 2013-09-19 15:59:54 +0000 @@ -7,7 +7,7 @@ <div class="main"> <div class="text"> <div> - <p>Bored of waiting to get online? Leave the days of slow surfing behind you. With Firefox already installed, Ubuntu GNOME has everything you need to browse the web.</p> + <p>Ubuntu GNOME has everything you need to browse the web. Firefox offers powerful personalization, support for cutting-edge web standards, carefully optimized performance, and advanced security while still remaining easy to use.</p> </div> <div class="featured"> === modified file 'slideshows/ubuntu-gnome/slides/desktop.html' --- slideshows/ubuntu-gnome/slides/desktop.html 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/desktop.html 2013-09-19 15:59:54 +0000 @@ -15,7 +15,7 @@ <ul> <li> <img class="icon" src="icons/overview1.png"/> - <p class="caption">Lauch and manage <strong>your apps</strong> from the Dash</p> + <p class="caption">Launch and manage <strong>your apps</strong> from the Dash</p> </li> <li> <img class="icon" src="icons/overview2.png"/> === modified file 'slideshows/ubuntu-gnome/slides/gethelp.html' --- slideshows/ubuntu-gnome/slides/gethelp.html 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/gethelp.html 2013-09-19 15:59:54 +0000 @@ -1,13 +1,16 @@ <div class="header"> - <h1 class="slidetitle">Any questions? + <h1 class="slidetitle">Help and support <div style="float: left;"><img src="icons/pic-gethelp.png"/></div> </h1> </div> -<div class="main wide"> +<div class="main big"> <div class="text"> <div> - <p>Check out <a href="http://askubuntu.com/";>askubuntu.com</a> for answers to all your Ubuntu questions. There’s a good chance your question will have been answered already and, if not, you’ll find thousands of volunteers eager to help. For more support options, go to <a href="http://www.ubuntu.com/support";>ubuntu.com/support</a>.</p> + <p>Thank you for choosing and installing Ubuntu GNOME.<br /> <br /> + Learn more about Ubuntu GNOME from <a href="https://wiki.ubuntu.com/UbuntuGNOME/OneStopPage";>wiki.ubuntu.com/UbuntuGNOME/OneStopPage</a>. <br /> <br /> + For help and support, go to <a href="https://wiki.ubuntu.com/UbuntuGNOME/ContactUs";>wiki.ubuntu.com/UbuntuGNOME/ContactUs</a>. <br /> <br /> + Enjoy and have fun!</p> </div> </div> === modified file 'slideshows/ubuntu-gnome/slides/goa.html' --- slideshows/ubuntu-gnome/slides/goa.html 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/goa.html 2013-09-19 15:59:54 +0000 @@ -14,7 +14,7 @@ <ul> <li> <img class="icon" src="icons/gnome-documents.png"/> - <p class="caption">Acess <strong>your online documents</strong> natively</p> + <p class="caption">Access <strong>your online documents</strong> natively</p> </li> <li> <img class="icon" src="icons/gnome-contacts.png"/> === modified file 'slideshows/ubuntu-gnome/slides/index.html' --- slideshows/ubuntu-gnome/slides/index.html 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/index.html 2013-09-19 15:59:54 +0000 @@ -36,7 +36,7 @@ <div><a href="media.html"></a></div> <div><a href="photos.html"></a></div> <div><a href="usc.html"></a></div> - <!-- <div><a href="accessibility.html"></a></div> --> + <div><a href="accessibility.html"></a></div> <div><a href="gethelp.html"></a></div> </div> === modified file 'slideshows/ubuntu-gnome/slides/link/base.css' --- slideshows/ubuntu-gnome/slides/link/base.css 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/link/base.css 2013-09-19 15:59:54 +0000 @@ -146,7 +146,7 @@ background-image:url('background.png'); } -.main.wide { +.main.big { top:68px; left:0px; right:0px; @@ -154,6 +154,14 @@ background-image:none; } +.main.wide{ + top:68px; + left:0px; + right:0px; + bottom:0px; + background-image:url('background.png'); +} + /* A slide's body text goes inside here. Inner space is 224px wide. @@ -187,17 +195,35 @@ border-bottom:#333333 dotted 1px; } +.main.big > .text { + top:25px; + width:470px; +} + +.main.big > .text > div { + background:none; + font-size:20px; + line-height:1.2em; + color:#F7F6F6; + text-shadow:1px 1px 2px #333333; +} + .main.wide > .text { - top:25px; - width:450px; + position:absolute; + z-index:10; + top:235px; + left:36px; + width:680px; + overflow:auto; } .main.wide > .text > div { background:none; - font-size:20px; + font-size:inherit; line-height:1.2em; - color:#F7F6F6; - text-shadow:1px 1px 2px #333333; + margin-bottom:8px; + padding:6px 12px; + background-color:#FCFCFC; } .featured ul { === modified file 'slideshows/ubuntu-gnome/slides/media.html' --- slideshows/ubuntu-gnome/slides/media.html 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/media.html 2013-09-19 15:59:54 +0000 @@ -6,9 +6,9 @@ <div class="main"> <div class="text"> - <div> - <p>Rhythmbox lets you organize your music and listen to Internet radio, podcasts, and more. <br /> <br /> - GNOME Videos allows you to easily watch videos from your computer, DVD, or streamed over the Internet.</p> + <div> + <p>Rhythmbox lets you organize your music and listen to Internet radio, podcasts, and more.</p> <br /> <br /> + <p>GNOME Videos allows you to easily watch videos from your computer, DVD, or streamed over the Internet.</p> </div> <div class="featured"> === renamed file 'slideshows/ubuntu-gnome/slides/screenshots/accessibility.jpg' => 'slideshows/ubuntu-gnome/slides/screenshots/accessibility.png' Binary files slideshows/ubuntu-gnome/slides/screenshots/accessibility.jpg 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/accessibility.png 2013-09-19 15:59:54 +0000 differ === modified file 'slideshows/ubuntu-gnome/slides/screenshots/desktop.png' Binary files slideshows/ubuntu-gnome/slides/screenshots/desktop.png 2013-09-13 02:47:51 +0000 and slideshows/ubuntu-gnome/slides/screenshots/desktop.png 2013-09-19 15:59:54 +0000 differ === modified file 'slideshows/ubuntu-gnome/slides/usc.html' --- slideshows/ubuntu-gnome/slides/usc.html 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/usc.html 2013-09-19 15:59:54 +0000 @@ -8,7 +8,7 @@ <div class="text"> <div> <p><strong>Say goodbye to searching the web for new software. </strong> <br /> <br /> - Ubuntu Software Centre gives you instant access to thousands of great games and applications — some free and some available commercially. If you see something you like, you can see more information and then install it in just a couple of clicks.</p> + Ubuntu Software Center gives you instant access to thousands of great games and applications — some free and some available commercially. If you see something you like, you can see more information and install it in just a few clicks.</p> </div> </div> === modified file 'slideshows/ubuntu-gnome/slides/welcome.html' --- slideshows/ubuntu-gnome/slides/welcome.html 2013-09-13 02:47:51 +0000 +++ slideshows/ubuntu-gnome/slides/welcome.html 2013-09-19 15:59:54 +0000 @@ -4,10 +4,11 @@ </h1> </div> -<div class="main wide"> +<div class="main big"> <div class="text"> <div> - <p>Fast and full of new features, the latest version of Ubuntu GNOME makes computing easier than ever. Here are just a few cool new things to look out for…</p> + <p>Ubuntu GNOME features the GNOME desktop on top of the popular Ubuntu foundation.</p><br /><br /> + <p>We believe the combination of Ubuntu and GNOME is the best choice for those looking for a beautiful, simple, and usable operating system.</p> </div> </div>
_______________________________________________ Mailing list: https://launchpad.net/~ubiquity-slideshow Post to : [email protected] Unsubscribe : https://launchpad.net/~ubiquity-slideshow More help : https://help.launchpad.net/ListHelp
