Merge lp:~marcobiscaro2112/ubuntu/natty/ubiquity-slideshow-ubuntu/fix-692879 into lp:ubuntu/natty/ubiquity-slideshow-ubuntu

[Marco Biscaro]

For all Ubuntu variants:

 * Changing the version from 10.10 to 11.04 (fixes LP: #683999)
 * Changing all occurences of "OpenOffice" to "LibreOffice" (fixes LP: #692879 LP: #712548)

[Didier Roche-Tolomelli (didrocks)]

All looks good, thanks for your fixes there!

Just note that you should keep the changelog < 80 caracters to display nicely on terminals and update-manager.

Also, this syntax is easier to read for the second line: (LP: #692879, #712548)

Also the revision should be ubiquity-slideshow-ubuntu (30) UNRELEASED; urgency=low
(note the 30 and the UNRELEASED). Your sponsor will commit to put it as released.

That's minor things though.
I've made those few changes and will sponsor that now :)
Thanks!

review: Approve

[Marco Biscaro (marcobiscaro2112)]

Hello Didier,

Thanks for the tips. I'll remember them when working on other bugs corrections.

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-04 14:28:36 +0000
+++ debian/changelog	2011-02-07 10:57:40 +0000
@@ -1,3 +1,11 @@
+ubiquity-slideshow-ubuntu (29ubuntu1) natty; urgency=low
+
+  * Bump version numbers to 11.04.  Many slides still need to be rewritten (LP: #683999)
+  * Changing OpenOffice.org to LibreOffice in all variants (LP: #692879) (LP: #712548)
+  * POT files updated
+
+ -- Marco Biscaro <[e-mail]>  Mon, 07 Feb 2011 08:34:09 -0200
+
 ubiquity-slideshow-ubuntu (29) natty; urgency=low
 
   * Add Edubuntu slideshow

=== modified file 'po/edubuntu/slideshow-edubuntu.pot'
--- po/edubuntu/slideshow-edubuntu.pot	2010-11-04 14:28:36 +0000
+++ po/edubuntu/slideshow-edubuntu.pot	2011-02-07 10:57:40 +0000
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-11-15 12:45-0800\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
 #: slideshows/edubuntu/slides/accessibility.html:1
@@ -82,7 +83,7 @@
 #. type: Content of: <div><div><ul><li>
 #: slideshows/edubuntu/slides/desktop-software.html:6
 msgid ""
-"<em>OpenOffice.org</em> is a powerful office software suite that is easy to "
+"<em>LibreOffice</em> is a powerful office software suite that is easy to "
 "understand."
 msgstr ""
 
@@ -487,7 +488,7 @@
 
 #. type: Content of: <div><div><ul><li>
 #: slideshows/edubuntu/slides/welcome.html:6
-msgid "Thank you for choosing Edubuntu 10.10."
+msgid "Thank you for choosing Edubuntu 11.04."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>

=== modified file 'po/kubuntu/slideshow-kubuntu.pot'
--- po/kubuntu/slideshow-kubuntu.pot	2010-09-16 18:53:39 +0000
+++ po/kubuntu/slideshow-kubuntu.pot	2011-02-07 10:57:40 +0000
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-16 18:51+0200\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <h1>
 #: slideshows/kubuntu/slides/accessibility.html:1
@@ -250,8 +251,8 @@
 #. type: Content of: <div><div><ul><li>
 #: slideshows/kubuntu/slides/office.html:5
 msgid ""
-"<em>OpenOffice.org</em> is a powerful office software suite that is very "
-"easy to learn and use."
+"<em>LibreOffice</em> is a powerful office software suite that is very easy "
+"to learn and use."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -264,7 +265,7 @@
 #. type: Content of: <div><div><ul><li>
 #: slideshows/kubuntu/slides/office.html:9
 msgid ""
-"<em>OpenOffice.org</em> works with documents from other popular office "
+"<em>LibreOffice</em> works with documents from other popular office "
 "applications include WordPerfect and Microsoft Office. It uses the standard "
 "OpenDocument format."
 msgstr ""
@@ -318,7 +319,7 @@
 
 #. type: Content of: <div><div><ul><li>
 #: slideshows/kubuntu/slides/welcome.html:6
-msgid "Thank you for choosing Kubuntu 10.10."
+msgid "Thank you for choosing Kubuntu 11.04."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>

=== modified file 'po/lubuntu/slideshow-lubuntu.pot'
--- po/lubuntu/slideshow-lubuntu.pot	2010-09-16 18:53:39 +0000
+++ po/lubuntu/slideshow-lubuntu.pot	2011-02-07 10:57:40 +0000
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-16 18:51+0200\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
 #: slideshows/lubuntu/slides/abiword-gnumeric.html:1
@@ -24,7 +25,7 @@
 #: slideshows/lubuntu/slides/abiword-gnumeric.html:6
 msgid ""
 "Lubuntu comes with <em>Abiword and Gnumeric</em>, lightweight alternatives "
-"for OpenOffice."
+"for LibreOffice."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>
@@ -91,7 +92,7 @@
 #: slideshows/lubuntu/slides/gnome-mplayer.html:9
 msgid ""
 "More information on <a href=\"http://sites.google.com/site/kdekorte2/"
-"gnomemplayer\">gnome-mplayer website.</a>"
+"gnomemplayer\">gnome-mplayer website</a>."
 msgstr ""
 
 #. type: Content of: <div><h1>
@@ -101,7 +102,7 @@
 
 #. type: Content of: <div><div><ul><li>
 #: slideshows/lubuntu/slides/help.html:6
-msgid "If you need help, you can contact us :"
+msgid "If you need help, you can contact us:"
 msgstr ""
 
 #.  The url should not be translated 
@@ -223,7 +224,7 @@
 
 #. type: Content of: <div><div><ul><li>
 #: slideshows/lubuntu/slides/welcome.html:6
-msgid "Thank you for choosing Lubuntu 10.10."
+msgid "Thank you for choosing Lubuntu 11.04."
 msgstr ""
 
 #. type: Content of: <div><div><p>

=== modified file 'po/ubuntu/slideshow-ubuntu.pot'
--- po/ubuntu/slideshow-ubuntu.pot	2010-09-16 18:53:39 +0000
+++ po/ubuntu/slideshow-ubuntu.pot	2011-02-07 10:57:40 +0000
@@ -6,14 +6,116 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-16 18:51+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING"
+"#-#-#-#-#  accessibility.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:07-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  browse.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:07-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  email.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:07-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  gethelp.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:07-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  mobilise.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:07-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  music.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  office.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  photos.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  social.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  usc.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"#-#-#-#-#  welcome.html.pot (PACKAGE VERSION)  #-#-#-#-#\n"
+"Project-Id-Version: PACKAGE VERSION\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <div><h1>
 #: slideshows/ubuntu/slides/accessibility.html:1
@@ -185,15 +287,15 @@
 #. type: Content of: <div><div><div><p>
 #: slideshows/ubuntu/slides/office.html:8
 msgid ""
-"OpenOffice.org is fully compatible with Microsoft Office and has everything "
-"you need to create professional documents, spreadsheets and presentations. "
-"OpenOffice.org is easy to use, packed with the features you need and "
-"completely free."
+"LibreOffice is fully compatible with Microsoft Office and has everything you "
+"need to create professional documents, spreadsheets and presentations. "
+"LibreOffice is easy to use, packed with the features you need and completely "
+"free."
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li><p>
 #: slideshows/ubuntu/slides/office.html:16
-msgid "OpenOffice.org"
+msgid "LibreOffice"
 msgstr ""
 
 #. type: Content of: <div><div><div><ul><li><p>
@@ -299,8 +401,7 @@
 #. type: Content of: <div><div><div><p>
 #: slideshows/ubuntu/slides/welcome.html:8
 msgid ""
-"Thank you for choosing Ubuntu 10.10. This version brings some exciting "
-"changes including a new sound menu, the Shotwell photo manager and features "
-"that make it even easier to find and install new software. While Ubuntu is "
-"installed, this slideshow will show you around."
+"Thank you for choosing Ubuntu 11.04. This version brings some exciting "
+"changes including a totally redesigned desktop interface, Unity. While "
+"Ubuntu is installed, this slideshow will show you around."
 msgstr ""

=== modified file 'po/xubuntu/slideshow-xubuntu.pot'
--- po/xubuntu/slideshow-xubuntu.pot	2010-09-16 18:53:39 +0000
+++ po/xubuntu/slideshow-xubuntu.pot	2011-02-07 10:57:40 +0000
@@ -7,13 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-09-16 18:51+0200\n"
+"POT-Creation-Date: 2011-02-06 23:08-0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
-"Content-Transfer-Encoding: ENCODING"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 
 #. type: Content of: <h1>
 #: slideshows/xubuntu/slides/app-menu.html:1
@@ -201,14 +202,14 @@
 #: slideshows/xubuntu/slides/office.html:8
 msgid ""
 "While Abiword and Gnumeric are considered lightweight, they provide almost "
-"all of the functions of the OpenOffice suite."
+"all of the functions of the LibreOffice suite."
 msgstr ""
 
 #. type: Content of: <div><div><p>
 #: slideshows/xubuntu/slides/office.html:10
 msgid ""
-"For power users, the OpenOffice.org suite is available in just a few clicks "
-"– just install it from the Ubuntu Software Center."
+"For power users, the LibreOffice suite is available in just a few clicks – "
+"just install it from the Ubuntu Software Center."
 msgstr ""
 
 #. type: Content of: <h1>
@@ -245,7 +246,7 @@
 
 #. type: Content of: <div><div><ul><li>
 #: slideshows/xubuntu/slides/welcome.html:6
-msgid "You have chosen to install the latest version of Xubuntu, 10.10."
+msgid "You have chosen to install the latest version of Xubuntu, 11.04."
 msgstr ""
 
 #. type: Content of: <div><div><ul><li>

=== modified file 'slideshows/edubuntu/slides/desktop-software.html'
--- slideshows/edubuntu/slides/desktop-software.html	2010-11-04 14:28:36 +0000
+++ slideshows/edubuntu/slides/desktop-software.html	2011-02-07 10:57:40 +0000
@@ -3,7 +3,7 @@
 <div class="main">
 
 <div class="content"><ul>
-	<li><em>OpenOffice.org</em> is a powerful office software suite that is easy to understand.</li>
+	<li><em>LibreOffice</em> is a powerful office software suite that is easy to understand.</li>
 	<li><em>Firefox</em> provides a safe and easy web browsing experience with many useful add-ons available.</li>
 	<li><em>Inkscape</em> is a vector drawing program capable of exporting to many popular formats.</li>
 	<li><em>Gimp</em> is a powerful and scriptable image and photo editor.</li>

=== modified file 'slideshows/edubuntu/slides/welcome.html'
--- slideshows/edubuntu/slides/welcome.html	2010-11-04 14:28:36 +0000
+++ slideshows/edubuntu/slides/welcome.html	2011-02-07 10:57:40 +0000
@@ -3,7 +3,7 @@
 <div class="main">
 
 <div class="content wrap-top"><ul>
-	<li>Thank you for choosing Edubuntu 10.10.</li>
+	<li>Thank you for choosing Edubuntu 11.04.</li>
 	<li>This release brings updates, bug fixes and new software. Please refer to the release notes on our website for the most up to date information.</li>
 	<li>Whether you're new to Edubuntu or a long-time user, we're sure there is something you will enjoy. While Edubuntu is installed, this slideshow will show you around.</li>
 </ul>

=== modified file 'slideshows/kubuntu/slides/office.html'
--- slideshows/kubuntu/slides/office.html	2010-03-24 14:31:56 +0000
+++ slideshows/kubuntu/slides/office.html	2011-02-07 10:57:40 +0000
@@ -2,11 +2,11 @@
 <div class="main">
     <div class="content">
 	<ul>
-	    <li><em>OpenOffice.org</em> is a powerful office software suite
+	    <li><em>LibreOffice</em> is a powerful office software suite
 	    that is very easy to learn and use.</li>
 	    <li>Use it to create letters, presentations and spreadsheets, as
 	    well as diagrams and databases.</li>
-	    <li><em>OpenOffice.org</em> works with documents from other popular
+	    <li><em>LibreOffice</em> works with documents from other popular
 	    office applications include WordPerfect and Microsoft Office. It
 	    uses the standard OpenDocument format.</li>
 	</ul>

=== modified file 'slideshows/kubuntu/slides/welcome.html'
--- slideshows/kubuntu/slides/welcome.html	2010-06-25 17:32:50 +0000
+++ slideshows/kubuntu/slides/welcome.html	2011-02-07 10:57:40 +0000
@@ -3,7 +3,7 @@
 <div class="main">
     <div class="content">
 	<ul>
-	    <li>Thank you for choosing Kubuntu 10.10.</li>
+	    <li>Thank you for choosing Kubuntu 11.04.</li>
 	    <li>We believe every computer user should be free to work in the
 	    environment of their choice and to download, change, study and
 	    share their software for any purpose.</li>

=== modified file 'slideshows/lubuntu/slides/abiword-gnumeric.html'
--- slideshows/lubuntu/slides/abiword-gnumeric.html	2010-09-15 18:04:46 +0000
+++ slideshows/lubuntu/slides/abiword-gnumeric.html	2011-02-07 10:57:40 +0000
@@ -3,7 +3,7 @@
 <div class="main">
 
 <div class="content wrap-top"><ul>
-	<li>Lubuntu comes with <em>Abiword and Gnumeric</em>, lightweight alternatives for OpenOffice.</li>
+	<li>Lubuntu comes with <em>Abiword and Gnumeric</em>, lightweight alternatives for LibreOffice.</li>
 	<li>You can create and edit documents like spreadsheets and letters.</li>
 	<li>More information on <a href="http://www.abisource.com/">Abiword</a> and <a href="http://projects.gnome.org/gnumeric/">Gnumeric websites</a>.</li>
 </ul>

=== modified file 'slideshows/lubuntu/slides/welcome.html'
--- slideshows/lubuntu/slides/welcome.html	2010-09-15 18:04:46 +0000
+++ slideshows/lubuntu/slides/welcome.html	2011-02-07 10:57:40 +0000
@@ -3,7 +3,7 @@
 <div class="main">
 
 <div class="content wrap-top"><ul>
-	<li>Thank you for choosing Lubuntu 10.10.</li>
+	<li>Thank you for choosing Lubuntu 11.04.</li>
 </ul>
 <p class="footer">Lubuntu is designed to be easy and fast. Feel free to explore!</p></div>
 

=== added file 'slideshows/ubuntu/slides/icons/libreoffice.png'
Binary files slideshows/ubuntu/slides/icons/libreoffice.png	1970-01-01 00:00:00 +0000 and slideshows/ubuntu/slides/icons/libreoffice.png	2011-02-07 10:57:40 +0000 differ
=== removed file 'slideshows/ubuntu/slides/icons/openoffice.png'
Binary files slideshows/ubuntu/slides/icons/openoffice.png	2010-11-04 14:28:36 +0000 and slideshows/ubuntu/slides/icons/openoffice.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'slideshows/ubuntu/slides/office.html'
--- slideshows/ubuntu/slides/office.html	2010-09-15 18:04:46 +0000
+++ slideshows/ubuntu/slides/office.html	2011-02-07 10:57:40 +0000
@@ -5,15 +5,15 @@
 <div class="text">
 
 <div>
-<p>OpenOffice.org is fully compatible with Microsoft Office and has everything you need to create professional documents, spreadsheets and presentations. OpenOffice.org is easy to use, packed with the features you need and completely free.</p>
+<p>LibreOffice is fully compatible with Microsoft Office and has everything you need to create professional documents, spreadsheets and presentations. LibreOffice is easy to use, packed with the features you need and completely free.</p>
 </div>
 
 <div class="featured">
 <h2 class="subtitle">Included software</h2>
 <ul>
 	<li>
-	<img class="icon" src="icons/openoffice.png" />
-	<p class="caption">OpenOffice.org</p>
+	<img class="icon" src="icons/libreoffice.png" />
+	<p class="caption">LibreOffice</p>
 	</li>
 	<li>
 	<img class="icon" src="icons/tomboy.png" />

=== modified file 'slideshows/ubuntu/slides/screenshots/office.jpeg'
Binary files slideshows/ubuntu/slides/screenshots/office.jpeg	2010-09-28 08:36:06 +0000 and slideshows/ubuntu/slides/screenshots/office.jpeg	2011-02-07 10:57:40 +0000 differ
=== modified file 'slideshows/ubuntu/slides/welcome.html'
--- slideshows/ubuntu/slides/welcome.html	2010-09-15 18:04:46 +0000
+++ slideshows/ubuntu/slides/welcome.html	2011-02-07 10:57:40 +0000
@@ -5,7 +5,7 @@
 <div class="text">
 
 <div>
-<p>Thank you for choosing Ubuntu 10.10. This version brings some exciting changes including a new sound menu, the Shotwell photo manager and features that make it even easier to find and install new software. While Ubuntu is installed, this slideshow will show you around.</p>
+<p>Thank you for choosing Ubuntu 11.04. This version brings some exciting changes including a totally redesigned desktop interface, Unity. While Ubuntu is installed, this slideshow will show you around.</p>
 </div>
 
 </div>

=== modified file 'slideshows/xubuntu/slides/office.html'
--- slideshows/xubuntu/slides/office.html	2010-03-24 14:31:56 +0000
+++ slideshows/xubuntu/slides/office.html	2011-02-07 10:57:40 +0000
@@ -5,9 +5,9 @@
 <div class="content"><ul>
 	<li><em>Abiword</em> is a word processor, which can read almost all known document formats. You will have access to any fonts installed in your system and editing documents is a breeze.</li>
 	<li><em>Gnumeric</em> is a spreadsheet program with an emphasis on accuracy. It can also be used to merge mathematical data into Abiword documents.</li>
-	<li>While Abiword and Gnumeric are considered lightweight, they provide almost all of the functions of the OpenOffice suite.</li>
+	<li>While Abiword and Gnumeric are considered lightweight, they provide almost all of the functions of the LibreOffice suite.</li>
 </ul>
-<p class="special">For power users, the OpenOffice.org suite is available in just a few clicks  – just install it from the Ubuntu Software Center.</p></div>
+<p class="special">For power users, the LibreOffice suite is available in just a few clicks  – just install it from the Ubuntu Software Center.</p></div>
 
 </div>
 

=== modified file 'slideshows/xubuntu/slides/welcome.html'
--- slideshows/xubuntu/slides/welcome.html	2010-06-25 17:32:50 +0000
+++ slideshows/xubuntu/slides/welcome.html	2011-02-07 10:57:40 +0000
@@ -3,7 +3,7 @@
 <div class="main">
 
 <div class="content"><ul>
-	<li class="nobullet">You have chosen to install the latest version of Xubuntu, 10.10.</li>
+	<li class="nobullet">You have chosen to install the latest version of Xubuntu, 11.04.</li>
 	<li>This exciting software is brought to you free of any fees, for your use and any others you want to share it with.</li>
 	<li>Since you are installing this software using the Xubuntu Desktop CD, feel free to examine things as it installs. After the installation, the desktop will look much the same as it does now.</li>
 </ul>