diff -Nru ubiquity-slideshow-ubuntu-8/debian/changelog ubiquity-slideshow-ubuntu-9/debian/changelog --- ubiquity-slideshow-ubuntu-8/debian/changelog 2009-10-02 12:28:56.000000000 +0100 +++ ubiquity-slideshow-ubuntu-9/debian/changelog 2009-10-12 09:26:02.000000000 +0100 @@ -1,3 +1,12 @@ +ubiquity-slideshow-ubuntu (9) UNRELEASED; urgency=low + + * The version of Firefox shipped with Ubuntu 9.10 is 3.5, not 3.0 + (LP: #442832). + * Add an Ubuntu One slide. + * Freeze exception (LP: #447383). + + -- Evan Dandrea Thu, 08 Oct 2009 00:39:24 +0100 + ubiquity-slideshow-ubuntu (8) karmic; urgency=low [ Dylan McCall ] diff -Nru ubiquity-slideshow-ubuntu-8/debian/copyright ubiquity-slideshow-ubuntu-9/debian/copyright --- ubiquity-slideshow-ubuntu-8/debian/copyright 2009-09-24 18:12:15.000000000 +0100 +++ ubiquity-slideshow-ubuntu-9/debian/copyright 2009-10-09 17:46:22.000000000 +0100 @@ -16,6 +16,15 @@ -- +The Ubuntu and Ubuntu One logos are copyright Canonical Ltd. + +The rights in the trademarks, logos, service marks of Canonical Ltd, +as well as the look and feel of Ubuntu, are not licensed under the +Creative Commons license and are subject to the Canonical Trademark +Policy at http://www.ubuntu.com/ubuntu/TrademarkPolicy + +-- + ./slides/link/scriptaculous/effects.js is licensed under an MIT-style license. It is part of the script.aculo.us web 2.0 javascript, Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, diff -Nru ubiquity-slideshow-ubuntu-8/icons-source/ubuntuone.svg ubiquity-slideshow-ubuntu-9/icons-source/ubuntuone.svg --- ubiquity-slideshow-ubuntu-8/icons-source/ubuntuone.svg 1970-01-01 01:00:00.000000000 +0100 +++ ubiquity-slideshow-ubuntu-9/icons-source/ubuntuone.svg 2009-10-09 17:39:29.000000000 +0100 @@ -0,0 +1,554 @@ + + + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff -Nru ubiquity-slideshow-ubuntu-8/po/firefox.html/template.pot ubiquity-slideshow-ubuntu-9/po/firefox.html/template.pot --- ubiquity-slideshow-ubuntu-8/po/firefox.html/template.pot 2009-09-24 18:12:15.000000000 +0100 +++ ubiquity-slideshow-ubuntu-9/po/firefox.html/template.pot 2009-10-12 09:24:45.000000000 +0100 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-21 20:06-0700\n" +"POT-Creation-Date: 2009-10-08 00:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,8 +18,8 @@ #: slides/firefox.html:2 msgid "" -"Ubuntu comes with Firefox 3, one of the most popular and useful web browsers " -"in the world." +"Ubuntu comes with Firefox 3.5, one of the most popular and useful web " +"browsers in the world." msgstr "" #: slides/firefox.html:3 diff -Nru ubiquity-slideshow-ubuntu-8/po/ubuntuone.html/template.pot ubiquity-slideshow-ubuntu-9/po/ubuntuone.html/template.pot --- ubiquity-slideshow-ubuntu-8/po/ubuntuone.html/template.pot 1970-01-01 01:00:00.000000000 +0100 +++ ubiquity-slideshow-ubuntu-9/po/ubuntuone.html/template.pot 2009-10-12 09:23:36.000000000 +0100 @@ -0,0 +1,39 @@ +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2009-10-12 09:23+0100\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Translate Toolkit 1.3.0\n" + +#: slides/ubuntuone.html:1 +msgid "Store, sync and share with Ubuntu One" +msgstr "" + +#: slides/ubuntuone.html:2 +msgid "" +"Ubuntu One is your personal cloud, providing 2 GB of essential storage (and " +"more if you need it)." +msgstr "" + +#: slides/ubuntuone.html:3 +msgid "" +"Use it to back up, store and sync your files, as well as share them with " +"other Ubuntu One users." +msgstr "" + +#: slides/ubuntuone.html:4 +msgid "" +"Your Tomboy notes and Evolution contacts are synced automatically across all " +"of your computers." +msgstr "" + +#: slides/ubuntuone.html:5 +msgid "Integration with your Ubuntu desktop makes sharing files easy." +msgstr "" diff -Nru ubiquity-slideshow-ubuntu-8/slides/firefox.html ubiquity-slideshow-ubuntu-9/slides/firefox.html --- ubiquity-slideshow-ubuntu-8/slides/firefox.html 2009-09-17 12:04:53.000000000 +0100 +++ ubiquity-slideshow-ubuntu-9/slides/firefox.html 2009-10-08 00:38:21.000000000 +0100 @@ -3,7 +3,7 @@
    -
  • Ubuntu comes with Firefox 3, one of the most popular and useful web browsers in the world.
  • +
  • Ubuntu comes with Firefox 3.5, one of the most popular and useful web browsers in the world.
  • Firefox keeps you safe by blocking pop-ups and warning about malware.
  • You can download add-ons that adapt Firefox to your personal requirements.
Binary files /tmp/XInNmsqgXa/ubiquity-slideshow-ubuntu-8/slides/icons/ubuntuone-1.png and /tmp/iPpL0w0q0m/ubiquity-slideshow-ubuntu-9/slides/icons/ubuntuone-1.png differ Binary files /tmp/XInNmsqgXa/ubiquity-slideshow-ubuntu-8/slides/icons/web.png and /tmp/iPpL0w0q0m/ubiquity-slideshow-ubuntu-9/slides/icons/web.png differ diff -Nru ubiquity-slideshow-ubuntu-8/slides/index.html ubiquity-slideshow-ubuntu-9/slides/index.html --- ubiquity-slideshow-ubuntu-8/slides/index.html 2009-09-17 12:05:22.000000000 +0100 +++ ubiquity-slideshow-ubuntu-9/slides/index.html 2009-10-08 00:49:57.000000000 +0100 @@ -40,6 +40,7 @@
+
diff -Nru ubiquity-slideshow-ubuntu-8/slides/ubuntuone.html ubiquity-slideshow-ubuntu-9/slides/ubuntuone.html --- ubiquity-slideshow-ubuntu-8/slides/ubuntuone.html 1970-01-01 01:00:00.000000000 +0100 +++ ubiquity-slideshow-ubuntu-9/slides/ubuntuone.html 2009-10-09 17:23:35.000000000 +0100 @@ -0,0 +1,14 @@ +

Store, sync and share with Ubuntu One

+ +
+ +
    +
  • Ubuntu One is your personal cloud, providing 2 GB of essential storage (and more if you need it).
  • +
  • Use it to back up, store and sync your files, as well as share them with other Ubuntu One users.
  • +
  • Your Tomboy notes and Evolution contacts are synced automatically across all of your computers.
  • +
  • Integration with your Ubuntu desktop makes sharing files easy.
  • +
+ +
+ +