Merge branch 'devel' of gitorious@git.sugarlabs.org:slo-addons/mainline into devel

43 files changed, 174 insertions, 172 deletions

diff --git a/site/app/controllers/components/email.php b/site/app/controllers/components/email.php
index 5593857..6e01c59 100644
--- a/site/app/controllers/components/email.php
+++ b/site/app/controllers/components/email.php
@@ -10,8 +10,8 @@ class EmailComponent
 /**
  * Send email using SMTP Auth by default.
  */
-    var $from         = 'nobody@mozilla.org'; 
-    var $fromName     = 'Mozilla Add-ons';
+    var $from         = 'addons@sugarlabs.org'; 
+    var $fromName     = 'Sugar Labs Add-ons';
     //var $smtpUserName = 'username';  // SMTP username
     //var $smtpPassword = 'password'; // SMTP password
     //var $smtpHostNames= "smtp1.example.com;smtp2.example.com";  // specify main and backup server
diff --git a/site/app/locale/af/LC_MESSAGES/messages.po b/site/app/locale/af/LC_MESSAGES/messages.po
index 8e49066..eec7fe8 100644
--- a/site/app/locale/af/LC_MESSAGES/messages.po
+++ b/site/app/locale/af/LC_MESSAGES/messages.po
@@ -4121,6 +4121,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 #, fuzzy
 msgid "main_prettyname_sunbird"
@@ -5702,8 +5706,3 @@ msgstr "New User Registration"
 #~ msgstr ""
 #~ "If this is hard to read, you can <a href=\"%1$s\">try different words</a> "
 #~ "or <a href=\"%2$s\">listen to numbers</a> instead."
-
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ar/LC_MESSAGES/messages.po b/site/app/locale/ar/LC_MESSAGES/messages.po
index 4ae0388..0d709e1 100644
--- a/site/app/locale/ar/LC_MESSAGES/messages.po
+++ b/site/app/locale/ar/LC_MESSAGES/messages.po
@@ -3481,6 +3481,10 @@ msgstr "فَيَرفُكس"
 msgid "main_prettyname_seamonkey"
 msgstr "سِيمانكي"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "صَنْبٍرد"
@@ -4764,7 +4768,3 @@ msgstr "إعادة تعيين كلمة سر المستخدم"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "تسجيل المستخدم الجديد"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ca/LC_MESSAGES/messages.po b/site/app/locale/ca/LC_MESSAGES/messages.po
index 3f18b9d..2c8a19c 100644
--- a/site/app/locale/ca/LC_MESSAGES/messages.po
+++ b/site/app/locale/ca/LC_MESSAGES/messages.po
@@ -3528,6 +3528,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4859,7 +4863,3 @@ msgstr "Registre d'un nou usuari"
 #~ msgstr ""
 #~ "Si us és difícil de llegir, podeu <a href=\"%1$s\">provar diverses "
 #~ "paraules</a> o bé en comptes d'això <a href=\"%2$s\">escoltar números</a>."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/cs/LC_MESSAGES/messages.po b/site/app/locale/cs/LC_MESSAGES/messages.po
index 7ecf3ec..e8cc495 100644
--- a/site/app/locale/cs/LC_MESSAGES/messages.po
+++ b/site/app/locale/cs/LC_MESSAGES/messages.po
@@ -3556,6 +3556,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5241,7 +5245,3 @@ msgstr "Registrace nového uživatele"
 
 #~ msgid "search_form_submit"
 #~ msgstr "Hledat"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/cy/LC_MESSAGES/messages.po b/site/app/locale/cy/LC_MESSAGES/messages.po
index 9ffa1d9..dbd3f13 100644
--- a/site/app/locale/cy/LC_MESSAGES/messages.po
+++ b/site/app/locale/cy/LC_MESSAGES/messages.po
@@ -3588,6 +3588,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5327,7 +5331,3 @@ msgstr "Cofrestru defnyddiwr Newydd"
 
 #~ msgid "search_form_submit"
 #~ msgstr "Chwilio"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/da/LC_MESSAGES/messages.po b/site/app/locale/da/LC_MESSAGES/messages.po
index 1d5b11e..d120f0c 100644
--- a/site/app/locale/da/LC_MESSAGES/messages.po
+++ b/site/app/locale/da/LC_MESSAGES/messages.po
@@ -3465,6 +3465,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4733,7 +4737,3 @@ msgstr "Nulstilling af adgangskode"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Registrering af ny bruger"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/de/LC_MESSAGES/messages.po b/site/app/locale/de/LC_MESSAGES/messages.po
index d5396c7..71f7590 100644
--- a/site/app/locale/de/LC_MESSAGES/messages.po
+++ b/site/app/locale/de/LC_MESSAGES/messages.po
@@ -3548,6 +3548,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4889,7 +4893,3 @@ msgstr "Benutzerkonto anlegen"
 #~ "Falls dies schwer zu lesen ist, können Sie sich <a href=\"%1$s\">andere "
 #~ "Wörter anzeigen lassen</a> oder sich stattdessen <a href=\"%2$s\">Zahlen "
 #~ "ansagen lassen</a>."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/el/LC_MESSAGES/messages.po b/site/app/locale/el/LC_MESSAGES/messages.po
index dcb1da3..9b15477 100644
--- a/site/app/locale/el/LC_MESSAGES/messages.po
+++ b/site/app/locale/el/LC_MESSAGES/messages.po
@@ -568,8 +568,8 @@ msgstr ""
 "<ol><li>κάντε δεξί κλικ παρακάτω και επιλέξτε «Αποθήκευση δεσμού ως...» για "
 "να αποθηκεύσετε το αρχείο στο δίσκο σας.</li><li>Στον Mozilla Thunderbird, "
 "ανοίξτε τα «Πρόσθετα» μέσα από το μενού «Εργαλεία».</li><li>Κάντε κλικ στο "
-"κουμπί «Εγκατάσταση» και αφού εντοπίσετε/επιλέξετε το αρχείο που "
-"αποθηκεύσατε κάντε κλικ στο «OK».</li></ol>"
+"κουμπί «Εγκατάσταση» και αφού εντοπίσετε/επιλέξετε το αρχείο που αποθηκεύσατε "
+"κάντε κλικ στο «OK».</li></ol>"
 
 #: views/elements/install.thtml:101
 msgid "addons_install_in_thunderbird_title"
@@ -3534,6 +3534,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4768,8 +4772,8 @@ msgstr "Συγχαρητήρια! Ο λογαριασμός χρήστη δημ�
 msgid "user_register_resend_confirmation_link"
 msgstr ""
 "Αν δε λάβατε το μήνυμα επιβεβαίωσης, σιγουρευτείτε πως η υπηρεσία ηλ. "
-"ταχυδρομείου που χρησιμοποιείτε δεν το σημείωσε ως «ανεπιθύμητο» ή «spam». "
-"Αν χρειάζεται, μπορούμε να κάνουμε  %1$s στη διεύθυνση ηλ. ταχυδρομείου που "
+"ταχυδρομείου που χρησιμοποιείτε δεν το σημείωσε ως «ανεπιθύμητο» ή «spam». Αν "
+"χρειάζεται, μπορούμε να κάνουμε  %1$s στη διεύθυνση ηλ. ταχυδρομείου που "
 "αναφέρθηκε παραπάνω."
 
 # %1 is the link to the Mozilla Add-ons front page
@@ -5842,7 +5846,3 @@ msgstr "Εγγραφή νέου χρήστη"
 #, fuzzy
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Tools"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/en_US/LC_MESSAGES/messages.mo b/site/app/locale/en_US/LC_MESSAGES/messages.mo
index b5f8907..771d575 100644
--- a/site/app/locale/en_US/LC_MESSAGES/messages.mo
+++ b/site/app/locale/en_US/LC_MESSAGES/messages.mo
diff --git a/site/app/locale/en_US/LC_MESSAGES/messages.po b/site/app/locale/en_US/LC_MESSAGES/messages.po
index 95d1b58..8af9334 100644
--- a/site/app/locale/en_US/LC_MESSAGES/messages.po
+++ b/site/app/locale/en_US/LC_MESSAGES/messages.po
@@ -1384,7 +1384,7 @@ msgstr "Edit Add-on"
 msgid "devcp_addon_submission_pending"
 msgstr ""
 "This version has been placed in the sandbox while it awaits review from "
-"sandbox testers and a Mozilla Add-ons editor. You will be notified by e-mail "
+"sandbox testers and a SugarLabs Add-ons editor. You will be notified by e-mail "
 "when action has been taken."
 
 # %1 is the link to the sandbox information page
@@ -3259,7 +3259,7 @@ msgstr "Credits"
 #: views/elements/footer.thtml:73
 msgid "footer_disclaimer"
 msgstr ""
-"Mozilla is providing links to these applications as a courtesy, and makes no "
+"SugarLabs is providing links to these applications as a courtesy, and makes no "
 "representations regarding the applications or any information related there "
 "to. Any questions, complaints or claims regarding the applications must be "
 "directed to the appropriate software vendor."
@@ -3536,7 +3536,7 @@ msgstr "Add-ons Policy"
 
 #: controllers/pages_controller.php:105
 msgid "page_title_privacy"
-msgstr "Mozilla Privacy Policy"
+msgstr "SugarLabs Privacy Policy"
 
 #: controllers/pages_controller.php:107
 msgid "page_title_review_guide"
@@ -4295,7 +4295,7 @@ msgstr ""
 
 #: views/users/delete.thtml:95
 msgid "user_del_community_sad"
-msgstr "The Mozilla Add-ons community is sad to see you go."
+msgstr "The SugarLabs Add-ons community is sad to see you go."
 
 #: views/users/delete.thtml:116
 msgid "user_del_confirm_password"
@@ -4351,7 +4351,7 @@ msgstr "Farewell!"
 
 #: views/users/delete.thtml:108
 msgid "user_del_nologin"
-msgstr "You will not be able to log into Mozilla Add-ons anymore."
+msgstr "You will not be able to log into SugarLabs Add-ons anymore."
 
 #: views/users/delete.thtml:105
 msgid "user_del_permanently_removed_means"
@@ -4593,13 +4593,13 @@ msgstr "There are currently no notifications available for you to configure."
 #: views/users/edit.thtml:137
 msgid "user_notifications_select_topics"
 msgstr ""
-"From time to time, Mozilla may send you email about upcoming releases and "
+"From time to time, SugarLabs may send you email about upcoming releases and "
 "add-on events. Please select the topics you are interested in below:"
 
 #: views/users/edit.thtml:143
 msgid "user_notifications_specific_contact"
 msgstr ""
-"Mozilla reserves the right to contact you individually about specific "
+"SugarLabs reserves the right to contact you individually about specific "
 "concerns with your hosted add-ons."
 
 #: controllers/users_controller.php:526
@@ -4756,7 +4756,7 @@ msgstr "User Login"
 msgid "users_login_sandbox_display_warning"
 msgstr ""
 "The add-on you're looking for is currently in the sandbox. If you already "
-"have an account on Mozilla Add-ons, please log in, or <a href=\"%1$s\">learn "
+"have an account on SugarLabs Add-ons, please log in, or <a href=\"%1$s\">learn "
 "more about the sandbox.</a>"
 
 # %1 is the link to the sandbox/policy explanation page
@@ -4766,7 +4766,7 @@ msgstr ""
 msgid "users_login_sandbox_page_warning"
 msgstr ""
 "The page you're looking for is part of the sandbox. If you already have an "
-"account on Mozilla Add-ons, please log in, or <a href=\"%1$s\">learn more "
+"account on SugarLabs Add-ons, please log in, or <a href=\"%1$s\">learn more "
 "about the sandbox.</a>"
 
 #: controllers/users_controller.php:223 controllers/users_controller.php:225
diff --git a/site/app/locale/es_ES/LC_MESSAGES/messages.po b/site/app/locale/es_ES/LC_MESSAGES/messages.po
index baf4505..0bb7ceb 100644
--- a/site/app/locale/es_ES/LC_MESSAGES/messages.po
+++ b/site/app/locale/es_ES/LC_MESSAGES/messages.po
@@ -3521,6 +3521,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4881,7 +4885,3 @@ msgstr "Registro de nuevo usuario"
 #~ msgstr ""
 #~ "Por favor, introduce los <strong>números</strong> que estás escuchando a "
 #~ "continuación."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/eu/LC_MESSAGES/messages.po b/site/app/locale/eu/LC_MESSAGES/messages.po
index 1c00621..6c0af9e 100644
--- a/site/app/locale/eu/LC_MESSAGES/messages.po
+++ b/site/app/locale/eu/LC_MESSAGES/messages.po
@@ -3583,6 +3583,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5823,7 +5827,3 @@ msgstr "Erabiltzaile berriaren harpidetza"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Tresnak"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/fa/LC_MESSAGES/messages.po b/site/app/locale/fa/LC_MESSAGES/messages.po
index f5caeae..8fb1516 100644
--- a/site/app/locale/fa/LC_MESSAGES/messages.po
+++ b/site/app/locale/fa/LC_MESSAGES/messages.po
@@ -3480,6 +3480,10 @@ msgstr "فایرفاکس"
 msgid "main_prettyname_seamonkey"
 msgstr "سی‌مانکی"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "سان‌برد"
@@ -3684,8 +3688,8 @@ msgstr ""
 "<p>این ترفندها را در ذهن داشته باشید:</p><ul><li>طوری بنویسید که انگار تجربهٔ "
 "خود از این افزودنی را برای یک دوست تعریف می‌کنید. نکات ریز و جزئیات مفید "
 "مانند ویژگی‌هایی که دوست داشتید یا دوست نداشتید، آسانی استفاده از آن، و "
-"معابیش را بیان کنید.  از کلی‌گویی و «عالی» یا «بد» خواندن افزودنی بپرهیزید "
-"مگر آن که دلایل نظر خود را نیز بیان کنید.</li><li>لطفاً گزارش مشکلات را در "
+"معابیش را بیان کنید.  از کلی‌گویی و «عالی» یا «بد» خواندن افزودنی بپرهیزید مگر "
+"آن که دلایل نظر خود را نیز بیان کنید.</li><li>لطفاً گزارش مشکلات را در "
 "بررسی‌ها ارسال نکنید. ما نشانی پست الکترونیکی شما را در اختیار توسعه‌دهندگان "
 "افزودنی قرار نمی‌دهیم و ممکن است آنها نیاز داشته باشند با شما تماس بگیرند تا "
 "به رفع مشکلتان کمک کنند. از <a href=\"%1$s\">بخش پشتیبانی </a> برای کمک "
@@ -4317,8 +4321,8 @@ msgstr "در صورتی که سؤال دیگری دارید، با %1$s تماس
 #: views/users/delete.thtml:74
 msgid "user_del_error_checkbox"
 msgstr ""
-"برای آن که بتوانیم حساب کاربری شما را حذف کنیم، باید گزینهٔ «متوجه هستم "
-"که...» را فعال کنید."
+"برای آن که بتوانیم حساب کاربری شما را حذف کنیم، باید گزینهٔ «متوجه هستم که...» "
+"را فعال کنید."
 
 #: views/users/delete.thtml:78
 msgid "user_del_error_password"
@@ -5157,7 +5161,3 @@ msgstr "ثبت نام کاربر جدید"
 
 #~ msgid "search_form_submit"
 #~ msgstr "جستجو"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/fi/LC_MESSAGES/messages.po b/site/app/locale/fi/LC_MESSAGES/messages.po
index c3c6daa..3566018 100644
--- a/site/app/locale/fi/LC_MESSAGES/messages.po
+++ b/site/app/locale/fi/LC_MESSAGES/messages.po
@@ -3615,6 +3615,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5963,7 +5967,3 @@ msgstr "Uuden käyttäjän rekisteröityminen"
 #, fuzzy
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Tools"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/fr/LC_MESSAGES/messages.po b/site/app/locale/fr/LC_MESSAGES/messages.po
index 9d02be0..5bc7792 100644
--- a/site/app/locale/fr/LC_MESSAGES/messages.po
+++ b/site/app/locale/fr/LC_MESSAGES/messages.po
@@ -3534,6 +3534,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5788,7 +5792,3 @@ msgstr "Inscription d'un nouvel utilisateur"
 #~ "Mot de passe : %3$s\n"
 #~ "Merci de participer à Mozilla Addons\n"
 #~ "-- L'équipe de Mozilla Add-ons"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/fy_NL/LC_MESSAGES/messages.po b/site/app/locale/fy_NL/LC_MESSAGES/messages.po
index 57b3c04..eec7fe8 100644
--- a/site/app/locale/fy_NL/LC_MESSAGES/messages.po
+++ b/site/app/locale/fy_NL/LC_MESSAGES/messages.po
@@ -4121,6 +4121,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 #, fuzzy
 msgid "main_prettyname_sunbird"
@@ -5702,7 +5706,3 @@ msgstr "New User Registration"
 #~ msgstr ""
 #~ "If this is hard to read, you can <a href=\"%1$s\">try different words</a> "
 #~ "or <a href=\"%2$s\">listen to numbers</a> instead."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ga_IE/LC_MESSAGES/messages.po b/site/app/locale/ga_IE/LC_MESSAGES/messages.po
index 2b9e4f0..c398588 100644
--- a/site/app/locale/ga_IE/LC_MESSAGES/messages.po
+++ b/site/app/locale/ga_IE/LC_MESSAGES/messages.po
@@ -3582,6 +3582,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5331,7 +5335,3 @@ msgstr "Clárú Úsáideora Nua"
 #, fuzzy
 #~ msgid "search_form_submit"
 #~ msgstr "Search"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/he/LC_MESSAGES/messages.po b/site/app/locale/he/LC_MESSAGES/messages.po
index e424a30..9bf467f 100644
--- a/site/app/locale/he/LC_MESSAGES/messages.po
+++ b/site/app/locale/he/LC_MESSAGES/messages.po
@@ -3508,6 +3508,10 @@ msgstr "פיירפוקס"
 msgid "main_prettyname_seamonkey"
 msgstr "סימונקי"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "סאנבירד"
@@ -5023,7 +5027,3 @@ msgstr "הרשמת משתמש חדש"
 #~ msgstr ""
 #~ "אם זה קשה לקרוא, אתה יכול <a href=\"%1$s\">לנסות מילים שונות</a> או <a "
 #~ "href=\"%2$s\">לשמוע מספרים</a>במקום."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/hu/LC_MESSAGES/messages.po b/site/app/locale/hu/LC_MESSAGES/messages.po
index 9858848..d3d1d05 100644
--- a/site/app/locale/hu/LC_MESSAGES/messages.po
+++ b/site/app/locale/hu/LC_MESSAGES/messages.po
@@ -3503,6 +3503,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4798,7 +4802,3 @@ msgstr "Felhasználó jelszavának törlése"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Új felhasználó regisztrációja"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/id/LC_MESSAGES/messages.po b/site/app/locale/id/LC_MESSAGES/messages.po
index a906333..4450929 100644
--- a/site/app/locale/id/LC_MESSAGES/messages.po
+++ b/site/app/locale/id/LC_MESSAGES/messages.po
@@ -3545,6 +3545,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5765,7 +5769,3 @@ msgstr "Pendaftaran Pengguna Baru"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Perangkat"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/it/LC_MESSAGES/messages.po b/site/app/locale/it/LC_MESSAGES/messages.po
index 528700d..5cd82c3 100644
--- a/site/app/locale/it/LC_MESSAGES/messages.po
+++ b/site/app/locale/it/LC_MESSAGES/messages.po
@@ -3573,6 +3573,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4921,7 +4925,3 @@ msgstr "Registrazione nuovo utente"
 
 #~ msgid "recaptcha_enter_numbers"
 #~ msgstr "Inserisci di seguito i <strong>numeri</strong> che hai ascoltato."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ja/LC_MESSAGES/messages.po b/site/app/locale/ja/LC_MESSAGES/messages.po
index ce866f8..f0c47d5 100644
--- a/site/app/locale/ja/LC_MESSAGES/messages.po
+++ b/site/app/locale/ja/LC_MESSAGES/messages.po
@@ -3491,6 +3491,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5639,7 +5643,3 @@ msgstr "ユーザ登録"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "ツール"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ko/LC_MESSAGES/messages.po b/site/app/locale/ko/LC_MESSAGES/messages.po
index 11ec54b..199b806 100644
--- a/site/app/locale/ko/LC_MESSAGES/messages.po
+++ b/site/app/locale/ko/LC_MESSAGES/messages.po
@@ -3514,6 +3514,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 #, fuzzy
 msgid "main_prettyname_sunbird"
@@ -5718,7 +5722,3 @@ msgstr "새 사용자 등록"
 #, fuzzy
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Tools"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/mn/LC_MESSAGES/messages.po b/site/app/locale/mn/LC_MESSAGES/messages.po
index f1bebf9..a1ec03a 100644
--- a/site/app/locale/mn/LC_MESSAGES/messages.po
+++ b/site/app/locale/mn/LC_MESSAGES/messages.po
@@ -3577,6 +3577,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5843,7 +5847,3 @@ msgstr "Шинэ хэрэглэгчийн бүртгэл"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Хэрэгслүүд"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/nl/LC_MESSAGES/messages.po b/site/app/locale/nl/LC_MESSAGES/messages.po
index 1fd32c5..428dfeb 100644
--- a/site/app/locale/nl/LC_MESSAGES/messages.po
+++ b/site/app/locale/nl/LC_MESSAGES/messages.po
@@ -3511,6 +3511,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4839,7 +4843,3 @@ msgstr "Nieuwe gebruikersregistratie"
 #~ msgstr ""
 #~ "Indien dit moeilijk te lezen is, kunt u <a href=\"%1$s\">andere woorden "
 #~ "proberen</a> of <a href=\"%2$s\">naar getallen luisteren</a>."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/pl/LC_MESSAGES/messages.po b/site/app/locale/pl/LC_MESSAGES/messages.po
index 69deecd..9a79695 100644
--- a/site/app/locale/pl/LC_MESSAGES/messages.po
+++ b/site/app/locale/pl/LC_MESSAGES/messages.po
@@ -3521,6 +3521,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4849,7 +4853,3 @@ msgstr "Rejestracja nowego użytkownika"
 
 #~ msgid "recaptcha_enter_numbers"
 #~ msgstr "Wprowadź poniżej <strong>liczby</strong>, które usłyszysz."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/pt_BR/LC_MESSAGES/messages.po b/site/app/locale/pt_BR/LC_MESSAGES/messages.po
index dc4511c..e215241 100644
--- a/site/app/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/site/app/locale/pt_BR/LC_MESSAGES/messages.po
@@ -3561,6 +3561,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5787,7 +5791,3 @@ msgstr "Registro de novo usuário"
 
 #~ msgid "sidebar_navlink_tools"
 #~ msgstr "Ferramentas"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/pt_PT/LC_MESSAGES/messages.po b/site/app/locale/pt_PT/LC_MESSAGES/messages.po
index 76c6eb4..b0dd1bb 100644
--- a/site/app/locale/pt_PT/LC_MESSAGES/messages.po
+++ b/site/app/locale/pt_PT/LC_MESSAGES/messages.po
@@ -3535,6 +3535,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5241,7 +5245,3 @@ msgstr "Registo de Novo Utilizador"
 
 #~ msgid "search_form_submit"
 #~ msgstr "Pesquisar"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ro/LC_MESSAGES/messages.po b/site/app/locale/ro/LC_MESSAGES/messages.po
index 8f36944..625e8a7 100644
--- a/site/app/locale/ro/LC_MESSAGES/messages.po
+++ b/site/app/locale/ro/LC_MESSAGES/messages.po
@@ -3583,6 +3583,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5337,7 +5341,3 @@ msgstr "Înregistrare utilizator nou"
 #, fuzzy
 #~ msgid "search_form_submit"
 #~ msgstr "Search"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/ru/LC_MESSAGES/messages.po b/site/app/locale/ru/LC_MESSAGES/messages.po
index 33856b8..1af7cb1 100644
--- a/site/app/locale/ru/LC_MESSAGES/messages.po
+++ b/site/app/locale/ru/LC_MESSAGES/messages.po
@@ -3520,6 +3520,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4811,9 +4815,9 @@ msgstr "Вход пользователя в систему"
 #, php-format
 msgid "users_login_sandbox_display_warning"
 msgstr ""
-"Дополнение, которое вы ищете, находится в данный момент в «песочнице». Если "
-"у вас уже есть учётная запись на Mozilla Add-ons, пожалуйста войдите в "
-"систему или <a href=\"%1$s\">почитайте больше о «песочнице»</a>."
+"Дополнение, которое вы ищете, находится в данный момент в «песочнице». Если у "
+"вас уже есть учётная запись на Mozilla Add-ons, пожалуйста войдите в систему "
+"или <a href=\"%1$s\">почитайте больше о «песочнице»</a>."
 
 # %1 is the link to the sandbox/policy explanation page
 # This message is for any given sandbox-related page not found
@@ -4944,8 +4948,8 @@ msgstr "Регистрация нового пользователя"
 
 #~ msgid "addons_display_sandbox_pref_warning"
 #~ msgstr ""
-#~ "Дополнение, которое вы ищете, находится в «песочнице», которая не "
-#~ "включена в ваших настройках."
+#~ "Дополнение, которое вы ищете, находится в «песочнице», которая не включена "
+#~ "в ваших настройках."
 
 #~ msgid "addons_display_see_all_discussions"
 #~ msgstr "Просмотреть все обсуждения"
@@ -5722,7 +5726,3 @@ msgstr "Регистрация нового пользователя"
 
 #~ msgid "this page"
 #~ msgstr "эта страница"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/sk/LC_MESSAGES/messages.po b/site/app/locale/sk/LC_MESSAGES/messages.po
index e9b2054..e198448 100644
--- a/site/app/locale/sk/LC_MESSAGES/messages.po
+++ b/site/app/locale/sk/LC_MESSAGES/messages.po
@@ -3486,6 +3486,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4801,7 +4805,3 @@ msgstr "Registrácia nového používateľa"
 
 #~ msgid "recaptcha_enter_numbers"
 #~ msgstr "Zadajte <strong>čísla</strong>, ktoré počujete."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/sq/LC_MESSAGES/messages.po b/site/app/locale/sq/LC_MESSAGES/messages.po
index ede4a5c..8acf18a 100644
--- a/site/app/locale/sq/LC_MESSAGES/messages.po
+++ b/site/app/locale/sq/LC_MESSAGES/messages.po
@@ -3526,6 +3526,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4858,7 +4862,3 @@ msgstr "Regjistrim Përdoruesi të Ri"
 
 #~ msgid "recaptcha_enter_numbers"
 #~ msgstr "Ju lutem jepni më poshtë <strong>numrat</strong> që po dëgjoni."
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/sv_SE/LC_MESSAGES/messages.po b/site/app/locale/sv_SE/LC_MESSAGES/messages.po
index 6f5edb3..7b50b89 100644
--- a/site/app/locale/sv_SE/LC_MESSAGES/messages.po
+++ b/site/app/locale/sv_SE/LC_MESSAGES/messages.po
@@ -3529,6 +3529,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5269,7 +5273,3 @@ msgstr "Registrering av ny användare"
 
 #~ msgid "search_form_submit"
 #~ msgstr "Sök"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/tr/LC_MESSAGES/messages.po b/site/app/locale/tr/LC_MESSAGES/messages.po
index c75003c..ece53fb 100644
--- a/site/app/locale/tr/LC_MESSAGES/messages.po
+++ b/site/app/locale/tr/LC_MESSAGES/messages.po
@@ -3795,6 +3795,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 #, fuzzy
 msgid "main_prettyname_sunbird"
@@ -6371,7 +6375,3 @@ msgstr "Yeni Kullanıcı Kaydı"
 #~ "Şifre: %3$s\n"
 #~ "Mozilla Eklentilerine katıldığınız için teşekkürler\n"
 #~ "-- Mozilla Eklentileri Yönetimi"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/uk/LC_MESSAGES/messages.po b/site/app/locale/uk/LC_MESSAGES/messages.po
index 7819ada..8fe9d7d 100644
--- a/site/app/locale/uk/LC_MESSAGES/messages.po
+++ b/site/app/locale/uk/LC_MESSAGES/messages.po
@@ -3551,6 +3551,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -5280,7 +5284,3 @@ msgstr "Реєстрація нового користувача"
 
 #~ msgid "search_form_submit"
 #~ msgstr "Шукати"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/vi/LC_MESSAGES/messages.po b/site/app/locale/vi/LC_MESSAGES/messages.po
index 914960a..4e86cb2 100644
--- a/site/app/locale/vi/LC_MESSAGES/messages.po
+++ b/site/app/locale/vi/LC_MESSAGES/messages.po
@@ -3486,6 +3486,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "SeaMonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4783,7 +4787,3 @@ msgstr "Khôi phục Mật khẩu Người dùng"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "Đăng kí Người dùng Mới"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/zh_CN/LC_MESSAGES/messages.po b/site/app/locale/zh_CN/LC_MESSAGES/messages.po
index a6b7b2d..374bdac 100644
--- a/site/app/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/site/app/locale/zh_CN/LC_MESSAGES/messages.po
@@ -3425,6 +3425,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4683,7 +4687,3 @@ msgstr "用户密码重置"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "新用户注册"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/locale/zh_TW/LC_MESSAGES/messages.po b/site/app/locale/zh_TW/LC_MESSAGES/messages.po
index 10c549e..85d2d2f 100644
--- a/site/app/locale/zh_TW/LC_MESSAGES/messages.po
+++ b/site/app/locale/zh_TW/LC_MESSAGES/messages.po
@@ -3428,6 +3428,10 @@ msgstr "Firefox"
 msgid "main_prettyname_seamonkey"
 msgstr "Seamonkey"
 
+# : config/bootstrap.php:279
+msgid "main_prettyname_sugar"
+msgstr "Sugar"
+
 #: config/bootstrap.php:276
 msgid "main_prettyname_sunbird"
 msgstr "Sunbird"
@@ -4688,7 +4692,3 @@ msgstr "使用者密碼重設"
 #: controllers/users_controller.php:90 controllers/users_controller.php:92
 msgid "users_register_pagetitle"
 msgstr "新使用者註冊"
-
-# : config/bootstrap.php:279
-msgid "main_prettyname_sugar"
-msgstr "Sugar"
diff --git a/site/app/views/addons/home.thtml b/site/app/views/addons/home.thtml
index 08dca92..be6c382 100644
--- a/site/app/views/addons/home.thtml
+++ b/site/app/views/addons/home.thtml
@@ -161,7 +161,7 @@
         <div id="developer" class="extra">
             <h3><?=(!empty($welcomeName) ? sprintf(_('sidebar_navlink_welcome_name'), $welcomeName) : _('sidebar_navlink_welcome'))?></h3>
             <ul>
-                <li><?=$html->link(_('sidebar_navlink_developer_tools'), '/developers')?></li>
+                <li><?=$html->link(_('sidebar_navlink_developer_tools'), '/developers/dashboard')?></li>
                 <?php if ($this->controller->SimpleAcl->actionAllowed('Editors', '%', $this->controller->Session->read('User'))): ?>
                 <li><?=$html->link(_('sidebar_navlink_editor_tools'), '/editors')?></li>
                 <?php endif;
diff --git a/site/app/views/elements/footer.thtml b/site/app/views/elements/footer.thtml
index 71c0009..917fcc9 100644
--- a/site/app/views/elements/footer.thtml
+++ b/site/app/views/elements/footer.thtml
@@ -64,7 +64,7 @@
 <?php endif; ?>
 
 <div id="footer-legal">
-    <p id="copyright"><?=_('footer_copyright')?> <span title="<?=php_uname('n')?>">&#169;</span> 2005&#8211;<?=date('Y')?> Mozilla. <?=_('footer_all_rights_reserved')?></p>
+    <p id="copyright"><?=_('footer_copyright')?> <span title="<?=php_uname('n')?>">&#169;</span> 2005&#8211;<?=date('Y')?> SugarLabs. <?=_('footer_all_rights_reserved')?></p>
     <ul id="nav-legal">
         <li><?=$html->link(_('footer_privacy_policy'), '/pages/privacy');?></li>
         <li><a href="http://www.mozilla.com/<?=LANG?>/about/legal.html"><?=_('footer_legal_notices')?></a></li>
diff --git a/site/app/webroot/css/sugar.css b/site/app/webroot/css/sugar.css
index d777b7c..0dafe8a 100644
--- a/site/app/webroot/css/sugar.css
+++ b/site/app/webroot/css/sugar.css
@@ -3,4 +3,7 @@
 #other-apps {visibility: hidden;}
 .pitch {visibility: hidden;}
 #toggle-outer {visibility: hidden;}
-
+#content #sidebar {position:absolute;left:15px;}
+#content-main {margin-left:150px;}
+.html-ltr #search-element {left:150px;}
+.html-ltr #page-title h1 img {left:-85px;bottom:-15px;}
diff --git a/site/app/webroot/img/app-icons/sugar.png b/site/app/webroot/img/app-icons/sugar.png
index 6983c97..2e17f87 100644
--- a/site/app/webroot/img/app-icons/sugar.png
+++ b/site/app/webroot/img/app-icons/sugar.png