← Back to team overview

ubiquity-slideshow team mailing list archive

[Merge] lp:~marco-ceppi/ubiquity-slideshow-ubuntu/askubuntu into lp:ubiquity-slideshow-ubuntu

 

Marco Ceppi has proposed merging lp:~marco-ceppi/ubiquity-slideshow-ubuntu/askubuntu into lp:ubiquity-slideshow-ubuntu.

Requested reviews:
  Ubiquity Slideshow (ubiquity-slideshow)
Related bugs:
  Bug #845682 in Ubiquity Slideshow: "AskUbuntu should be "Ask Ubuntu""
  https://bugs.launchpad.net/ubiquity-slideshow-ubuntu/+bug/845682

For more details, see:
https://code.launchpad.net/~marco-ceppi/ubiquity-slideshow-ubuntu/askubuntu/+merge/74858

Fixed bug 845682 where Ask Ubuntu was written as AskUbuntu
-- 
https://code.launchpad.net/~marco-ceppi/ubiquity-slideshow-ubuntu/askubuntu/+merge/74858
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~marco-ceppi/ubiquity-slideshow-ubuntu/askubuntu into lp:ubiquity-slideshow-ubuntu.
=== modified file 'po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot'
--- po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot	2011-09-07 21:41:47 +0000
+++ po/oem-config-ubuntu/slideshow-oem-config-ubuntu.pot	2011-09-09 19:07:17 +0000
@@ -99,7 +99,7 @@
 #. type: Content of: <div><div><div><p>
 #: slideshows/oem-config-ubuntu/slides/gethelp.html:8
 msgid ""
-"Check out <a href=\"http://askubuntu.com/\";>AskUbuntu</a>, the best place to "
+"Check out <a href=\"http://askubuntu.com/\";>Ask Ubuntu</a>, the best place to "
 "get an answer about Ubuntu. With most questions already answered, and "
 "thousands of people ready to help, you&#8217;ll be sorted in no time at all. "
 "And if you need an answer on a deadline, Canonical offers <a href=\"http://";

=== modified file 'po/ubuntu/en_GB.po'
--- po/ubuntu/en_GB.po	2011-09-07 20:23:51 +0000
+++ po/ubuntu/en_GB.po	2011-09-09 19:07:17 +0000
@@ -106,9 +106,9 @@
 #. type: Content of: <div><div><div><p>
 #: slideshows/ubuntu/slides/gethelp.html:8
 msgid ""
-"Check out <a href=\"http://askubuntu.com/\";>AskUbuntu</a>, the best place to get an answer about Ubuntu. With most questions already answered, and thousands of people ready to help, you&#8217;ll be sorted in no time at all. And if you need an answer on a deadline, Canonical offers <a href=\"http://www.ubuntu.com/support\";>commercial support</a> to business users."
+"Check out <a href=\"http://askubuntu.com/\";>Ask Ubuntu</a>, the best place to get an answer about Ubuntu. With most questions already answered, and thousands of people ready to help, you&#8217;ll be sorted in no time at all. And if you need an answer on a deadline, Canonical offers <a href=\"http://www.ubuntu.com/support\";>commercial support</a> to business users."
 msgstr ""
-"Check out <a href=\"http://askubuntu.com/\";>AskUbuntu</a>, the best place to get an answer about Ubuntu. With most questions already answered, and thousands of people ready to help, you&#8217;ll be sorted in no time at all. And if you need an answer on a deadline, Canonical offers <a href=\"http://www.ubuntu.com/support\";>commercial support</a> to business users."
+"Check out <a href=\"http://askubuntu.com/\";>Ask Ubuntu</a>, the best place to get an answer about Ubuntu. With most questions already answered, and thousands of people ready to help, you&#8217;ll be sorted in no time at all. And if you need an answer on a deadline, Canonical offers <a href=\"http://www.ubuntu.com/support\";>commercial support</a> to business users."
 
 #. type: Content of: <div><h1>
 #: slideshows/ubuntu/slides/mobilise.html:1

=== modified file 'po/ubuntu/slideshow-ubuntu.pot'
--- po/ubuntu/slideshow-ubuntu.pot	2011-09-07 21:41:47 +0000
+++ po/ubuntu/slideshow-ubuntu.pot	2011-09-09 19:07:17 +0000
@@ -99,7 +99,7 @@
 #. type: Content of: <div><div><div><p>
 #: slideshows/ubuntu/slides/gethelp.html:8
 msgid ""
-"Check out <a href=\"http://askubuntu.com/\";>AskUbuntu</a>, the best place to "
+"Check out <a href=\"http://askubuntu.com/\";>Ask Ubuntu</a>, the best place to "
 "get an answer about Ubuntu. With most questions already answered, and "
 "thousands of people ready to help, you&#8217;ll be sorted in no time at all. "
 "And if you need an answer on a deadline, Canonical offers <a href=\"http://";

=== modified file 'slideshows/ubuntu/slides/gethelp.html'
--- slideshows/ubuntu/slides/gethelp.html	2011-09-07 20:23:51 +0000
+++ slideshows/ubuntu/slides/gethelp.html	2011-09-09 19:07:17 +0000
@@ -5,7 +5,7 @@
 <div class="text">
 
 <div>
-<p>Check out <a href="http://askubuntu.com/";>AskUbuntu</a>, the best place to get an answer about Ubuntu. With most questions already answered, and thousands of people ready to help, you&#8217;ll be sorted in no time at all. And if you need an answer on a deadline, Canonical offers <a href="http://www.ubuntu.com/support";>commercial support</a> to business users.</p>
+<p>Check out <a href="http://askubuntu.com/";>Ask Ubuntu</a>, the best place to get an answer about Ubuntu. With most questions already answered, and thousands of people ready to help, you&#8217;ll be sorted in no time at all. And if you need an answer on a deadline, Canonical offers <a href="http://www.ubuntu.com/support";>commercial support</a> to business users.</p>
 </div>
 
 </div>