From 019f0093c7fb6e3443e8a6ef82b2ac76fd6586d5 Mon Sep 17 00:00:00 2001 From: David Farning Date: Tue, 17 Feb 2009 14:51:24 +0000 Subject: Merge branch 'devel' of gitorious@git.sugarlabs.org:slo-addons/mainline into devel --- 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 try different words " #~ "or listen to numbers 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 provar diverses " #~ "paraules o bé en comptes d'això escoltar números." - -# : 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 andere " #~ "Wörter anzeigen lassen oder sich stattdessen Zahlen " #~ "ansagen lassen." - -# : 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 "" "
  1. κάντε δεξί κλικ παρακάτω και επιλέξτε «Αποθήκευση δεσμού ως...» για " "να αποθηκεύσετε το αρχείο στο δίσκο σας.
  2. Στον Mozilla Thunderbird, " "ανοίξτε τα «Πρόσθετα» μέσα από το μενού «Εργαλεία».
  3. Κάντε κλικ στο " -"κουμπί «Εγκατάσταση» και αφού εντοπίσετε/επιλέξετε το αρχείο που " -"αποθηκεύσατε κάντε κλικ στο «OK».
" +"κουμπί «Εγκατάσταση» και αφού εντοπίσετε/επιλέξετε το αρχείο που αποθηκεύσατε " +"κάντε κλικ στο «OK»." #: 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 Binary files differ 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 learn " +"have an account on SugarLabs Add-ons, please log in, or learn " "more about the sandbox." # %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 learn more " +"account on SugarLabs Add-ons, please log in, or learn more " "about the sandbox." #: 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 números 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 "" "

این ترفندها را در ذهن داشته باشید: