diff options
53 files changed, 468 insertions, 374 deletions
@@ -11,8 +11,8 @@ site/app/webroot/css/style.min.css site/app/webroot/js/__utm.min.js site/app/webroot/js/jquery.addons.min.js *.*~ - *.*# + .bash_profile .bashrc .gitconfig diff --git a/bin/build.py b/bin/build.py index b6ec82a..73d8851 100755 --- a/bin/build.py +++ b/bin/build.py @@ -1,5 +1,5 @@ #!/usr/bin/env python -"""Mozilla Add-ons build script +"""Sugar Labs build script If you update this script to touch a file in SVN you MUST update clean.sh to remove that file. On preview things are run in the following order: @@ -231,7 +231,8 @@ def main(argv = None): if not java: print "Usage: %s path_to_jre" % argv[0] sys.exit(1) - + +#TODO these are commented out unit we can fix them fo use with also updateRevisions() concatAndMinify() compilePo() diff --git a/bin/parse_logs/log_parser.class.php b/bin/parse_logs/log_parser.class.php index f64a9e0..b0845dd 100644 --- a/bin/parse_logs/log_parser.class.php +++ b/bin/parse_logs/log_parser.class.php @@ -111,7 +111,7 @@ class Log_Parser { */ function start() { echo "\n---------- [ BEGIN ACCESS LOG PARSING FOR {$this->geo}] ----------\n"; - exec("find {$this->logDir} -name \"access_{$this->date}*.gz\" -type f", $loglist); + exec("find {$this->logDir} -name \"access-{$this->date}*.gz\" -type f", $loglist); if (!empty($loglist)) { foreach ($loglist as $logfile) { diff --git a/site/app/config/config.php.default b/site/app/config/config.php.default index c9e83e7..52b1a24 100644 --- a/site/app/config/config.php.default +++ b/site/app/config/config.php.default @@ -60,6 +60,16 @@ // define('SITE_URL', ''); /** + * Secure Site URL + * Example: https://addons.mozilla.org + * Example: https://khan-vm.mozilla.org (dev) + * Example of getting a full controller url: + * echo SITE_URL.$html->url('/users/register'); + * Will default to https://addons.mozilla.org unless defined below + */ +// define('SITE_URL', ''); + +/** * Services URL. * Example: http://addons.mozilla.org/services * Example: http://khan-vm.mozilla.org/amo/services (dev) diff --git a/site/app/config/constants.php b/site/app/config/constants.php index c84d630..8db28d5 100644 --- a/site/app/config/constants.php +++ b/site/app/config/constants.php @@ -46,6 +46,13 @@ if (!defined('SITE_URL')) define('SITE_URL', 'http://addons.mozilla.org'); + +/** + * Secure Site URL default + */ +if (!defined('SSITE_URL')) + define('SSITE_URL', 'https://addons.mozilla.org'); + /** * Site State default */ diff --git a/site/app/controllers/admin_controller.php b/site/app/controllers/admin_controller.php index 938a965..bea1f6c 100644 --- a/site/app/controllers/admin_controller.php +++ b/site/app/controllers/admin_controller.php @@ -60,7 +60,7 @@ class AdminController extends AppController $this->Amo->clean($this->data, false); $this->layout = 'mozilla'; - $this->pageTitle = 'Mozilla Add-ons :: Admin Control Panel'; + $this->pageTitle = 'Sugar Labs Activites :: Admin Control Panel'; $this->cssAdd = array('admin', 'developers'); $this->set('cssAdd', $this->cssAdd); @@ -152,10 +152,11 @@ class AdminController extends AppController $this->set('last24', $last24); //Counts - $count['extensions'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_EXTENSION); - $count['themes'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_THEME); - $count['dictionaries'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_DICT); - $count['searchengines'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_SEARCH); + $count['activities'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_ACTIVITY); + //$count['extensions'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_EXTENSION); + //$count['themes'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_THEME); + //$count['dictionaries'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_DICT); + //$count['searchengines'] = $this->Addon->query("SELECT COUNT(*) FROM addons WHERE addontype_id=".ADDON_SEARCH); $now = time(); $count['activeSessions'] = $this->Addon->query("SELECT COUNT(*) FROM cake_sessions WHERE expires > {$now}"); $this->set('count', $count); diff --git a/site/app/controllers/components/editors.php b/site/app/controllers/components/editors.php index 6227974..4b9dd47 100644 --- a/site/app/controllers/components/editors.php +++ b/site/app/controllers/components/editors.php @@ -137,11 +137,11 @@ class EditorsComponent extends Object { if ($data['Approval']['ActionField'] != 'superreview') { $this->controller->Email->template = 'email/nominated/'.$data['Approval']['ActionField']; $this->controller->Email->to = $emailInfo['email']; - $this->controller->Email->subject = sprintf('Mozilla Add-ons: %s Nomination', $emailInfo['name']); + $this->controller->Email->subject = sprintf(_('Sugar Labs Activities: %s Nomination'), $emailInfo['name']); } else { $this->controller->Email->template = 'email/superreview'; - $this->controller->Email->to = 'amo-admins@mozilla.org'; + $this->controller->Email->to = ADMIN_EMAIL; //Doesn't need to be localized $this->controller->Email->subject = "Super-review requested: {$emailInfo['name']}"; } @@ -267,11 +267,15 @@ class EditorsComponent extends Object { if ($data['Approval']['ActionField'] != 'superreview') { $this->controller->Email->template = 'email/pending/'.$data['Approval']['ActionField']; $this->controller->Email->to = $emailInfo['email']; +<<<<<<< HEAD:site/app/controllers/components/editors.php + $this->controller->Email->subject = sprintf(_('Sugar Labs Activities: %s %s'), $emailInfo['name'], $emailInfo['version']); +======= $this->controller->Email->subject = sprintf('Mozilla Add-ons: %s %s', $emailInfo['name'], $emailInfo['version']); +>>>>>>> svn:site/app/controllers/components/editors.php } else { $this->controller->Email->template = 'email/superreview'; - $this->controller->Email->to = 'amo-admins@mozilla.org'; + $this->controller->Email->to = ADMIN_EMAIL; //Doesn't need to be localized $this->controller->Email->subject = "Super-review requested: {$emailInfo['name']}"; } diff --git a/site/app/controllers/components/search.php b/site/app/controllers/components/search.php index cea808c..6128380 100644 --- a/site/app/controllers/components/search.php +++ b/site/app/controllers/components/search.php @@ -229,7 +229,7 @@ class SearchComponent extends Object { if (in_array($searchtype, $app_listedtypes[APP_ID])) $_addon_types = $searchtype; else { - $_addon_types = array(ADDON_EXTENSION, ADDON_THEME, ADDON_SEARCH, ADDON_DICT, ADDON_LPAPP, ADDON_LPADDON); + $_addon_types = array(ADDON_EXTENSION, ADDON_THEME, ADDON_SEARCH, ADDON_DICT, ADDON_LPAPP, ADDON_LPADDON, ADDON_ACTIVITY); } } if (!is_array($_addon_types)) $_addon_types = array($_addon_types); diff --git a/site/app/controllers/developers_controller.php b/site/app/controllers/developers_controller.php index 29f3f9f..8ff0a4f 100644 --- a/site/app/controllers/developers_controller.php +++ b/site/app/controllers/developers_controller.php @@ -536,6 +536,14 @@ class DevelopersController extends AppController return $this->Error->getJSONforError(_('devcp_error_activity_info_not_found')); } + if (!isset($ini_file['name'])) { + return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_name')); + } + + if (!isset($ini_file['activity_version'])) { + return $this->Error->getJSONforError(_('devcp_error_activity_info_missing_activity_version')); + } + $addon['Addon']['name'] = $ini_file['name']; $addon['Addon']['summary'] = $ini_file['name']; $addon['Version']['version'] = $ini_file['activity_version']; diff --git a/site/app/locale/el/LC_MESSAGES/messages.po b/site/app/locale/el/LC_MESSAGES/messages.po index 8bb1f15..1bca9f6 100644 --- a/site/app/locale/el/LC_MESSAGES/messages.po +++ b/site/app/locale/el/LC_MESSAGES/messages.po @@ -6938,8 +6938,11 @@ msgstr "Συγχαρητήρια! Ο λογαριασμός χρήστη δημ #. %1 is the link to the "resend confirmation code" page #: views/users/activatefirst.thtml:51 #, php-format + msgid "user_register_resend_confirmation_link" +msgstr "Αν δε λάβατε το μήνυμα επιβεβαίωσης, σιγουρευτείτε πως η υπηρεσία ηλ. ταχυδρομείου που χρησιμοποιείτε δεν το σημείωσε ως «ανεπιθύμητο» ή «spam». Αν χρειάζεται, μπορούμε να κάνουμε %1$s στη διεύθυνση ηλ. ταχυδρομείου που αναφέρθηκε παραπάνω." + msgstr "" "Αν δε λάβατε το μήνυμα επιβεβαίωσης, σιγουρευτείτε πως η υπηρεσία ηλ. " "ταχυδρομείου που χρησιμοποιείτε δεν το σημείωσε ως «ανεπιθύμητο» ή «spam». Αν " @@ -6948,7 +6951,6 @@ msgstr "" msgstr "Αν δε λάβατε το μήνυμα επιβεβαίωσης, σιγουρευτείτε πως η υπηρεσία ηλ. ταχυδρομείου που χρησιμοποιείτε δεν το σημείωσε ως «ανεπιθύμητο» ή «spam». Αν χρειάζεται, μπορούμε να κάνουμε %1$s στη διεύθυνση ηλ. ταχυδρομείου που αναφέρθηκε παραπάνω." - # %1 is the link to the Mozilla Add-ons front page #. %1 is the link to the Mozilla Add-ons front page #: views/users/register_complete.thtml:52 diff --git a/site/app/locale/en_US/LC_MESSAGES/messages.po b/site/app/locale/en_US/LC_MESSAGES/messages.po index 6506f6a..6568de2 100644 --- a/site/app/locale/en_US/LC_MESSAGES/messages.po +++ b/site/app/locale/en_US/LC_MESSAGES/messages.po @@ -79,13 +79,13 @@ msgstr "total downloads" msgid "addon_downloads_weekly" msgstr "weekly downloads" -#. %1 is the add-on count, %2 the category name +# %1 is the activity count, %2 the category name #: views/addons/browse_thumbs.thtml:118 views/addons/browse.thtml:75 #, php-format msgid "addon_list_category_totalcount" msgid_plural "addon_list_category_totalcount" -msgstr[0] "%1$s add-on" -msgstr[1] "%1$s add-ons" +msgstr[0] "%1$s activity" +msgstr[1] "%1$s activities" #: views/elements/pagination.thtml:67 #: views/elements/addon_list_options.thtml:94 @@ -206,8 +206,8 @@ msgstr "Developer reply to:" #, php-format msgid "addon_review_others_by_user" msgid_plural "addon_review_others_by_user" -msgstr[0] "See %1$s previous review submitted by %2$s for this add-on." -msgstr[1] "See %1$s previous reviews submitted by %2$s for this add-on." +msgstr[0] "See %1$s previous review submitted by %2$s for this activity." +msgstr[1] "See %1$s previous reviews submitted by %2$s for this activity." #. %1 is the add-on name #: controllers/reviews_controller.php:201 @@ -249,13 +249,13 @@ msgstr "by %1$s on %2$s (rated %3$s)" #: views/addons/category_landing.thtml:139 views/addons/home.thtml:113 #: views/addons/home.thtml:114 msgid "addon_slider_tooltip_next" -msgstr "Next Add-on" +msgstr "Next Activity" #: views/addons/category_landing.thtml:128 #: views/addons/category_landing.thtml:129 views/addons/home.thtml:103 #: views/addons/home.thtml:104 msgid "addon_slider_tooltip_previous" -msgstr "Previous Add-on" +msgstr "Previous Activity" #: views/elements/addon_version_detail.thtml:52 msgid "addon_version_permalink" @@ -278,7 +278,7 @@ msgstr "View Author's Profile" #. %1 is the name of the Application (eg. Firefox) #: controllers/addons_controller.php:1080 msgid "addons_browse_all_themes_title" -msgstr "Browse all Themes :: %1$s Add-ons" +msgstr "Browse all Themes :: %1$s Activities" #. %s is the name of the category #: controllers/addons_controller.php:800 @@ -290,7 +290,7 @@ msgstr "Browse %s" #. %2 is the name of the Application (eg. Firefox) #: controllers/addons_controller.php:513 msgid "addons_browse_categories_header_theme" -msgstr "Browse %1$s Themes :: %2$s Add-ons" +msgstr "Browse %1$s Themes :: %2$s Activities" #: views/reviews/display.thtml:227 msgid "addons_display_add_review" @@ -319,7 +319,7 @@ msgstr "Edit your review" #: views/addons/display.thtml:167 msgid "addons_display_has_privacy" -msgstr "This add-on has a privacy policy." +msgstr "This activity has a privacy policy." #: views/addons/display.thtml:391 views/reviews/add.thtml:101 #: views/reviews/add.thtml:102 @@ -366,8 +366,8 @@ msgstr "More Images" #: views/addons/display.thtml:445 msgid "addons_display_other_addons_by" msgid_plural "addons_display_other_addons_by" -msgstr[0] "Other add-ons by %1$s" -msgstr[1] "Other add-ons by these authors" +msgstr[0] "Other activities by %1$s" +msgstr[1] "Other activities by these authors" #. %s is the name of the add-on and the add-on section. Example: #. Some Add-on :: Firefox Add-ons @@ -382,7 +382,7 @@ msgstr "%s" #: views/addons/display.thtml:279 #, php-format msgid "addons_display_paragraph_supportinfoemail" -msgstr "Support for this add-on is provided by the developer at %s" +msgstr "Support for this activity is provided by the developer at %s" #. %$1s is a URL #. %$2s is an email address @@ -390,14 +390,14 @@ msgstr "Support for this add-on is provided by the developer at %s" #, php-format msgid "addons_display_paragraph_supportinfoemailurl" msgstr "" -"Support for this add-on is provided by the developer at %1$s or by sending " +"Support for this activity is provided by the developer at %1$s or by sending " "an e-mail to %2$s" #. %s is a URL #: views/addons/display.thtml:271 #, php-format msgid "addons_display_paragraph_supportinfourl" -msgstr "Support for this add-on is provided by the developer at %s" +msgstr "Support for this activity is provided by the developer at %s" #: views/addons/display.thtml:389 msgid "addons_display_rate_it" @@ -412,7 +412,7 @@ msgstr "Really like it" msgid "addons_display_review_etiquette" msgstr "" "Please do not post bug reports in reviews. We do not make your email address " -"available to add-on developers and they may need to contact you to help " +"available to activity developers and they may need to contact you to help " "resolve your issue." #. %1 is the review guidelines link @@ -426,7 +426,7 @@ msgstr "<a href=\"%s\">Review Guidelines</a>" msgid "addons_display_review_see_support" msgstr "" "See the <a href=\"%1$s\">support section</a> to find out where to get " -"assistance for this add-on." +"assistance for this activity." #: views/addons/display.thtml:403 msgid "addons_display_review_submit" @@ -435,7 +435,7 @@ msgstr "Save" #: views/addons/display.thtml:439 #, php-format msgid "addons_display_see_all_addons" -msgstr "See All %1$s Add-ons" +msgstr "See All %1$s Activities" #. %1 is the number of reviews #: views/addons/display.thtml:326 @@ -488,7 +488,7 @@ msgstr "We Recommend" #, php-format msgid "addons_home_header_details" msgstr "" -"Add-ons extend %1$s, letting you personalize your browsing experience. Take " +"Activities extend %1$s, letting you personalize your learning experience. Take " "a look around and make %1$s your own." #: views/addons/home.thtml:201 @@ -533,7 +533,7 @@ msgstr "Other Applications" #: controllers/localizers_controller.php:72 #, php-format msgid "addons_home_pagetitle" -msgstr "%1$s Add-ons" +msgstr "%1$s Activities" #: views/addons/home.thtml:191 msgid "addons_home_popular_header" @@ -554,25 +554,25 @@ msgstr "View all" #: views/addons/home.thtml:209 msgid "addons_home_view_all_newest_title" -msgstr "View all newly created add-ons" +msgstr "View all newly created activities" #: views/addons/home.thtml:199 msgid "addons_home_view_all_popular_title" -msgstr "View all popular add-ons" +msgstr "View all popular activities" #: views/addons/home.thtml:189 msgid "addons_home_view_all_recommended_title" -msgstr "View all recommended add-ons" +msgstr "View all recommended activities" #: views/addons/home.thtml:219 msgid "addons_home_view_all_updated_title" -msgstr "View all recently updated add-ons" +msgstr "View all recently updated activities" #: views/elements/install.thtml:108 msgid "addons_install_in_sunbird" msgstr "" "<ol><li>Click the link below to save the file.</li><li>In Mozilla Sunbird, " -"open Add-ons from the Tools menu.</li><li>Click the Install button, and " +"open Activities from the Tools menu.</li><li>Click the Install button, and " "locate/select the file you downloaded and click \"OK\".</li></ol>" #: views/elements/install.thtml:107 @@ -584,7 +584,7 @@ msgid "addons_install_in_thunderbird" msgstr "" "<ol><li>Right-click the link below and choose \"Save Link As...\" to " "download and save the file to your hard disk.</li><li>In Mozilla " -"Thunderbird, open Add-ons from the Tools menu.</li><li>Click the Install " +"Thunderbird, open Activities from the Tools menu.</li><li>Click the Install " "button, and locate/select the file you downloaded and click \"OK\".</li></ol>" #: views/elements/install.thtml:101 @@ -593,7 +593,7 @@ msgstr "How to Install in Thunderbird" #: views/elements/addon_list_options.thtml:105 msgid "addons_options_show_experimental" -msgstr "show experimental add-ons" +msgstr "show experimental activities" #: views/elements/addon_list_options.thtml:109 msgid "addons_options_submit" @@ -672,17 +672,17 @@ msgstr "Previews for %s" #: views/addons/recommended.thtml:50 controllers/addons_controller.php:1147 msgid "addons_recommended_introduction" msgstr "" -"With so many great add-ons available, there's something for everyone. To get " +"With so many great activities available, there's something for everyone. To get " "you started, here's a list of some of the most popular. Enjoy!" #: controllers/addons_controller.php:1139 #: controllers/addons_controller.php:1146 msgid "addons_recommended_pagetitle" -msgstr "Recommended Add-ons" +msgstr "Recommended Activities" #: controllers/addons_controller.php:1142 msgid "addons_recommended_title" -msgstr "Recommended Add-ons" +msgstr "Recommended Activities" #: views/addons/searchengines.thtml:147 views/addons/searchengines.thtml:164 msgid "addons_searchengines_additional_resources" @@ -801,7 +801,7 @@ msgstr "Unknown" #: views/elements/fyf_promotion.thtml:50 views/elements/feature.thtml:94 msgid "addons_title_tooltip" -msgstr "Learn more about this add-on" +msgstr "Learn more about this activity" #: views/addons/versions.thtml:53 msgid "addons_versions_careful" @@ -811,7 +811,7 @@ msgstr "Be Careful With Old Versions" msgid "addons_versions_careful_introduction" msgstr "" "These versions are displayed for reference and testing purposes. You should " -"always use the latest version of an add-on." +"always use the latest version of an activity." #: views/addons/versions.thtml:50 controllers/addons_controller.php:1313 msgid "addons_versions_history" @@ -955,7 +955,7 @@ msgstr "Ignore version check" #: views/pages/js_constants.js.thtml:63 msgid "app_compat_older_firefox_only" -msgstr "This add-on is for older versions of Firefox" +msgstr "This activity is for older versions of Firefox" #. %1$s and %2$s are URLs #: views/pages/js_constants.js.thtml:65 @@ -974,32 +974,32 @@ msgstr "An <a href=\"%1$s\">older version</a> may work" #: views/pages/js_constants.js.thtml:64 msgid "app_compat_unreleased_version" msgstr "" -"This add-on requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>" +"This activity requires the not-yet released <a href=\"%1$s\">Firefox %2$s</a>" #: views/pages/js_constants.js.thtml:61 msgid "app_compat_update_firefox" msgstr "" -"<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this add-on" +"<a href=\"http://getfirefox.com\">Upgrade Firefox</a> to use this activity" #: controllers/addons_controller.php:796 msgid "browse_addons_name" -msgstr "Add-ons by Name" +msgstr "Activities by Name" #: controllers/addons_controller.php:794 msgid "browse_addons_newest" -msgstr "Newest Add-ons" +msgstr "Newest Activities" #: controllers/addons_controller.php:792 msgid "browse_addons_popular" -msgstr "Popular Add-ons" +msgstr "Popular Activities" #: controllers/addons_controller.php:795 msgid "browse_addons_rated" -msgstr "Add-ons by Rating" +msgstr "Activities by Rating" #: controllers/addons_controller.php:793 msgid "browse_addons_updated" -msgstr "Recently Updated Add-ons" +msgstr "Recently Updated Activities" #: views/elements/categories.thtml:73 views/elements/categories.thtml:82 msgid "categories_current_title" @@ -1015,7 +1015,7 @@ msgstr "Choose a category" #: views/addons/category_landing.thtml:68 msgid "category_extra_allrecommended" -msgstr "See All Recommended Add-ons" +msgstr "See All Recommended Activities" #: views/addons/category_landing.thtml:59 msgid "category_extra_highestrated" @@ -1048,7 +1048,7 @@ msgstr "Added %s" #: views/compatibility/dashboard.thtml:45 #: controllers/compatibility_controller.php:72 msgid "compatibility_dashboard_center_header" -msgstr "Add-on Compatibility Center" +msgstr "Activity Compatibility Center" #. %1$s is the name of an application and a version. Example: Firefox 3.0 #. %2$s is the name of an application. Example: Firefox @@ -1056,7 +1056,7 @@ msgstr "Add-on Compatibility Center" msgid "compatibility_dashboard_intro" msgstr "" "Be prepared for the release of %1$s with the tools and information available " -"for the %2$s Add-ons community found below." +"for the %2$s Activities community found below." #: views/compatibility/dashboard.thtml:107 msgid "compatibility_dashboard_loading" @@ -1068,13 +1068,13 @@ msgstr "Back to Main" #: views/compatibility/dashboard.thtml:104 views/compatibility/report.thtml:41 msgid "compatibility_dashboard_report" -msgstr "Add-on Compatibility Report" +msgstr "Activity Compatibility Report" #: views/compatibility/dashboard.thtml:49 #: views/compatibility/dashboard.thtml:114 #: views/compatibility/developers.thtml:41 msgid "compatibility_developer_info" -msgstr "Information for Add-on Developers" +msgstr "Information for Activity Developers" #: views/compatibility/developers.thtml:64 msgid "compatibility_developers_adjust_maxversion" @@ -1082,15 +1082,15 @@ msgstr "Adjust maxVersion without uploading" #: views/compatibility/dashboard.thtml:128 msgid "compatibility_developers_check_status" -msgstr "Check Status of My Add-ons" +msgstr "Check Status of My Activities" #. %1$s is a URL #. %2$s is an application and version. Example: Firefox 3.0 #: views/compatibility/dashboard.thtml:130 msgid "compatibility_developers_login_first" msgstr "" -"If you have add-ons hosted on Mozilla Add-ons, <a href=\"%1$s\">please " -"login</a> to analyze the status of your add-ons for %2$s." +"If you have activities hosted on Sugar Labs Activities, <a href=\"%1$s\">please " +"login</a> to analyze the status of your activities for %2$s." #: views/compatibility/dashboard.thtml:118 msgid "compatibility_developers_mdclogo_alt" @@ -1098,16 +1098,16 @@ msgstr "Mozilla Developer Center Logo" #: views/compatibility/developers.thtml:71 msgid "compatibility_developers_no_addons" -msgstr "You do not have any add-ons hosted on Mozilla Add-ons." +msgstr "You do not have any activities hosted on Sugar Labs Activities." #: views/compatibility/dashboard.thtml:137 #: views/compatibility/developers.thtml:53 msgid "compatibility_developers_results" -msgstr "Add-on Status Check Results" +msgstr "Activity Status Check Results" #: views/compatibility/dashboard.thtml:141 msgid "compatibility_developers_retrieving" -msgstr "Retrieving status of hosted add-ons..." +msgstr "Retrieving status of hosted activities..." #. %1$s is a number #. %2$s is an application name @@ -1120,7 +1120,7 @@ msgstr "%1$s %2$s users (%3$s% of total)" #: views/compatibility/report.thtml:43 msgid "compatibility_report_detail_intro" msgstr "" -"The add-ons below make up 95% of add-on usage known to Mozilla and are " +"The activities below make up 95% of activity usage known to Sugar Labs and are " "ordered by their usage size." #: views/compatibility/dashboard.thtml:98 @@ -1132,7 +1132,7 @@ msgstr "View Detailed Report" #: views/compatibility/dashboard.thtml:69 msgid "compatibility_report_intro" msgstr "" -"Of the %1$s add-ons that make up 95% of add-on usage known to Mozilla, " +"Of the %1$s activities that make up 95% of activity usage known to Sugar Labs, " "<b>%2$s%</b> are currently considered compatible with the latest builds " "of %3$s." @@ -1143,7 +1143,7 @@ msgstr "Alpha Versions" #. %1$s is an application name and version. Example: Firefox 3.1 #: views/compatibility/dashboard.thtml:85 msgid "compatibility_report_legend_alpha_description" -msgstr "Add-ons compatible with an alpha version of %1$s" +msgstr "Activities compatible with an alpha version of %1$s" #: views/compatibility/dashboard.thtml:89 msgid "compatibility_report_legend_beta" @@ -1152,7 +1152,7 @@ msgstr "Beta Versions" #. %1$s is an application name and version. Example: Firefox 3.1 #: views/compatibility/dashboard.thtml:89 msgid "compatibility_report_legend_beta_description" -msgstr "Add-ons compatible with a beta version or release candidate of %1$s" +msgstr "Activities compatible with a beta version or release candidate of %1$s" #: views/compatibility/dashboard.thtml:93 msgid "compatibility_report_legend_latest" @@ -1161,7 +1161,7 @@ msgstr "Latest Version" #. %1$s is an application name and version. Example: Firefox 3.1 #: views/compatibility/dashboard.thtml:93 msgid "compatibility_report_legend_latest_description" -msgstr "Add-ons up-to-date with the latest builds of %1$s" +msgstr "Activities up-to-date with the latest builds of %1$s" #: views/compatibility/dashboard.thtml:81 msgid "compatibility_report_legend_other" @@ -1170,16 +1170,16 @@ msgstr "Other Versions" #. %1$s is an application name and version. Example: Firefox 3.1 #: views/compatibility/dashboard.thtml:81 msgid "compatibility_report_legend_other_description" -msgstr "Add-ons not compatible with any version of %1$s" +msgstr "Activities not compatible with any version of %1$s" #: views/compatibility/dashboard.thtml:66 msgid "compatibility_report_title" -msgstr "Add-on Compatibility Report" +msgstr "Activity Compatibility Report" #: views/compatibility/dashboard.thtml:50 #: views/compatibility/dashboard.thtml:148 views/compatibility/users.thtml:40 msgid "compatibility_user_info" -msgstr "Information for Add-on Users" +msgstr "Information for Activity Users" #: views/compatibility/dashboard.thtml:48 msgid "compatibility_view_report" @@ -1198,7 +1198,7 @@ msgstr "wiki page" #: views/pages/credits.thtml:97 msgid "credits_intro" msgstr "" -"Mozilla would like to thank the following people for their contributions to " +"Sugar Labs would like to thank the following people for their contributions to " "the addons.mozilla.org project over the years:" #: views/pages/credits.thtml:101 @@ -1270,7 +1270,7 @@ msgstr "Detailed Info" #: views/elements/developers/actionbar.thtml:50 #: views/developers/dashboard.thtml:64 msgid "devcp_actionbar_link_edit" -msgstr "Edit Add-on" +msgstr "Edit Activity" #: views/elements/developers/actionbar.thtml:51 msgid "devcp_actionbar_link_newversion" @@ -1314,9 +1314,9 @@ msgstr "(auto-detect)" #, php-format msgid "devcp_additem_firefox_notice" msgstr "" -"This version of your add-on does not claim compatibility with Firefox %1$s. " +"This version of your activity does not claim compatibility with Firefox %1$s. " "Mozilla is expecting the next version of Firefox to be released soon, so " -"please test your add-on in the new version and update compatibility " +"please test your activity in the new version and update compatibility " "information. You can find out more about this <a href=\"%2$s\">here</a>. " "This is only a notice and you may continue to submit this version to addons." "mozilla.org." @@ -1327,7 +1327,7 @@ msgstr "Opens in a new window" #: views/elements/developers/additem.thtml:41 msgid "devcp_additem_sidebar_title" -msgstr "Submit Add-on" +msgstr "Submit Activity" #: views/elements/developers/additem.thtml:53 msgid "devcp_additem_step0_newlink" @@ -1339,7 +1339,7 @@ msgstr "Step 1: Upload" #: views/elements/developers/additem.thtml:47 msgid "devcp_additem_step2_link" -msgstr "Step 2: Add-on Details" +msgstr "Step 2: Activity Details" #: views/elements/developers/additem.thtml:48 msgid "devcp_additem_step3_link" @@ -1359,21 +1359,21 @@ msgstr "Submission Help" #: controllers/developers_controller.php:2746 msgid "devcp_addon_disabled_successfully" -msgstr "Add-on disabled successfully" +msgstr "Activity disabled successfully" #: controllers/developers_controller.php:2368 #: controllers/developers_controller.php:2369 msgid "devcp_addon_edit_pagetitle" -msgstr "Edit Add-on" +msgstr "Edit Activity" #: controllers/developers_controller.php:2741 msgid "devcp_addon_enabled_successfully" -msgstr "Add-on enabled successfully" +msgstr "Activity enabled successfully" #: controllers/developers_controller.php:2281 #: controllers/developers_controller.php:2569 msgid "devcp_addon_field_description_displaytitle" -msgstr "Add-on Description" +msgstr "Activity Description" #: controllers/developers_controller.php:2291 #: controllers/developers_controller.php:2579 @@ -1383,12 +1383,12 @@ msgstr "EULA" #: controllers/developers_controller.php:2261 #: controllers/developers_controller.php:2531 msgid "devcp_addon_field_homepage_displaytitle" -msgstr "Add-on Homepage" +msgstr "Activity Homepage" #: controllers/developers_controller.php:2254 #: controllers/developers_controller.php:2524 msgid "devcp_addon_field_name_displaytitle" -msgstr "Add-on Name" +msgstr "Activity Name" #: controllers/previews_controller.php:168 #: controllers/previews_controller.php:277 @@ -1403,7 +1403,7 @@ msgstr "Privacy Policy" #: controllers/developers_controller.php:2270 #: controllers/developers_controller.php:2558 msgid "devcp_addon_field_summary_displaytitle" -msgstr "Add-on Summary" +msgstr "Activity Summary" #: controllers/developers_controller.php:2540 msgid "devcp_addon_field_supportemail_displaytitle" @@ -1421,11 +1421,11 @@ msgstr "Version Notes" #: controllers/developers_controller.php:2768 #: controllers/developers_controller.php:2769 msgid "devcp_addon_nominate_pagetitle" -msgstr "Nominate Add-on" +msgstr "Nominate Activity" #: controllers/developers_controller.php:2814 msgid "devcp_addon_nominated_successfully" -msgstr "Add-on nominated successfully!" +msgstr "Activity nominated successfully!" #: views/developers/addon_status.thtml:178 msgid "devcp_addon_status_action_activate" @@ -1658,13 +1658,13 @@ msgstr "click here" #: views/developers/add_step5.thtml:76 msgid "devcp_addon_submission_makechanges_link" -msgstr "Edit Add-on" +msgstr "Edit Activity" #: views/developers/add_step5.thtml:57 msgid "devcp_addon_submission_pending" msgstr "" "This version has been placed in the sandbox while it awaits review from " -"sandbox testers and a SugarLabs Add-ons editor. You will be notified by e-mail " +"sandbox testers and a SugarLabs Activities editor. You will be notified by e-mail " "when action has been taken." #. %1 is the link to the sandbox information page @@ -1683,7 +1683,7 @@ msgstr "here" msgid "devcp_addon_submission_sandboxed" msgstr "" "This version has been placed in the sandbox for use by experienced users. In " -"order for it to be shown on the public site, you must %s your add-on and " +"order for it to be shown on the public site, you must %s your activity and " "undergo a review process." #: views/developers/add_step5.thtml:60 @@ -1692,28 +1692,28 @@ msgstr "nominate" #: views/developers/add_step5.thtml:51 msgid "devcp_addon_submission_success" -msgstr "Your add-on submission has been completed successfully." +msgstr "Your activity submission has been completed successfully." #: views/developers/add_step5.thtml:54 msgid "devcp_addon_submission_trusted_public" msgstr "" -"Because your add-on is trusted, this version has automatically been approved " +"Because your activity is trusted, this version has automatically been approved " "for the public area." #: controllers/developers_controller.php:1560 #: controllers/developers_controller.php:1561 msgid "devcp_addon_submit_pagetitle" -msgstr "Submit Add-on" +msgstr "Submit Activity" #: controllers/developers_controller.php:2460 msgid "devcp_addon_updated_successfully" -msgstr "Add-on updated successfully" +msgstr "Activity updated successfully" #. %1 is the link to the preview upload page #: views/developers/add_step5.thtml:71 #, php-format msgid "devcp_addon_upload_preview" -msgstr "You may wish to %s to increase interest in your add-on." +msgstr "You may wish to %s to increase interest in your activity." #: views/developers/add_step5.thtml:71 msgid "devcp_addon_upload_preview_link" @@ -1746,7 +1746,7 @@ msgstr "Next" #: views/developers/add_step2.thtml:66 msgid "devcp_change_addontype" -msgstr "Change add-on type:" +msgstr "Change activity type:" #: controllers/developers_controller.php:1487 msgid "devcp_comments_updated" @@ -1940,14 +1940,14 @@ msgstr "Yes, disable it" #: views/developers/disable.thtml:58 msgid "devcp_disable_disable_confirm" -msgstr "Are you sure you want to disable this add-on?" +msgstr "Are you sure you want to disable this activity?" #: views/developers/disable.thtml:56 msgid "devcp_disable_disable_description" msgstr "" -"Disabling this add-on will hide it from searches and listings. It will not " +"Disabling this activity will hide it from searches and listings. It will not " "be downloadable from the website and will not be returned in client update " -"checks. The add-on will effectively be deleted, although you will be able to " +"checks. The activity will effectively be deleted, although you will be able to " "return here and re-enable it at your convenience." #. %s is the name of an add-on @@ -1962,12 +1962,12 @@ msgstr "Yes, enable it" #: views/developers/disable.thtml:51 msgid "devcp_disable_enable_confirm" -msgstr "Are you sure you want to enable this add-on?" +msgstr "Are you sure you want to enable this activity?" #: views/developers/disable.thtml:49 msgid "devcp_disable_enable_description" msgstr "" -"Enabling this add-on will cause it to once again appear in searches and " +"Enabling this activity will cause it to once again appear in searches and " "listings. It will be downloadable both from the website and from client " "update checks." @@ -2260,7 +2260,7 @@ msgstr "Manage Add-on Properties" #: views/developers/edit.thtml:77 msgid "devcp_edit_error_categories_unavailable" -msgstr "No categories available for this add-on type." +msgstr "No categories available for this activity type." #: controllers/developers_controller.php:2419 msgid "devcp_edit_file_error_incomplete" @@ -2302,7 +2302,7 @@ msgstr "Default Locale" #: views/developers/addon_edit_properties.thtml:169 #: views/developers/edit.thtml:143 msgid "devcp_edit_label_externalsoftware" -msgstr "This add-on requires external software" +msgstr "This activity requires external software" #: views/developers/edit.thtml:110 msgid "devcp_edit_label_icon_delete" @@ -2329,7 +2329,7 @@ msgstr "This is a pre-release" #: views/developers/addon_edit_properties.thtml:168 #: views/developers/edit.thtml:139 msgid "devcp_edit_label_sitespecific" -msgstr "This is a site-specific add-on" +msgstr "This is a site-specific activity" #: views/developers/addon_edit_properties.thtml:201 #: views/developers/edit.thtml:119 @@ -2561,7 +2561,7 @@ msgstr "View Listing" #: views/elements/developers/editorsmenu.thtml:59 msgid "devcp_editorsqueue_featured" -msgstr "Featured Add-ons" +msgstr "Featured Activities" #. %1 is the review count #: views/elements/developers/editorsqueue.thtml:42 @@ -2578,8 +2578,8 @@ msgstr[1] "Moderated Reviews (%s)" #, php-format msgid "devcp_editorsqueue_nominated" msgid_plural "devcp_editorsqueue_nominated" -msgstr[0] "Nominated Add-ons (%s)" -msgstr[1] "Nominated Add-ons (%s)" +msgstr[0] "Nominated Activities (%s)" +msgstr[1] "Nominated Activities (%s)" #. %1 is the update count #: views/elements/developers/editorsqueue.thtml:43 @@ -2633,7 +2633,7 @@ msgstr "Update" #: controllers/previews_controller.php:211 #: controllers/previews_controller.php:312 msgid "devcp_error_addon_access_denied" -msgstr "You do not have access to that add-on." +msgstr "You do not have access to that activity." #. %s is a number #: views/developers/add_step2.thtml:126 @@ -2647,7 +2647,7 @@ msgstr "" #: controllers/developers_controller.php:1992 msgid "devcp_error_addonname_not_unique" msgstr "" -"The name for your add-on already exists in the database. Please make sure " +"The name for your activity already exists in the database. Please make sure " "that: <br /><li>Your GUIDs match. The most common cause for this error is " "mismatched GUIDs.</li><li>You do not have a duplicate entry in the database. " "If you do, you should update that entry or delete it and try again.</li>" @@ -2667,7 +2667,7 @@ msgstr "this page" #: controllers/developers_controller.php:2098 msgid "devcp_error_describe_changes" -msgstr "Please describe the changes made in this add-on update." +msgstr "Please describe the changes made in this activity update." #. %1$s is the name of the file #: controllers/components/developers.php:658 @@ -2683,8 +2683,13 @@ msgstr "" #, php-format msgid "devcp_error_file_extension" msgstr "" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +"That file extension (%s) is not allowed for the selected activity type. Please " +"use one of the following: %s" +======= "That file extension (%1$s) is not allowed for the selected add-on type. " "Please use one of the following: %2$s" +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: controllers/developers_controller.php:1739 msgid "devcp_error_file_guids_dont_match" @@ -2696,7 +2701,7 @@ msgstr "Please select no more than five categories." #: controllers/components/developers.php:526 msgid "devcp_error_guid_application" -msgstr "The ID of this add-on is already used by an application." +msgstr "The ID of this activity is already used by an application." #: controllers/components/developers.php:337 #: controllers/components/developers.php:389 @@ -2728,7 +2733,7 @@ msgstr "" #: controllers/developers_controller.php:1808 #, php-format msgid "devcp_error_identical_version_exists" -msgstr "An identical version (%s) already exists for this add-on and platform." +msgstr "An identical version (%s) already exists for this activity and platform." #: controllers/developers_controller.php:455 #: controllers/developers_controller.php:1749 @@ -2741,7 +2746,7 @@ msgstr "The following errors were found in install.rdf:" #: controllers/developers_controller.php:1692 msgid "devcp_error_invalid_addontype" -msgstr "Please select a valid add-on type." +msgstr "Please select a valid activity type." #. %$1s is a version. Example: 3.1.1 #. %$2s is an add-on name. @@ -2755,7 +2760,7 @@ msgstr "%1$s is not a valid version for %2$s" #: controllers/components/developers.php:521 #, php-format msgid "devcp_error_invalid_guid" -msgstr "The ID of this add-on is invalid: %s" +msgstr "The ID of this activity is invalid: %s" #. %$1s is a version. Example: 3.1.1 #. %$2s is an add-on name. @@ -2768,12 +2773,12 @@ msgstr "" #: controllers/components/developers.php:536 msgid "devcp_error_invalid_version" msgstr "" -"The version of this add-on is invalid: please see the <a href=\"http://" +"The version of this activity is invalid: please see the <a href=\"http://" "developer.mozilla.org/en/docs/Toolkit_version_format\">specification</a>" #: controllers/components/developers.php:531 msgid "devcp_error_invalid_version_spaces" -msgstr "The version of this add-on is invalid: versions cannot contain spaces." +msgstr "The version of this activity is invalid: versions cannot contain spaces." #. %s is an error message from the parser. #: controllers/components/developers.php:501 @@ -2798,11 +2803,11 @@ msgstr "An error occurred moving %s." #: controllers/components/developers.php:595 msgid "devcp_error_mozilla_application" -msgstr "You must have at least one valid Mozilla target application." +msgstr "You must have at least one valid Sugar Labs target application." #: controllers/components/developers.php:516 msgid "devcp_error_no_guid" -msgstr "No ID could be found for this add-on in install.rdf." +msgstr "No ID could be found for this activity in install.rdf." #: controllers/components/developers.php:287 msgid "devcp_error_no_platform" @@ -2814,11 +2819,11 @@ msgstr "You must supply the requested details for nomination." #: controllers/developers_controller.php:2797 msgid "devcp_error_nominate_no_prerelease" -msgstr "You cannot nominate a pre-release add-on." +msgstr "You cannot nominate a pre-release activity." #: controllers/developers_controller.php:2789 msgid "devcp_error_nominate_sandbox_only" -msgstr "You can only nominate add-ons currently in the sandbox." +msgstr "You can only nominate activities currently in the sandbox." #: controllers/components/developers.php:59 msgid "devcp_error_one_category" @@ -2826,7 +2831,7 @@ msgstr "Please select at least one category." #: controllers/components/developers.php:92 msgid "devcp_error_one_user" -msgstr "There must be at least one author for this add-on." +msgstr "There must be at least one author for this activity." #. %1$s is a file extension. Example: .exe #. %2$s is a comma separated list of extensions. Example: .xpi, .jar @@ -2845,18 +2850,18 @@ msgstr "An error occurred trying to save your data." #: controllers/developers_controller.php:1781 msgid "devcp_error_update_access_denied" -msgstr "You do not have permission to update this add-on." +msgstr "You do not have permission to update this activity." #: controllers/components/developers.php:511 msgid "devcp_error_updatekey" msgstr "" -"Add-ons cannot use an updateKey. Please remove this from install.rdf and try " +"Activities cannot use an updateKey. Please remove this from install.rdf and try " "again." #: controllers/components/developers.php:506 msgid "devcp_error_updateurl" msgstr "" -"Add-ons cannot use an external updateURL. Please remove this from install." +"Activities cannot use an external updateURL. Please remove this from install." "rdf and try again." #: controllers/developers_controller.php:416 @@ -2879,43 +2884,43 @@ msgstr "Remove" #: views/developers/add_step2.thtml:107 msgid "devcp_form_categories_nextstep" msgstr "" -"Categories for your new add-on type will be available in the next step." +"Categories for your new activity type will be available in the next step." #: views/developers/add_step2.thtml:105 msgid "devcp_form_error_categories_unavailable" -msgstr "No categories available for this add-on type." +msgstr "No categories available for this activity type." #: views/developers/add_step2.thtml:132 msgid "devcp_form_error_description_notempty" -msgstr "Please enter a description of your add-on." +msgstr "Please enter a description of your activity." #: views/developers/add_step2.thtml:76 msgid "devcp_form_error_name_required" -msgstr "Please enter the name of your add-on." +msgstr "Please enter the name of your activity." #: views/developers/add_step1.thtml:63 msgid "devcp_form_error_select_addontype" -msgstr "Please select the type of add-on you are submitting." +msgstr "Please select the type of activity you are submitting." #: views/developers/add_step2.thtml:127 msgid "devcp_form_error_summary_notempty" -msgstr "Please enter a summary of your add-on." +msgstr "Please enter a summary of your activity." #: views/developers/add_step1.thtml:72 msgid "devcp_form_label_addonfile" -msgstr "Add-on File" +msgstr "Activity File" #: views/developers/add_step1.thtml:80 msgid "devcp_form_label_addonfile2" -msgstr "Add-on File 2" +msgstr "Activity File 2" #: views/developers/add_step1.thtml:89 msgid "devcp_form_label_addonfile3" -msgstr "Add-on File 3" +msgstr "Activity File 3" #: views/developers/add_step1.thtml:59 msgid "devcp_form_label_addontype" -msgstr "Add-on Type" +msgstr "Activity Type" #: views/developers/add_step2.thtml:145 msgid "devcp_form_label_allow_viewsource" @@ -2947,7 +2952,7 @@ msgstr "End-User License Agreement (EULA)" #: views/developers/add_step2.thtml:157 msgid "devcp_form_label_externalsoftware" -msgstr "This add-on requires external software" +msgstr "This activity requires external software" #: views/developers/add_step3.thtml:70 msgid "devcp_form_label_files" @@ -2980,7 +2985,7 @@ msgstr "Privacy Policy" #: views/developers/add_step2.thtml:153 msgid "devcp_form_label_sitespecific" -msgstr "This is a site-specific add-on" +msgstr "This is a site-specific activity" #: views/developers/add_step2.thtml:125 msgid "devcp_form_label_summary" @@ -3017,7 +3022,7 @@ msgstr "Notes to Reviewer" #: views/developers/add_step3.thtml:114 msgid "devcp_form_trustedaddon_destination" msgstr "" -"Because your add-on is trusted, please choose where this version should go:" +"Because your activity is trusted, please choose where this version should go:" #: views/developers/add_step3.thtml:119 msgid "devcp_form_trustedaddon_destination_public" @@ -3046,7 +3051,7 @@ msgstr "Step 2" #: views/developers/add_step2.thtml:43 msgid "devcp_header_step2_addondetails" -msgstr "Add-on Details" +msgstr "Activity Details" #: views/developers/add_step3.thtml:43 msgid "devcp_header_step3" @@ -3074,7 +3079,7 @@ msgstr "Success" #: views/developers/index.thtml:48 msgid "devcp_index_header_myaddons" -msgstr "My Add-ons" +msgstr "My Activities" #: views/pages/js_constants.js.thtml:79 msgid "devcp_js_a_cancel" @@ -3139,7 +3144,7 @@ msgstr "Localized Fields" msgid "devcp_localebox_intro" msgstr "" "Some of the fields on this page are localized to appear in the end-user's " -"native language. Select a locale below to edit your add-on's details in that " +"native language. Select a locale below to edit your activity's details in that " "language. If a translation for a locale is not available, it will fall back " "to the selected default locale (%s)." @@ -3155,7 +3160,7 @@ msgstr "Editor Tools" #: views/elements/developers/myaddons.thtml:52 msgid "devcp_myaddons_link" -msgstr "My Add-ons" +msgstr "My Activities" #: views/elements/developers/sidebar.thtml:70 #: views/elements/developers/myaddons.thtml:70 @@ -3170,7 +3175,7 @@ msgstr "Statistics Dashboard" #: views/elements/developers/sidebar.thtml:62 #: views/elements/developers/myaddons.thtml:62 msgid "devcp_myaddons_submitaddon_link" -msgstr "Submit Add-on" +msgstr "Submit Activity" #: views/elements/developers/sidebar.thtml:48 #: views/elements/developers/myaddons.thtml:48 @@ -3191,7 +3196,7 @@ msgstr "Cancel and return" #: views/developers/nominate.thtml:53 msgid "devcp_nominate_link_returnto_details" -msgstr "Return to add-on details" +msgstr "Return to activity details" #. %1 is the add-on name #: views/developers/addon_status_nominate.thtml:61 @@ -3204,7 +3209,7 @@ msgstr "Nominate %s" #: views/developers/add_step2.thtml:63 #, php-format msgid "devcp_notice_autodetected_addontype" -msgstr "Automatically detected add-on type: %s." +msgstr "Automatically detected activity type: %s." #: views/developers/addon_edit_properties.thtml:49 #: views/developers/addon_status.thtml:49 @@ -3239,7 +3244,7 @@ msgstr "" #, php-format msgid "devcp_notice_different_defaultlocale" msgstr "" -"The default locale of this add-on (%1$s [%2$s]) is different from your " +"The default locale of this activity (%1$s [%2$s]) is different from your " "currently selected locale (%3$s [%4$s]). The fields below should be " "completed in %1$s." @@ -3333,7 +3338,7 @@ msgstr "" #: views/previews/add.thtml:45 msgid "devcp_previews_filetype_info" msgstr "" -"Use the form below to upload a PNG, JPG, or GIF screenshot of your add-on. " +"Use the form below to upload a PNG, JPG, or GIF screenshot of your activity. " "Images larger than 700 pixels wide and 525 pixels high will automatically be " "resized." @@ -3442,7 +3447,7 @@ msgstr "Dashboard" #: views/developers/add_step1.thtml:123 msgid "devcp_skip_reviewing_addon_info" -msgstr "Skip updating my current add-on information" +msgstr "Skip updating my current activity information" #. %s is a number #: views/elements/developers/statsbar.thtml:45 @@ -3537,7 +3542,7 @@ msgstr "Add-on Nomination" #: controllers/developers_controller.php:1566 msgid "devcp_submissions_disabled" msgstr "" -"Add-on submissions are currently disabled. Please check back at a later time." +"Activity submissions are currently disabled. Please check back at a later time." #: views/developers/addon_submit_choose.thtml:61 #: views/developers/addon_submit_choose.thtml:80 @@ -3553,7 +3558,7 @@ msgstr "I Decline" #: views/developers/index.thtml:91 msgid "devcp_summary_admin_disabled" -msgstr "This add-on has been disabled by an administrator." +msgstr "This activity has been disabled by an administrator." #: views/developers/index.thtml:75 msgid "devcp_summary_header_disabled" @@ -3571,7 +3576,7 @@ msgstr "Latest Version:" #: views/developers/index.thtml:101 #, php-format msgid "devcp_summary_noaddons_submit_one" -msgstr "You don't have any add-ons. Click %s to submit one." +msgstr "You don't have any activities. Click %s to submit one." #: views/developers/index.thtml:102 msgid "devcp_summary_noaddons_submit_one_link" @@ -4116,7 +4121,7 @@ msgstr "Version" #: controllers/downloads_controller.php:90 msgid "downloads_disable_warning" -msgstr "This add-on is disabled" +msgstr "This activity is disabled" #: controllers/components/editors.php:57 msgid "editor_review_error_addon_not_nominated" @@ -4192,7 +4197,7 @@ msgstr "Action" #: views/editors/reviewlog.thtml:56 msgid "editorcp_reviewlog_column_addon" -msgstr "Add-on" +msgstr "Activity" #: views/editors/reviewlog.thtml:55 msgid "editorcp_reviewlog_column_date" @@ -4247,7 +4252,7 @@ msgstr "Total Reviews" #: controllers/editors_controller.php:372 #: controllers/editors_controller.php:373 msgid "editors_addon_review_pagetitle" -msgstr "Review Add-on" +msgstr "Review Activity" #: controllers/editors_controller.php:471 msgid "editors_error_js-formerror" @@ -4307,7 +4312,7 @@ msgstr "Successfully removed feature." #: controllers/editors_controller.php:758 #: controllers/editors_controller.php:760 msgid "editors_featured_addons_pagetitle" -msgstr "Featured Add-ons" +msgstr "Featured Activities" #: views/editors/featured.thtml:54 views/editors/featured.thtml:107 msgid "editors_featured_edit_feature_submit" @@ -4331,7 +4336,7 @@ msgstr "Editors' Guide" #: views/editors/queue.thtml:113 msgid "editors_link_policy" -msgstr "Add-on Policy" +msgstr "Activity Policy" #: views/editors/queue.thtml:49 msgid "editors_notice_filter_session" @@ -4340,7 +4345,7 @@ msgstr "These filters will remain in place for this session or until cleared." #. %1 is the queue mode #: views/editors/queue.thtml:108 views/admin/flagged_queue.thtml:75 msgid "editors_notice_none_found" -msgstr "There are currently no add-ons of this type to review." +msgstr "There are currently no activities of this type to review." #: controllers/editors_controller.php:261 msgid "editors_one_day" @@ -4423,30 +4428,30 @@ msgstr "" #: views/editors/review.thtml:168 msgid "editors_review_details_nominated_public" msgstr "" -"This will mark the add-on and its most recent version and files as public. " +"This will mark the activity and its most recent version and files as public. " "Future versions will go into the sandbox until they are reviewed by an " "editor." #: views/editors/review.thtml:171 msgid "editors_review_details_nominated_sandbox" -msgstr "This will retain the add-on in the sandbox." +msgstr "This will retain the activity in the sandbox." #: views/editors/review.thtml:160 msgid "editors_review_details_pending_public" msgstr "" -"This will approve a sandboxed version of a public add-on to appear on the " +"This will approve a sandboxed version of a public activity to appear on the " "public side." #: views/editors/review.thtml:163 msgid "editors_review_details_pending_sandbox" msgstr "" -"This will cause a sandboxed version of a public add-on to remain in the " +"This will cause a sandboxed version of a public activity to remain in the " "sandbox." #: views/editors/review.thtml:181 msgid "editors_review_details_superreview" msgstr "" -"If you have concerns about this add-on's security, copyright issues, or " +"If you have concerns about this activity's security, copyright issues, or " "other concerns that an administrator should look into, enter your comments " "in the area below. They will be sent to administrators, not the author." @@ -4608,7 +4613,11 @@ msgstr "« prev" msgid "editors_review_queue_pagetitle" msgstr "Review Queue" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# %1 is the activities rank in the queue, %2 is the total queue length +======= #. %1 is the add-ons rank in the queue, %2 is the total queue length +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: views/editors/review.thtml:43 msgid "editors_review_rank_in_queue" msgstr "<strong># %1$s</strong> of %2$s in queue" @@ -4706,7 +4715,7 @@ msgstr "Additional Information" #: views/editors/featured.thtml:63 views/editors/queue.thtml:73 #: views/admin/flagged_queue.thtml:53 msgid "editors_th_addon" -msgstr "Add-on" +msgstr "Activity" #: views/editors/queue.thtml:74 msgid "editors_th_addontype" @@ -4714,7 +4723,7 @@ msgstr "Type" #: views/editors/queue.thtml:54 msgid "editors_th_addontypes" -msgstr "Add-on Types" +msgstr "Activity Types" #: views/editors/queue.thtml:81 msgid "editors_th_age" @@ -4793,23 +4802,23 @@ msgstr "You are not authorized to view this page." #: controllers/addons_controller.php:1242 #: controllers/editors_controller.php:389 msgid "error_addon_notfound" -msgstr "Add-on not found!" +msgstr "Activity not found!" #: controllers/files_controller.php:83 controllers/files_controller.php:196 msgid "error_addon_notviewable" -msgstr "This add-on is not viewable here." +msgstr "This activity is not viewable here." #: controllers/reviews_controller.php:246 msgid "error_addon_selfreview" -msgstr "You cannot review your own add-on." +msgstr "You cannot review your own activity." #: controllers/addons_controller.php:753 msgid "error_browse_no_addons" -msgstr "No add-ons in this category!" +msgstr "No activities in this category!" #: controllers/api_controller.php:424 msgid "error_collection_feed_notfound" -msgstr "Add-on feed not found." +msgstr "Activity feed not found." #: views/users/register.thtml:60 views/users/edit.thtml:176 #: views/developers/add_step2.thtml:117 controllers/api_controller.php:907 @@ -4954,7 +4963,11 @@ msgstr "Wrong password entered!" msgid "feature_learnmore" msgstr "Learn more" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# %1 is the activity name +======= #. %1 is the add-on name +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: views/elements/feature.thtml:130 #, php-format msgid "feature_learnmore_about_addon" @@ -5071,7 +5084,11 @@ msgstr "Save" msgid "general_addontype_dict" msgstr "Dictionary" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# Plural in this context means many of the activity type +======= #. Plural in this context means many of the add-on type +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: models/addontype.php:110 msgid "general_addontype_dict_plural" msgstr "Dictionaries" @@ -5080,25 +5097,37 @@ msgstr "Dictionaries" msgid "general_addontype_extension" msgstr "Extension" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# Plural in this context means many of the activity type +======= #. Plural in this context means many of the add-on type +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: models/addontype.php:108 msgid "general_addontype_extension_plural" msgstr "Extensions" #: models/addontype.php:95 msgid "general_addontype_lpaddon" -msgstr "Language Pack (Add-on)" +msgstr "Language Pack (Activity)" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# Plural in this context means many of the activity type +======= #. Plural in this context means many of the add-on type +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: models/addontype.php:113 msgid "general_addontype_lpaddon_plural" -msgstr "Language Packs (Add-on)" +msgstr "Language Packs (Activity)" #: models/addontype.php:93 msgid "general_addontype_lpapp" msgstr "Language Pack (Application)" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# Plural in this context means many of the activity type +======= #. Plural in this context means many of the add-on type +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: models/addontype.php:112 msgid "general_addontype_lpapp_plural" msgstr "Language Packs (Application)" @@ -5107,7 +5136,11 @@ msgstr "Language Packs (Application)" msgid "general_addontype_plugin" msgstr "Plugin" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# Plural in this context means many of the activity type +======= #. Plural in this context means many of the add-on type +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: models/addontype.php:114 msgid "general_addontype_plugin_plural" msgstr "Plugins" @@ -5116,7 +5149,11 @@ msgstr "Plugins" msgid "general_addontype_search" msgstr "Search Engine" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# Plural in this context means many of the activity type +======= #. Plural in this context means many of the add-on type +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: models/addontype.php:111 msgid "general_addontype_search_plural" msgstr "Search Engines" @@ -5125,7 +5162,11 @@ msgstr "Search Engines" msgid "general_addontype_theme" msgstr "Theme" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# Plural in this context means many of the activity type +======= #. Plural in this context means many of the add-on type +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: models/addontype.php:109 msgid "general_addontype_theme_plural" msgstr "Themes" @@ -5134,31 +5175,35 @@ msgstr "Themes" #: views/elements/header.thtml:111 views/elements/header.thtml:122 #, php-format msgid "header_home_tooltip" -msgstr "Return to the %1$s Add-ons homepage" +msgstr "Return to the %1$s Activities homepage" #: views/elements/header.thtml:87 msgid "header_main_firefox_header" -msgstr "Firefox Add-ons" +msgstr "Firefox Activities" #: views/elements/header.thtml:99 msgid "header_main_header" -msgstr "Add-ons" +msgstr "Activities" #: views/elements/header.thtml:90 msgid "header_main_seamonkey_header" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +msgstr "Seamonkey Activities" +======= msgstr "SeaMonkey Add-ons" +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: views/elements/header.thtml:93 msgid "header_main_sunbird_header" -msgstr "Sunbird Add-ons" +msgstr "Sunbird Activities" #: views/elements/header.thtml:96 msgid "header_main_thunderbird_header" -msgstr "Thunderbird Add-ons" +msgstr "Thunderbird Activities" #: views/elements/header.thtml:62 msgid "header_navlink_addons" -msgstr "Add-ons" +msgstr "Activities" #: views/elements/developers/sidebar.thtml:72 #: views/elements/developers/myaddons.thtml:72 views/elements/header.thtml:159 @@ -5193,7 +5238,7 @@ msgstr "Preview Image of %s" #: views/elements/install.thtml:229 msgid "install_a_login_to_install" msgstr "" -"<a href=\"%1$s\">Log in</a> to install this experimental add-on. <a href=\"%2" +"<a href=\"%1$s\">Log in</a> to install this experimental activity. <a href=\"%2" "$s\">Why</a>?" #. %1$s is the application name. Example: Firefox @@ -5203,7 +5248,11 @@ msgstr "" msgid "install_button_text" msgstr "Add to %1$s %2$s" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# %1 is the activity name, %2 is the app name +======= #. %1 is the add-on name, %2 is the app name +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: views/elements/install.thtml:146 views/elements/install.thtml:164 #: views/elements/install.thtml:197 views/elements/install.thtml:220 #, php-format @@ -5218,7 +5267,7 @@ msgstr "Download %1$s" #: views/elements/install.thtml:90 msgid "install_error_addon_not_found" -msgstr "This add-on is not available." +msgstr "This activity is not available." #: views/addons/dictionaries.thtml:61 msgid "langtools_a11y_tablesummary" @@ -5273,7 +5322,7 @@ msgstr "Downloads" #: views/elements/addon_list_options.thtml:45 msgid "list_sortby_name" -msgstr "Add-on Name" +msgstr "Activity Name" #: views/elements/addon_list_options.thtml:48 msgid "list_sortby_rating" @@ -5316,7 +5365,7 @@ msgstr "Themes" #: views/elements/app_chooser.thtml:47 msgid "other_apps_tooltip" -msgstr "Find add-ons for other applications" +msgstr "Find activities for other applications" #. In a user list: user 1, user 2, "others" #: views/helpers/addons_html.php:214 @@ -5331,7 +5380,15 @@ msgstr "Application Versions" msgid "page_title_credits" msgstr "Credits" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +#: controllers/pages_controller.php:94 +msgid "page_title_experimental_addons" +msgstr "Experimental Activities" + +#: controllers/pages_controller.php:113 +======= #: controllers/pages_controller.php:111 +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po msgid "page_title_faq" msgstr "Frequently Asked Questions" @@ -5341,7 +5398,7 @@ msgstr "Fashion your Firefox FAQ" #: controllers/pages_controller.php:101 msgid "page_title_policy" -msgstr "Add-ons Policy" +msgstr "Activities Policy" #: controllers/pages_controller.php:103 msgid "page_title_privacy" @@ -5370,7 +5427,7 @@ msgstr "Valid Application Versions" #: views/pages/appversions.thtml:79 msgid "pages_appversions_intro" msgstr "" -"Add-ons submitted to Mozilla Add-ons must have an install.rdf file with at " +"Activities submitted to Sugar Labs Activities must have an install.rdf file with at " "least one of the below applications supported. Only the versions listed " "below are allowed for these applications." @@ -5492,17 +5549,17 @@ msgstr "" msgid "review_guidelines_short" msgstr "" "<p>Keep these tips in mind:</p><ul><li>Write like you're telling a friend " -"about your experience with the add-on. Give specifics and helpful details, " +"about your experience with the activity. Give specifics and helpful details, " "such as what features you liked and/or disliked, how easy to use it is, and " "any disadvantages it has. Avoid generic language such as calling it \"Great" "\" or \"Bad\" unless you can give reasons why you believe this is so.</" "li><li>Please do not post bug reports in reviews. We do not make your email " -"address available to add-on developers and they may need to contact you to " +"address available to activity developers and they may need to contact you to " "help resolve your issue. See the <a href=\"%1$s\">support section</a> to " -"find out where to get assistance for this add-on.</li><li>Please keep " +"find out where to get assistance for this activity.</li><li>Please keep " "reviews clean, avoid the use of improper language and do not post any " "personal information.</li></ul><p>Please read the <a href=\"%2$s\">Review " -"Guidelines</a> for more detail about user add-on reviews.</p>" +"Guidelines</a> for more detail about user activity reviews.</p>" #. %1 is the add-on name #: views/reviews/flag.thtml:54 views/reviews/display.thtml:54 @@ -5513,15 +5570,15 @@ msgstr "Reviews for %s" #: controllers/addons_controller.php:390 msgid "rss_featuredaddons" -msgstr "Featured Add-ons" +msgstr "Featured Activities" #: controllers/addons_controller.php:388 msgid "rss_newestaddons" -msgstr "Newest Add-ons" +msgstr "Newest Activities" #: controllers/addons_controller.php:389 msgid "rss_updatedaddons" -msgstr "Updated Add-ons" +msgstr "Updated Activities" #: controllers/search_controller.php:99 msgid "search_disabled" @@ -5529,16 +5586,16 @@ msgstr "Search is currently disabled. Please try again later." #: views/elements/search.thtml:186 msgid "search_form_all_addons" -msgstr "all add-ons" +msgstr "all activities" #: views/elements/search.thtml:170 views/elements/search.thtml:182 #: views/layouts/mozilla.thtml:188 msgid "search_form_default_text" -msgstr "search for add-ons" +msgstr "search for activities" #: views/elements/search.thtml:201 msgid "search_form_submit_tooltip" -msgstr "Search for add-ons" +msgstr "Search for activities" #: views/elements/search.thtml:182 msgid "search_form_tooltip" @@ -5561,8 +5618,8 @@ msgstr "Browse Search Engines" #, php-format msgid "search_matching_addons_number" msgid_plural "search_matching_addons_number" -msgstr[0] "%s matching add-on" -msgstr[1] "%s matching add-ons" +msgstr[0] "%s matching activity" +msgstr[1] "%s matching activities" #: views/search/index.thtml:49 msgid "search_nothing_found" @@ -5570,7 +5627,7 @@ msgstr "No results found." #: controllers/search_controller.php:178 msgid "search_pagetitle" -msgstr "Search Add-ons" +msgstr "Search Activities" #: controllers/search_controller.php:235 msgid "search_rss_description" @@ -5610,7 +5667,7 @@ msgstr "Dictionary" #: views/elements/pitch.thtml:73 msgid "sidebar_pitch_featured_addons" -msgstr "Featured Add-ons" +msgstr "Featured Activities" #: views/elements/pitch.thtml:61 msgid "sidebar_pitch_looking_for" @@ -5618,7 +5675,7 @@ msgstr "I am looking for a:" #: views/elements/pitch.thtml:71 msgid "sidebar_pitch_newest_addons" -msgstr "Newest Add-ons" +msgstr "Newest Activities" #: views/elements/pitch.thtml:49 msgid "sidebar_pitch_search" @@ -5634,7 +5691,7 @@ msgstr "Theme" #: views/elements/pitch.thtml:72 msgid "sidebar_pitch_updated_addons" -msgstr "Updated Add-ons" +msgstr "Updated Activities" #. %1$s is a number #: views/helpers/localization.php:65 views/developers/editversion.thtml:58 @@ -5648,7 +5705,11 @@ msgstr "%1$s KB" msgid "stars_not_yet_rated" msgstr "Not yet rated" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# %1 is the number of stars this activity has +======= #. %1 is the number of stars this add-on has +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: views/elements/stars.thtml:54 #, php-format msgid "stars_rated_x_outof_5" @@ -5664,7 +5725,7 @@ msgstr "Developer Tools" #: views/statistics/addon.thtml:53 msgid "statistics_addon_switch" -msgstr "Switch Add-on" +msgstr "Switch Activity" #. This is a date format. #. http://php.net/strftime @@ -5707,23 +5768,23 @@ msgstr "Help" #: views/statistics/index.thtml:57 msgid "statistics_index_anotheraddon" -msgstr "or, select another add-on" +msgstr "or, select another activity" #: views/statistics/index.thtml:59 msgid "statistics_index_anotheraddon_public" -msgstr "or, select an add-on with public statistics" +msgstr "or, select an activity with public statistics" #: views/statistics/index.thtml:45 msgid "statistics_index_myaddons" -msgstr "Select one of your add-ons to view its statistics" +msgstr "Select one of your activities to view its statistics" #: views/statistics/index.thtml:63 msgid "statistics_index_selectaddon" -msgstr "Select an add-on to view its statistics" +msgstr "Select an activity to view its statistics" #: views/statistics/index.thtml:65 msgid "statistics_index_selectaddon_public" -msgstr "Select an add-on with public statistics" +msgstr "Select an activity with public statistics" #: views/statistics/index.thtml:43 msgid "statistics_index_title" @@ -5803,7 +5864,7 @@ msgstr "Show %s Events" #: controllers/statistics_controller.php:245 msgid "statistics_js_plotselection_options_events_addon_tooltip" -msgstr "Overlay add-on release dates on the plots" +msgstr "Overlay activity release dates on the plots" #: controllers/statistics_controller.php:240 msgid "statistics_js_plotselection_options_events_firefox_name_checked" @@ -5851,7 +5912,7 @@ msgstr "Operating System" #: controllers/statistics_controller.php:233 msgid "statistics_js_plotselection_selector_status" -msgstr "Add-on Status" +msgstr "Activity Status" #: controllers/statistics_controller.php:228 msgid "statistics_js_plotselection_selector_summary" @@ -5859,7 +5920,7 @@ msgstr "Summary" #: controllers/statistics_controller.php:231 msgid "statistics_js_plotselection_selector_version" -msgstr "Add-on Version" +msgstr "Activity Version" #: controllers/components/stats.php:396 msgid "statistics_longnames_application" @@ -5871,7 +5932,7 @@ msgstr "Operating System" #: controllers/components/stats.php:397 msgid "statistics_longnames_status" -msgstr "Add-on Status" +msgstr "Activity Status" #: controllers/components/stats.php:399 msgid "statistics_longnames_unknown" @@ -5879,7 +5940,7 @@ msgstr "Unknown" #: controllers/components/stats.php:395 msgid "statistics_longnames_version" -msgstr "Add-on Version" +msgstr "Activity Version" #: views/statistics/addon.thtml:118 msgid "statistics_notice_data_insufficient" @@ -5889,12 +5950,12 @@ msgstr "" #: views/statistics/addon.thtml:130 msgid "statistics_notice_data_none" msgstr "" -"We don't have any data for your add-on yet. Please check back in a few days." +"We don't have any data for your activity yet. Please check back in a few days." #: views/statistics/addon.thtml:41 msgid "statistics_notice_data_updating" msgstr "" -"Add-on statistics are currently in the process of being updated. Recent data " +"Activity statistics are currently in the process of being updated. Recent data " "may be incomplete as our scripts work to update this information. Please " "check back in a few minutes." @@ -5963,9 +6024,9 @@ msgstr "Statistics for %1$s" #: views/statistics/settings.thtml:46 msgid "statistics_settings_access_description" msgstr "" -"By default, only you and Mozilla can access the information in your " +"By default, only you and Sugar Labs can access the information in your " "dashboard. You can open this up to the public so that anyone can view your " -"add-on's data." +"activity's data." #: views/statistics/settings.thtml:45 msgid "statistics_settings_access_heading" @@ -5977,7 +6038,7 @@ msgstr "Private" #: views/statistics/settings.thtml:48 msgid "statistics_settings_access_private_description" -msgstr "Only you and Mozilla can view this add-on's statistics" +msgstr "Only you and Sugar Labs can view this activity's statistics" #: views/statistics/settings.thtml:49 msgid "statistics_settings_access_public" @@ -5985,7 +6046,7 @@ msgstr "Public" #: views/statistics/settings.thtml:49 msgid "statistics_settings_access_public_description" -msgstr "Anyone can view this add-on's statistics" +msgstr "Anyone can view this activity's statistics" #: views/statistics/addon.thtml:253 msgid "statistics_settings_change_link" @@ -6136,7 +6197,7 @@ msgstr "" #: views/users/delete.thtml:95 msgid "user_del_community_sad" -msgstr "The SugarLabs Add-ons community is sad to see you go." +msgstr "The SugarLabs Activities community is sad to see you go." #: views/users/delete.thtml:116 msgid "user_del_confirm_password" @@ -6151,9 +6212,9 @@ msgstr "Delete my user account now" msgid "user_del_error_addons" msgstr "" "You cannot delete your account if you are listed as an <a href=\"%1$s" -"\">author of any add-ons</a>. To delete your account, please have another " +"\">author of any activities</a>. To delete your account, please have another " "person in your development group delete you from the list of authors for " -"your add-ons. Afterwards you will be able to delete your account here." +"your activities. Afterwards you will be able to delete your account here." #. %1 is a link to the amo-editors mailing list #: views/users/delete.thtml:69 @@ -6192,7 +6253,7 @@ msgstr "Farewell!" #: views/users/delete.thtml:108 msgid "user_del_nologin" -msgstr "You will not be able to log into SugarLabs Add-ons anymore." +msgstr "You will not be able to log into SugarLabs Activities anymore." #: views/users/delete.thtml:105 msgid "user_del_permanently_removed_means" @@ -6241,7 +6302,7 @@ msgstr "Delete user account" #, php-format msgid "user_email_confirm_account_nopass" msgstr "" -"Welcome to %2$s Add-ons.\n" +"Welcome to %2$s Activities.\n" "\n" "Before you can use your new account you must activate it - this ensures the " "e-mail address you used is valid and belongs to you.\n" @@ -6253,8 +6314,8 @@ msgstr "" "Once you successfully activated your account, you can throw away this e-" "mail.\n" "\n" -"Thanks for joining %2$s Add-ons\n" -"-- %2$s Add-ons Staff" +"Thanks for joining %2$s Activities\n" +"-- %2$s Activities Staff" #. %1 is the confirmation url, %2 is the application name #: views/users/email/emailchange_plain.thtml:6 @@ -6262,7 +6323,7 @@ msgstr "" #, php-format msgid "user_email_confirm_emailchange" msgstr "" -"You requested a change to your email address at %2$s Add-ons.\n" +"You requested a change to your email address at %2$s Activities.\n" "\n" "In order to confirm the new address, please click the link below or copy and " "paste the whole thing into your browser's location bar:\n" @@ -6273,12 +6334,12 @@ msgstr "" "the address anymore, you can just ignore this email.\n" "\n" "Thanks!\n" -"-- %2$s Add-ons Staff" +"-- %2$s Activities Staff" #: controllers/users_controller.php:168 #, php-format msgid "user_email_confirm_subject" -msgstr "Thanks for joining %s Add-ons" +msgstr "Thanks for joining %s Activities" #. This is the password reset email #. %1 is the pw reset URL, %2 is the application @@ -6286,7 +6347,7 @@ msgstr "Thanks for joining %s Add-ons" #, php-format msgid "user_email_pwreset" msgstr "" -"%2$s Add-ons Password Reset\n" +"%2$s Activities Password Reset\n" "\n" "A request was received to reset the password for this account on addons." "mozilla.org. To change this password please click on the following link, or " @@ -6297,12 +6358,12 @@ msgstr "" "If you did not request this email there is no need for further action.\n" "\n" "Thanks,\n" -"-- %2$s Add-ons Staff" +"-- %2$s Activities Staff" #: controllers/users_controller.php:244 #, php-format msgid "user_email_pwreset_subject" -msgstr "Reset your %s Add-ons password" +msgstr "Reset your %s Activities password" #: views/users/emailchange.thtml:53 msgid "user_emailchange_error" @@ -6312,7 +6373,7 @@ msgstr "Error!" #: controllers/users_controller.php:513 controllers/users_controller.php:514 #, php-format msgid "user_emailchange_subject" -msgstr "Please confirm your email address change at %1$s Add-ons" +msgstr "Please confirm your email address change at %1$s Activities" #: views/users/emailchange.thtml:49 views/users/emailchange.thtml:50 msgid "user_emailchange_success" @@ -6413,7 +6474,7 @@ msgstr "Register" #: views/users/info.thtml:69 #, php-format msgid "user_info_usersince" -msgstr "%s Add-ons user since" +msgstr "%s Activities user since" #: views/users/login.thtml:107 msgid "user_login_register_link" @@ -6421,7 +6482,7 @@ msgstr "Create a new user account" #: views/users/edit.thtml:139 msgid "user_notifications_item_compat" -msgstr "Add-on Compatibility (strongly recommended)" +msgstr "Activity Compatibility (strongly recommended)" #: views/users/edit.thtml:140 msgid "user_notifications_item_events" @@ -6435,13 +6496,13 @@ msgstr "There are currently no notifications available for you to configure." msgid "user_notifications_select_topics" msgstr "" "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:" +"activity events. Please select the topics you are interested in below:" #: views/users/edit.thtml:143 msgid "user_notifications_specific_contact" msgstr "" "SugarLabs reserves the right to contact you individually about specific " -"concerns with your hosted add-ons." +"concerns with your hosted activities." #: controllers/users_controller.php:526 msgid "user_profile_edit_error" @@ -6484,7 +6545,7 @@ msgstr "Send password reset link" #: views/users/register_complete.thtml:52 #, php-format msgid "user_register_amo_link" -msgstr "%s Add-ons" +msgstr "%s Activities" #. %1 is the user's email address, %2 is the current app #: views/users/activatefirst.thtml:49 @@ -6492,7 +6553,7 @@ msgstr "%s Add-ons" msgid "user_register_click_confirm_link" msgstr "" "A link to activate your user account was sent by email to your address %1$s. " -"You have to click it before you can log into %2$s Add-ons." +"You have to click it before you can log into %2$s Activities." #. %1 is the user's email address #: views/users/register_complete.thtml:50 @@ -6520,7 +6581,11 @@ msgstr "" "did not mark it as \"junk mail\" or \"spam\". If you need to, you can have " "us %1$s to your email address mentioned above." +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# %1 is the link to the Sugar Labs Activities front page +======= #. %1 is the link to the Mozilla Add-ons front page +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: views/users/register_complete.thtml:52 #, php-format msgid "user_register_welcome" @@ -6553,7 +6618,7 @@ msgstr "User Account Editing" #: views/users/info.thtml:90 #, php-format msgid "users_info_addons_by_user" -msgstr "Add-ons by %1$s" +msgstr "Activities by %1$s" #: views/users/info.thtml:50 msgid "users_info_author_name" @@ -6589,14 +6654,19 @@ msgstr "Reviews by %s" msgid "users_login_pagetitle" msgstr "User Login" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po +# %1 is the link to the sandbox/policy explanation page +# This message is for a specific activity not found +======= #. %1 is the link to the sandbox/policy explanation page #. This message is for a specific add-on not found +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po #: views/users/login.thtml:53 #, php-format 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 SugarLabs Add-ons, please log in, or <a href=\"%1$s\">learn " +"The activity you're looking for is currently in the sandbox. If you already " +"have an account on SugarLabs Activities, please log in, or <a href=\"%1$s\">learn " "more about the sandbox.</a>" #. %1 is the link to the sandbox/policy explanation page @@ -6606,7 +6676,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 SugarLabs Add-ons, please log in, or <a href=\"%1$s\">learn more " +"account on SugarLabs Activities, please log in, or <a href=\"%1$s\">learn more " "about the sandbox.</a>" #: controllers/users_controller.php:223 controllers/users_controller.php:225 @@ -6630,3 +6700,20 @@ msgstr "Sugar" #: views/developers/dashboard.thtml:92 msgid "devcp_actionbar_link_previews" msgstr "Edit Previews" +<<<<<<< HEAD:site/app/locale/en_US/LC_MESSAGES/messages.po + +#: controllers/developers_controller.php:537 +msgid "devcp_error_activity_info_missing_activity_version" +msgstr "The file activity/activity.info must contain a value for activity_version" + +#: controllers/developers_controller.php:533 +msgid "devcp_error_activity_info_missing_name" +msgstr "The file activity/activity.info must contain a value for name" + +#: controllers/developers_controller.php:521 +#: controllers/developers_controller.php:529 +msgid "devcp_error_activity_info_not_found" +msgstr "The activity bundle must contain a file named activity/activity.info" + +======= +>>>>>>> svn:site/app/locale/en_US/LC_MESSAGES/messages.po diff --git a/site/app/locale/en_US/pages/policy.thtml b/site/app/locale/en_US/pages/policy.thtml index aeceb48..b4d8d34 100644 --- a/site/app/locale/en_US/pages/policy.thtml +++ b/site/app/locale/en_US/pages/policy.thtml @@ -4,13 +4,13 @@ <p>See the %s.</p> <h2>What add-ons are in the sandbox?</h2> -<p>The sandbox is where all add-ons that are hosted on AMO go, to start. It contains new versions of public add-ons, as well as all versions for add-ons that are not made public. When a new add-on, or an update to an existing add-on, is submitted to AMO, it is placed in the sandbox.</p> +<p>The sandbox is where all add-ons that are hosted on <?=SITE_NAME?> go, to start. It contains new versions of public add-ons, as well as all versions for add-ons that are not made public. When a new add-on, or an update to an existing add-on, is submitted to <?=SITE_NAME?>, it is placed in the sandbox.</p> <p>Some add-ons, and their specific versions, are made public after the review process indicates that they are ready and appropriate for public display. Other add-ons will remain in the sandbox indefinitely, where they are available to users who choose to browse the sandbox list and experiment with the software there.</p> <h2>How do add-ons become public?</h2> -<p>Add-ons are reviewed by AMO users who opt into viewing the sandbox and testing the packages found there. The reviews that AMO users write will indicate whether an add-on is sufficiently useful, well-written and polished to be put in front of all of Firefox's users. These reviews, possibly in addition to other reviews and inspections by the AMO team, are used to determine whether a given add-on should be made public, whether it needs more work to be polished for wider visibility, or whether it's not suitable for promotion on the AMO site outside of the sandbox.</p> +<p>Add-ons are reviewed by <?=SITE_NAME?> users who opt into viewing the sandbox and testing the packages found there. The reviews that <?=SITE_NAME?> users write will indicate whether an add-on is sufficiently useful, well-written and polished to be put in front of all of Firefox's users. These reviews, possibly in addition to other reviews and inspections by the <?=SITE_NAME?> team, are used to determine whether a given add-on should be made public, whether it needs more work to be polished for wider visibility, or whether it's not suitable for promotion on the <?=SITE_NAME?> site outside of the sandbox.</p> <h2>How do I get my add-on promoted to public status?</h2> @@ -18,11 +18,11 @@ <h2>What are the criteria for public add-ons?</h2> -<p>An add-on that's made public on AMO should be of high quality, and give users an improved web experience. We look for the following things when deciding whether an add-on is appropriate for the public side of AMO:</p> +<p>An add-on that's made public on <?=SITE_NAME?> should be of high quality, and give users an improved web experience. We look for the following things when deciding whether an add-on is appropriate for the public side of <?=SITE_NAME?>:</p> <h3>Are you responsive?</h3> -<p>We expect that an author who is promoting their add-on to Firefox's many users is responsive to problem reports, maintains their contact information, and updates their add-on promptly to keep current with Firefox releases and changes in AMO policies. This doesn't mean that you have to reply to every question that someone posts in the discussions, or that you even need to fix every bug, but we do expect that you will respond to issues in a manner that's appropriate to the severity of the issue in question.</p> +<p>We expect that an author who is promoting their add-on to Firefox's many users is responsive to problem reports, maintains their contact information, and updates their add-on promptly to keep current with Firefox releases and changes in <?=SITE_NAME?> policies. This doesn't mean that you have to reply to every question that someone posts in the discussions, or that you even need to fix every bug, but we do expect that you will respond to issues in a manner that's appropriate to the severity of the issue in question.</p> <h3>Is the add-on clearly and accurately described?</h3> @@ -32,13 +32,13 @@ <h3>Are all privacy and security concerns clearly spelled out?</h3> -<p>This is an aspect of a clear and accurate description, but such an important one that we feel it deserves specific mention. Many very useful and well-written add-ons manipulate some form of user data, or can present security hazards if misused; they are welcome on the public portion of AMO, but they must make it very clear to users what risks they might encounter, and what they can do to protect themselves.</p> +<p>This is an aspect of a clear and accurate description, but such an important one that we feel it deserves specific mention. Many very useful and well-written add-ons manipulate some form of user data, or can present security hazards if misused; they are welcome on the public portion of <?=SITE_NAME?>, but they must make it very clear to users what risks they might encounter, and what they can do to protect themselves.</p> <h3>Has the add-on been well-tested, and is it free of obvious or serious defects?</h3> <p>One important thing that we look for when considering an add-on for public access is whether its sandbox reviews indicate that it has received thorough testing, and that it doesn't have serious problems or negative impacts on the browser. If reviewers report problems such as major performance issues, crashes, frequent problems using the functions of the add-on, or spamming of messages to the error console, you should take those reports to heart, and re-nominate your add-on after you've addressed them as best you can. We don't expect you to perfectly optimize or have zero bugs -- Firefox itself undergoes constant improvement in these areas -- but we do want you to take reasonable efforts to minimize downsides, and to clearly call out cases where users may be surprised by those that remain.</p> -<p>If your add-on has been tested outside of the AMO Sandbox process, such as by a group of users of your service or an in-house QA team, you should indicate that in your nomination message. It certainly helps us establish what the level of testing has been, and can help get your add-on up on the site.</p> +<p>If your add-on has been tested outside of the <?=SITE_NAME?> Sandbox process, such as by a group of users of your service or an in-house QA team, you should indicate that in your nomination message. It certainly helps us establish what the level of testing has been, and can help get your add-on up on the site.</p> <h3>Do the add-on and add-on author both treat the user respectfully?</h3> @@ -52,31 +52,31 @@ <p>If your add-on just provides bookmarks or other simple access points to your site, it's probably not appropriate for the public part of the site. Like the rest of the Mozilla project, we love web applications and -new web services, but Firefox add-ons should provide an improved browsing experience for the user and not just be a way to promote a new site or service through an AMO listing. If the description for your add-on is mostly about the service rather than the improvements it makes to the user's browser experience, you're probably not on the right track.</p> +new web services, but Firefox add-ons should provide an improved browsing experience for the user and not just be a way to promote a new site or service through an <?=SITE_NAME?> listing. If the description for your add-on is mostly about the service rather than the improvements it makes to the user's browser experience, you're probably not on the right track.</p> <h3>Is the add-on free of unlicensed trademarks or copyrights?</h3> -<p>Though you may mean no harm to the holder of a trademark, or the owner of a copyrighted work, we can't host add-ons that infringe on trademarks or copyrights. If you don't have permission to use a trademarked name or image, please do not submit your add-on to AMO. If your add-on includes code that is copyrighted by someone else, and is not licensed to you to use in your add-on, please do not submit your add-on to AMO. (If the holder of a trademark or copyright objects to the use of their trademark, we will very likely have to have the request for removal reviewed by counsel, and we will remove the add-on if it's deemed legally necessary. This is an expensive process in terms of the project's resources, including time and money, so we ask you to be respectful and not cause us undue difficulty.)</p> +<p>Though you may mean no harm to the holder of a trademark, or the owner of a copyrighted work, we can't host add-ons that infringe on trademarks or copyrights. If you don't have permission to use a trademarked name or image, please do not submit your add-on to <?=SITE_NAME?>. If your add-on includes code that is copyrighted by someone else, and is not licensed to you to use in your add-on, please do not submit your add-on to <?=SITE_NAME?>. (If the holder of a trademark or copyright objects to the use of their trademark, we will very likely have to have the request for removal reviewed by counsel, and we will remove the add-on if it's deemed legally necessary. This is an expensive process in terms of the project's resources, including time and money, so we ask you to be respectful and not cause us undue difficulty.)</p> <p>If you're not sure if the name of your add-on, or use of something within it, will prevent it from being listed on the site, you can ask amo-editors@mozilla.org for guidance. IMPORTANT: Please note that this group is not able to provide legal advice, and that even if we feel that your usage is acceptable, we may revisit that decision in light of complaints from rights-holders and advice from legal counsel.</p> -<p>In terms of reuse of source code from other add-ons, if the author has not clearly stated that you are permitted to use her code in your own work -- such as by placing it under an open source license -- then you should assume that you do not have the right to do so. You can contact the author to seek such permission, but we can't provide you with any special rights to it just because it's been on AMO, or because the author isn't responding to your request. (And, again, we can't provide legal advice, just advice about how your add-on is likely to interact with the policies of the site.)</p> +<p>In terms of reuse of source code from other add-ons, if the author has not clearly stated that you are permitted to use her code in your own work -- such as by placing it under an open source license -- then you should assume that you do not have the right to do so. You can contact the author to seek such permission, but we can't provide you with any special rights to it just because it's been on <?=SITE_NAME?>, or because the author isn't responding to your request. (And, again, we can't provide legal advice, just advice about how your add-on is likely to interact with the policies of the site.)</p> <p>This applies to the Mozilla Foundation's trademarks as well, including "Mozilla", "Firefox", and "Thunderbird". The Mozilla policy on trademark use is designed to protect against confusion, and prevent the trademarks from being overturned due to lack of protection; please respect the need for such protection, and help us preserve some of the most valuable assets of the Mozilla Foundation.</p> <h2>What happens after I nominate something?</h2> -<p>Once your add-on has been nominated, it is evaluated by a team of AMO Editors according to the criteria described above. If it is deemed ready for public display, it will be pushed to the public side once it has been evaluated, and you will receive an email notification.</p> +<p>Once your add-on has been nominated, it is evaluated by a team of <?=SITE_NAME?> Editors according to the criteria described above. If it is deemed ready for public display, it will be pushed to the public side once it has been evaluated, and you will receive an email notification.</p> -<p>If we feel that the add-on isn't appropriate for the public side of AMO at this time, you'll receive an email notification indicating why, and your nomination will be removed from the queue. If and when you feel that you've addressed the concerns expressed in that notification, and you want to be evaluated again, you can do so at your discretion. Repeated nominations without meaningful improvements in the add-on are not looked upon with favour, so please do exercise discretion; you are more likely to anger us than to wear us down.</p> +<p>If we feel that the add-on isn't appropriate for the public side of <?=SITE_NAME?> at this time, you'll receive an email notification indicating why, and your nomination will be removed from the queue. If and when you feel that you've addressed the concerns expressed in that notification, and you want to be evaluated again, you can do so at your discretion. Repeated nominations without meaningful improvements in the add-on are not looked upon with favour, so please do exercise discretion; you are more likely to anger us than to wear us down.</p> <h2>Can I nominate someone else's add-on?</h2> -<p>Currently, we ask that an add-on's author nominate their own work for publication. We want to make sure that the author is comfortable with the increased exposure and that feel the add-on in its current state appropriately reflects the quality of their work. If you believe that an add-on is polished, that the author is abiding by the letter and spirit of the AMO policies, and that it would benefit Firefox, our users, and the web in general to have it made available to nearly a hundred million users around the world, you should feel free to encourage the author of the add-on to nominate their creation.</p> +<p>Currently, we ask that an add-on's author nominate their own work for publication. We want to make sure that the author is comfortable with the increased exposure and that feel the add-on in its current state appropriately reflects the quality of their work. If you believe that an add-on is polished, that the author is abiding by the letter and spirit of the <?=SITE_NAME?> policies, and that it would benefit Firefox, our users, and the web in general to have it made available to nearly a hundred million users around the world, you should feel free to encourage the author of the add-on to nominate their creation.</p> <h2>My add-on has been in the nomination queue for a long time, do you hate me?</h2> -<p>We don't hate you. We love add-on developers, and we work hard to make them happy and productive, so that users all over the world can benefit from their work. But being on the public side of AMO has value precisely because we take care in what ends up there, so we can't rush just to make it go faster. We appreciate that it can be frustrating to wait for your add-on to be evaluated, and we want to keep the turnaround time as short as possible. The more people provide careful and clear reviews of add-ons in the sandbox, the easier it is to perform these evaluations, so you might also consider helping out on that side if you're so inclined.</p> +<p>We don't hate you. We love add-on developers, and we work hard to make them happy and productive, so that users all over the world can benefit from their work. But being on the public side of <?=SITE_NAME?> has value precisely because we take care in what ends up there, so we can't rush just to make it go faster. We appreciate that it can be frustrating to wait for your add-on to be evaluated, and we want to keep the turnaround time as short as possible. The more people provide careful and clear reviews of add-ons in the sandbox, the easier it is to perform these evaluations, so you might also consider helping out on that side if you're so inclined.</p> <h2>I found a serious bug in my add-on, and I really want to get the fix up there quickly. What should I do?</h2> diff --git a/site/app/locale/ru/LC_MESSAGES/messages.po b/site/app/locale/ru/LC_MESSAGES/messages.po index 35f7974..4058b05 100644 --- a/site/app/locale/ru/LC_MESSAGES/messages.po +++ b/site/app/locale/ru/LC_MESSAGES/messages.po @@ -5696,11 +5696,10 @@ msgstr "Политика дополнений" msgid "page_title_privacy" msgstr "Политика приватности Mozilla" -<<<<<<< HEAD:site/app/locale/ru/LC_MESSAGES/messages.po #: controllers/pages_controller.php:105 msgid "page_title_review_guide" msgstr "Чем следует руководствоваться при составлении рецензии" -======= + # %1 is the link to the sandbox/policy explanation page # This message is for a specific add-on not found #: views/users/login.thtml:53 @@ -5710,7 +5709,6 @@ msgstr "" "Дополнение, которое вы ищете, находится в данный момент в «песочнице». Если у " "вас уже есть учётная запись на Mozilla Add-ons, пожалуйста войдите в систему " "или <a href=\"%1$s\">почитайте больше о «песочнице»</a>." ->>>>>>> merged w/ en_US and compiled.:site/app/locale/ru/LC_MESSAGES/messages.po #: controllers/pages_controller.php:107 msgid "page_title_sandbox" @@ -5918,16 +5916,14 @@ msgstr "поиск дополнений" msgid "search_form_submit_tooltip" msgstr "Поиск дополнений" -<<<<<<< HEAD:site/app/locale/ru/LC_MESSAGES/messages.po #: views/elements/search.thtml:182 msgid "search_form_tooltip" msgstr "Щёлкните, чтобы ввести запрос на поиск" -======= + #~ msgid "addons_display_sandbox_pref_warning" #~ msgstr "" #~ "Дополнение, которое вы ищете, находится в «песочнице», которая не включена " #~ "в ваших настройках." ->>>>>>> merged w/ en_US and compiled.:site/app/locale/ru/LC_MESSAGES/messages.po #: views/elements/search.thtml:184 msgid "search_form_within" @@ -7042,7 +7038,6 @@ msgstr "Сброс пароля пользователя" #: controllers/users_controller.php:90 controllers/users_controller.php:92 msgid "users_register_pagetitle" msgstr "Регистрация нового пользователя" -<<<<<<< HEAD:site/app/locale/ru/LC_MESSAGES/messages.po #~ msgid "addon_versions_getlatesttext" #~ msgstr "Самая последняя версия совместима с" @@ -7073,8 +7068,6 @@ msgstr "Регистрация нового пользователя" #~ msgid "this page" #~ msgstr "эта страница" -======= -<<<<<<< HEAD:site/app/locale/ru/LC_MESSAGES/messages.po # %1 is the app name, %2 is the platform in parentheses #~ msgid "a_addto_app" @@ -7965,6 +7958,3 @@ msgstr "Регистрация нового пользователя" #~ msgid "this page" #~ msgstr "эта страница" -======= ->>>>>>> a5d2b268ad8c2009bbce777be30f2989b28c2d3b:site/app/locale/ru/LC_MESSAGES/messages.po ->>>>>>> 603eff3e4fea9752d142d80c08cfeea964f281a9:site/app/locale/ru/LC_MESSAGES/messages.po diff --git a/site/app/tests/cake_reporter.php b/site/app/tests/cake_reporter.php index be26b32..b8cd724 100644 --- a/site/app/tests/cake_reporter.php +++ b/site/app/tests/cake_reporter.php @@ -88,7 +88,7 @@ class CakeHtmlReporter extends HtmlReporter { $name = str_replace('.test', '', $path); } - $link = '<a class="svn" href="http://svn.mozilla.org/addons/trunk/site/app/'.$name.'">Test Subject</a>'; + $link = '<a class="svn" href="http://git.sugarlabs.org/projects/slo-addons/repos/mainline/blobs/devel/site/app/'.$name.'">Test Subject</a>'; return $link; } } @@ -171,7 +171,7 @@ class CakeHtmlReporter extends HtmlReporter { function parseMessage($message) { if (preg_match('/(.*) at \['.str_replace(DS, '\\'.DS, TESTS).'(\S+) (line (\d+))\]/i', $message, $matches)) { $memusage = function_exists('memory_get_usage') ? memory_get_usage() : ''; // some platforms don't have that - $message = $matches[1].' @ <a href="http://svn.mozilla.org/addons/trunk/site/app/tests/'.$matches[2].'#'.$matches[4].'">'.$matches[3].'</a> ('.$memusage.')<br>'; + $message = $matches[1].' @ <a href="http://git.sugarlabs.org/projects/slo-addons/repos/mainline/blobs/devel/site/app/tests/'.$matches[2].'#'.$matches[4].'">'.$matches[3].'</a> ('.$memusage.')<br>'; } return $message; } diff --git a/site/app/tests/test_helper_web.php b/site/app/tests/test_helper_web.php index 68cdb34..9791a71 100644 --- a/site/app/tests/test_helper_web.php +++ b/site/app/tests/test_helper_web.php @@ -67,7 +67,7 @@ class WebTestHelper extends WebTestCase { * Logs in with test account info. */ function login() { - $username = 'nobody@mozilla.org'; + $username = 'nobody@sugarlabs.org'; $password = 'test'; $path = $this->actionURI('/users/login'); diff --git a/site/app/tests/views/addons/dictionaries.test.php b/site/app/tests/views/addons/dictionaries.test.php index 3bf686b..95020d9 100644 --- a/site/app/tests/views/addons/dictionaries.test.php +++ b/site/app/tests/views/addons/dictionaries.test.php @@ -53,7 +53,7 @@ class AddonDictionariesTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testDicts() { diff --git a/site/app/tests/views/addons/display.test.php b/site/app/tests/views/addons/display.test.php index 3bc5b7f..d0c6fc9 100644 --- a/site/app/tests/views/addons/display.test.php +++ b/site/app/tests/views/addons/display.test.php @@ -82,7 +82,7 @@ class AddonTest extends WebTestHelper { function testRemoraPage() { //just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testDisplay() { diff --git a/site/app/tests/views/addons/home.test.php b/site/app/tests/views/addons/home.test.php index 351ce0e..ac6ebb3 100644 --- a/site/app/tests/views/addons/home.test.php +++ b/site/app/tests/views/addons/home.test.php @@ -54,7 +54,7 @@ class AddonHomeTest extends WebTestHelper { function testRemoraHome() { //just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testTitle() { diff --git a/site/app/tests/views/addons/plugins.test.php b/site/app/tests/views/addons/plugins.test.php index 67b4fcf..cfb163c 100644 --- a/site/app/tests/views/addons/plugins.test.php +++ b/site/app/tests/views/addons/plugins.test.php @@ -53,7 +53,7 @@ class AddonPluginsTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testPlugins() { diff --git a/site/app/tests/views/addons/previews.test.php b/site/app/tests/views/addons/previews.test.php index 6fa4ace..10a7007 100644 --- a/site/app/tests/views/addons/previews.test.php +++ b/site/app/tests/views/addons/previews.test.php @@ -54,7 +54,7 @@ class AddonPreviewsTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testPreviews() { diff --git a/site/app/tests/views/addons/searchengines.test.php b/site/app/tests/views/addons/searchengines.test.php index 23e6cff..815b706 100644 --- a/site/app/tests/views/addons/searchengines.test.php +++ b/site/app/tests/views/addons/searchengines.test.php @@ -53,7 +53,7 @@ class AddonSearchenginesTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testSearchengines() { diff --git a/site/app/tests/views/addons/versions.test.php b/site/app/tests/views/addons/versions.test.php index 8c5b39e..4334e04 100644 --- a/site/app/tests/views/addons/versions.test.php +++ b/site/app/tests/views/addons/versions.test.php @@ -60,7 +60,7 @@ class AddonVersionsTest extends WebTestHelper { function testRemoraPage() { // just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testRssLink() { diff --git a/site/app/tests/views/admin/addons_status.test.php b/site/app/tests/views/admin/addons_status.test.php index a85d26d..150e717 100644 --- a/site/app/tests/views/admin/addons_status.test.php +++ b/site/app/tests/views/admin/addons_status.test.php @@ -12,7 +12,7 @@ class AdminAddonsStatusTest extends WebTestHelper { } function testRemoraPage() { - $this->assertWantedPattern('/Mozilla Add-ons/i', 'pattern detected'); + $this->assertWantedPattern('/Sugar Labs/i', 'pattern detected'); $this->assertResponse('200'); } diff --git a/site/app/tests/views/admin/serverstatus.test.php b/site/app/tests/views/admin/serverstatus.test.php index b54d86d..e9270d8 100644 --- a/site/app/tests/views/admin/serverstatus.test.php +++ b/site/app/tests/views/admin/serverstatus.test.php @@ -52,7 +52,7 @@ class AdminServerStatusTest extends WebTestHelper { } function testRemoraPage() { - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activites/i', "pattern detected"); $this->assertResponse('200'); } diff --git a/site/app/tests/views/developers/index.test.php b/site/app/tests/views/developers/index.test.php index 784947f..0b4e910 100644 --- a/site/app/tests/views/developers/index.test.php +++ b/site/app/tests/views/developers/index.test.php @@ -48,7 +48,7 @@ class DevelopersIndexTest extends WebTestHelper { function testRemoraPage() {
//just checks if the page works or not
- $this->assertWantedPattern('/My Add-ons/i', 'Header detected');
+ $this->assertWantedPattern('/My Activities/i', 'Header detected');
}
function testDisplay() {
diff --git a/site/app/tests/views/reviews/add.test.php b/site/app/tests/views/reviews/add.test.php index 86ccaba..a05a227 100644 --- a/site/app/tests/views/reviews/add.test.php +++ b/site/app/tests/views/reviews/add.test.php @@ -54,7 +54,7 @@ class ReviewsAddTest extends WebTestHelper { function testRemoraPage() { //just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testReviews() { diff --git a/site/app/tests/views/reviews/display.test.php b/site/app/tests/views/reviews/display.test.php index 60f6190..2282990 100644 --- a/site/app/tests/views/reviews/display.test.php +++ b/site/app/tests/views/reviews/display.test.php @@ -52,7 +52,7 @@ class AddonReviewsTest extends WebTestHelper { function testRemoraPage() { //just checks if the page works or not - $this->assertWantedPattern('/Mozilla Add-ons/i', "pattern detected"); + $this->assertWantedPattern('/Sugar Labs Activities/i', "pattern detected"); } function testReviews() { diff --git a/site/app/views/admin/summary.thtml b/site/app/views/admin/summary.thtml index 30c8c46..f6f9fdd 100644 --- a/site/app/views/admin/summary.thtml +++ b/site/app/views/admin/summary.thtml @@ -84,21 +84,10 @@ <tr> <td class="heading" colspan=2>Total Counts</td> </tr> - <tr> - <td class="title">Extensions</td> - <td class="value"><?=$count['extensions'][0][0]['COUNT(*)']?></td> - </tr> - <tr> - <td class="title">Themes</td> - <td class="value"><?=$count['themes'][0][0]['COUNT(*)']?></td> - </tr> - <tr> - <td class="title">Dictionaries</td> - <td class="value"><?=$count['dictionaries'][0][0]['COUNT(*)']?></td> - </tr> - <tr> - <td class="title">Search Plugins</td> - <td class="value"><?=$count['searchengines'][0][0]['COUNT(*)']?></td> + + <tr> + <td class="title">Activities</td> + <td class="value"><?=$count['activities'][0][0]['COUNT(*)']?></td> </tr> <tr> <td class="title">Current Sessions</td> diff --git a/site/app/views/api/api_addon.thtml b/site/app/views/api/api_addon.thtml index a1dcf4c..077f91b 100644 --- a/site/app/views/api/api_addon.thtml +++ b/site/app/views/api/api_addon.thtml @@ -39,7 +39,7 @@ $addonIconPath = ($addon['Addon']['addontype_id'] == ADDON_THEME ? $html->urlImage(DEFAULT_THEME_ICON) : $html->urlImage(DEFAULT_ADDON_ICON)); } - $amo = 'https://addons.mozilla.org'; + $amo = SSITE_URL; ?> <addon> <?php diff --git a/site/app/views/api/collections_feed.thtml b/site/app/views/api/collections_feed.thtml index 3e856ff..9c645e8 100644 --- a/site/app/views/api/collections_feed.thtml +++ b/site/app/views/api/collections_feed.thtml @@ -54,7 +54,7 @@ if (isset($error)) { ?> $addonIconPath = ($addon['addontype_id'] == ADDON_THEME ? $html->urlImage(DEFAULT_THEME_ICON) : $html->urlImage(DEFAULT_ADDON_ICON)); } - $amo = 'https://addons.mozilla.org'; + $amo = 'SSITE_URL; ?> <addon> <meta> diff --git a/site/app/views/compatibility/dashboard.thtml b/site/app/views/compatibility/dashboard.thtml index 035727c..1792e93 100644 --- a/site/app/views/compatibility/dashboard.thtml +++ b/site/app/views/compatibility/dashboard.thtml @@ -42,12 +42,12 @@ </div> <div class="compat-box"> <div id="compat-intro"> - <h2><?=$html->image('wordmarks/firefox-'.$version.'.png', array('alt' => APP_PRETTYNAME." {$version}"))?><br /><?=___('compatibility_dashboard_center_header', 'Add-on Compatibility Center')?></h2> - <p><?=sprintf(___('compatibility_dashboard_intro', 'Be prepared for the release of %1$s with the tools and information available for the %2$s Add-ons community found below.'), APP_PRETTYNAME." {$version}", APP_PRETTYNAME)?></p> + <h2><?=$html->image('wordmarks/firefox-'.$version.'.png', array('alt' => APP_PRETTYNAME." {$version}"))?><br /><?=___('compatibility_dashboard_center_header', 'Activity Compatibility Center')?></h2> + <p><?=sprintf(___('compatibility_dashboard_intro', 'Be prepared for the release of %1$s with the tools and information available for the %2$s Activities community found below.'), APP_PRETTYNAME." {$version}", APP_PRETTYNAME)?></p> <ul> <li id="nav-report"><a href="<?=$html->url('/compatibility/report/'.$version)?>" onclick="compatibility.viewReport(); return false;"><?=___('compatibility_view_report', 'View Compatibility Report')?></a></li> - <li id="nav-developers"><a href="<?=$html->url('/compatibility/developers/'.$version)?>" onclick="compatibility.viewDeveloperInfo(); return false;"><?=___('compatibility_developer_info', 'Information for Add-on Developers')?></a></li> - <li id="nav-users"><a href="<?=$html->url('/compatibility/users/'.$version)?>" onclick="compatibility.viewEndUserInfo(); return false;"><?=___('compatibility_user_info', 'Information for Add-on Users')?></a></li> + <li id="nav-developers"><a href="<?=$html->url('/compatibility/developers/'.$version)?>" onclick="compatibility.viewDeveloperInfo(); return false;"><?=___('compatibility_developer_info', 'Information for Activity Developers')?></a></li> + <li id="nav-users"><a href="<?=$html->url('/compatibility/users/'.$version)?>" onclick="compatibility.viewEndUserInfo(); return false;"><?=___('compatibility_user_info', 'Information for Activity Users')?></a></li> </ul> </div> @@ -63,10 +63,10 @@ ?> <div class="header"> <div class="title"> - <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_report_title', 'Add-on Compatibility Report')?> + <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_report_title', 'Activity Compatibility Report')?> </div> </div> - <p class="intro"><?=sprintf(___('compatibility_report_intro', 'Of the %1$s add-ons that make up 95% of add-on usage known to Mozilla, <b>%2$s%</b> are currently considered compatible with the latest builds of %3$s.'), number_format($totals['addons95']), round($percentages[COMPAT_LATEST]), APP_PRETTYNAME." {$version}")?></p> + <p class="intro"><?=sprintf(___('compatibility_report_intro', 'Of the %1$s activities that make up 95% of activity usage known to Sugar Labs, <b>%2$s%</b> are currently considered compatible with the latest builds of %3$s.'), number_format($totals['addons95']), round($percentages[COMPAT_LATEST]), APP_PRETTYNAME." {$version}")?></p> <div id="overall-compat"> <div id="overall-compat-bar"> <div class="compat-other" style="width: <?=$percentages[COMPAT_OTHER]?>%;"><?=($percentages[COMPAT_OTHER] >= 5 ? round($percentages[COMPAT_OTHER]).'%': '')?></div> @@ -78,19 +78,19 @@ <div id="overall-compat-legend"> <div class="legend-box"> <div class="color-square compat-other"></div> - <p><b><?=___('compatibility_report_legend_other', 'Other Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_other_description', 'Add-ons not compatible with any version of %1$s'), APP_PRETTYNAME." {$version}")?></p> + <p><b><?=___('compatibility_report_legend_other', 'Other Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_other_description', 'Activities not compatible with any version of %1$s'), APP_PRETTYNAME." {$version}")?></p> </div> <div class="legend-box"> <div class="color-square compat-alpha"></div> - <p><b><?=___('compatibility_report_legend_alpha', 'Alpha Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_alpha_description', 'Add-ons compatible with an alpha version of %1$s'), APP_PRETTYNAME." {$version}")?></p> + <p><b><?=___('compatibility_report_legend_alpha', 'Alpha Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_alpha_description', 'Activities compatible with an alpha version of %1$s'), APP_PRETTYNAME." {$version}")?></p> </div> <div class="legend-box"> <div class="color-square compat-beta"></div> - <p><b><?=___('compatibility_report_legend_beta', 'Beta Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_beta_description', 'Add-ons compatible with a beta version or release candidate of %1$s'), APP_PRETTYNAME." {$version}")?></p> + <p><b><?=___('compatibility_report_legend_beta', 'Beta Versions')?></b><br /><?=sprintf(___('compatibility_report_legend_beta_description', 'Activities-ons compatible with a beta version or release candidate of %1$s'), APP_PRETTYNAME." {$version}")?></p> </div> <div class="legend-box"> <div class="color-square compat-latest"></div> - <p><b><?=___('compatibility_report_legend_latest', 'Latest Version')?></b><br /><?=sprintf(___('compatibility_report_legend_latest_description', 'Add-ons up-to-date with the latest builds of %1$s'), APP_PRETTYNAME." {$version}")?></p> + <p><b><?=___('compatibility_report_legend_latest', 'Latest Version')?></b><br /><?=sprintf(___('compatibility_report_legend_latest_description', 'Activities up-to-date with the latest builds of %1$s'), APP_PRETTYNAME." {$version}")?></p> </div> </div> </div> @@ -127,7 +127,7 @@ <?php if ($loggedin): ?> <div class="details-link"><a href="#" onclick="compatibility.viewDeveloperDetails();"><?=___('compatibility_developers_check_status', 'Check Status of My Add-ons')?></a></div> <?php else: ?> - <p class="login"><?=sprintf(___('compatibility_developers_login_first', 'If you have add-ons hosted on Mozilla Add-ons, <a href="%1$s">please login</a> to analyze the status of your add-ons for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}")?></p> + <p class="login"><?=sprintf(___('compatibility_developers_login_first', 'If you have activities hosted on Sugar Labs Activites, <a href="%1$s">please login</a> to analyze the status of your activitiess for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}")?></p> <?php endif; ?> </div> @@ -138,14 +138,18 @@ </div> </div> - <div class="loading"><?=___('compatibility_developers_retrieving', 'Retrieving status of hosted add-ons...')?></div> + <div class="loading"><?=___('compatibility_developers_retrieving', 'Retrieving status of hosted activities...')?></div> <div id="developers-details-data"></div> </div> <div id="users-intro"> <div class="header"> <div class="title"> +<<<<<<< HEAD:site/app/views/compatibility/dashboard.thtml + <?=$html->image('wordmarks/firefox-'.$version.'_small.png')?><?=___('compatibility_user_info', 'Information for Activity Users')?> +======= <?=$html->image('wordmarks/firefox-'.$version.'_small.png', array('alt' => APP_PRETTYNAME." {$version}"))?><?=___('compatibility_user_info', 'Information for Add-on Users')?> +>>>>>>> svn:site/app/views/compatibility/dashboard.thtml </div> </div> <br /> diff --git a/site/app/views/compatibility/developers.thtml b/site/app/views/compatibility/developers.thtml index 5b4ae0c..3e208f4 100644 --- a/site/app/views/compatibility/developers.thtml +++ b/site/app/views/compatibility/developers.thtml @@ -68,11 +68,11 @@ if ($loggedin) { echo '</ul>'; } else { - echo '<p class="login">'.___('compatibility_developers_no_addons', 'You do not have any add-ons hosted on Mozilla Add-ons.').'</p>'; + echo '<p class="login">'.___('compatibility_developers_no_addons', 'You do not have any activities hosted on Sugar Labs Activites.').'</p>'; } } else { - echo '<p class="login">'.sprintf(__('compatibility_developers_login_first', 'If you have add-ons hosted on Mozilla Add-ons, <a href="%1$s">please login</a> to analyze the status of your add-ons for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}").'</p>'; + echo '<p class="login">'.sprintf(__('compatibility_developers_login_first', 'If you have activities hosted on Sugar Labs Activities, <a href="%1$s">please login</a> to analyze the status of your activity for %2$s.'), $html->url($html->login_url()), APP_PRETTYNAME." {$version}").'</p>'; } ?> <?php if ($format != 'ajax'): ?> diff --git a/site/app/views/editors/email/nominated/public_plain.thtml b/site/app/views/editors/email/nominated/public_plain.thtml index 15afe4f..4f161e5 100644 --- a/site/app/views/editors/email/nominated/public_plain.thtml +++ b/site/app/views/editors/email/nominated/public_plain.thtml @@ -1,8 +1,8 @@ -Congratulations! Your nominated add-on, <?=$info['name']?>, has been reviewed by a Mozilla Add-ons editor who approved your add-on to be public. +Congratulations! Your nominated add-on, <?=$info['name']?>, has been reviewed by a <?=SITE_NAME?> editor who approved your add-on to be public. Your most recent version (<?=$info['version']?>) has also been made public. -You can view your public add-on now at: http://addons.mozilla.org/addon/<?=$info['id']?> +You can view your public add-on now at: <?=SITE_URL?>/addon/<?=$info['id']?> Review Information: @@ -13,5 +13,5 @@ Comments: <?=$info['comments']?> If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. -Mozilla Add-ons -http://addons.mozilla.org +<?=SITE_NAME?> +<?=SITE_URL?> diff --git a/site/app/views/editors/email/nominated/sandbox_plain.thtml b/site/app/views/editors/email/nominated/sandbox_plain.thtml index 61ceb37..71caaa9 100644 --- a/site/app/views/editors/email/nominated/sandbox_plain.thtml +++ b/site/app/views/editors/email/nominated/sandbox_plain.thtml @@ -1,4 +1,4 @@ -Your nominated add-on, <?=$info['name']?>, has been reviewed by a Mozilla Add-ons editor who decided to retain your add-on in the sandbox. +Your nominated add-on, <?=$info['name']?>, has been reviewed by a <?=SITE_NAME?> editor who decided to retain your add-on in the sandbox. Review Information: Reviewer: <?=$info['reviewer']?> @@ -8,5 +8,5 @@ Comments: <?=$info['comments']?> If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. -Mozilla Add-ons -http://addons.mozilla.org +<?=SITE_NAME?> +<?=SITE_URL?> diff --git a/site/app/views/editors/email/pending/public_plain.thtml b/site/app/views/editors/email/pending/public_plain.thtml index 724c883..8e099a7 100644 --- a/site/app/views/editors/email/pending/public_plain.thtml +++ b/site/app/views/editors/email/pending/public_plain.thtml @@ -1,4 +1,4 @@ -The following files of <?=$info['name']?> <?=$info['version']?> have been made public by a Mozilla Add-ons editor: +The following files of <?=$info['name']?> <?=$info['version']?> have been made public by a <?=SITE_NAME?> editor: <?php foreach ($info['files'] as $file) { @@ -16,5 +16,5 @@ Comments: <?=$info['comments']?> If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. -Mozilla Add-ons -http://addons.mozilla.org +<?=SITE_NAME?> +<?=SITE_URL?> diff --git a/site/app/views/editors/email/pending/sandbox_plain.thtml b/site/app/views/editors/email/pending/sandbox_plain.thtml index c174a62..8bcc353 100644 --- a/site/app/views/editors/email/pending/sandbox_plain.thtml +++ b/site/app/views/editors/email/pending/sandbox_plain.thtml @@ -1,4 +1,4 @@ -The following files of <?=$info['name']?> <?=$info['version']?> have been retained in the sandbox by a Mozilla Add-ons editor: +The following files of <?=$info['name']?> <?=$info['version']?> have been retained in the sandbox by a <?=SITE_NAME?> editor: Review Information: @@ -11,5 +11,5 @@ Comments: <?=$info['comments']?> If you have questions about this review, please e-mail amo-editors@mozilla.org or join #addons on irc.mozilla.org. -Mozilla Add-ons -http://addons.mozilla.org +<?=SITE_NAME?> +<?=SITE_URL?> diff --git a/site/app/views/editors/email/superreview_plain.thtml b/site/app/views/editors/email/superreview_plain.thtml index 1579a8b..8eb4a8b 100644 --- a/site/app/views/editors/email/superreview_plain.thtml +++ b/site/app/views/editors/email/superreview_plain.thtml @@ -4,7 +4,7 @@ An editor has requested super-review of the following add-on due to security, co Please open your plethora of knowledge and wield your mighty administrative sword of decision making in the general vicinity of: -<?=$info['name']?> - http://addons.mozilla.org/addon/<?=$info['id']?> +<?=$info['name']?> - <?=SITE_URL?>/addon/<?=$info['id']?> Review Information: @@ -15,5 +15,5 @@ Comments: <?=$info['comments']?> Love, -Mozilla Add-ons -http://addons.mozilla.org +<?=SITE_NAME?> +<?=SITE_URL?> diff --git a/site/app/views/editors/queue.thtml b/site/app/views/editors/queue.thtml index ff940c5..e6043b5 100644 --- a/site/app/views/editors/queue.thtml +++ b/site/app/views/editors/queue.thtml @@ -73,7 +73,7 @@ <td><?=_('editors_th_addon')?></td> <td><?=_('editors_th_addontype')?></td> <?php - $apps = array('Firefox', 'Thunderbird', 'Mozilla', 'SeaMonkey', 'Sunbird'); + $apps = array('Sugar'); foreach ($apps as $app) { echo '<td>'.$html->image('developers/'.strtolower($app).'.png', array('title' => sprintf(_('editors_queue_app_compatibility'), $app))).'</td>'; } diff --git a/site/app/views/elements/header.thtml b/site/app/views/elements/header.thtml index 69935ba..a22e1ca 100644 --- a/site/app/views/elements/header.thtml +++ b/site/app/views/elements/header.thtml @@ -123,7 +123,7 @@ <?php echo $html->image('app-icons/'.LAYOUT_NAME.'.png', array('alt' => $main_header)); ?> <?php if (LAYOUT_NAME == 'generic' || LAYOUT_NAME == 'developers') { - echo 'Mozilla Add-ons</a></h1>'; + echo SITE_NAME.'</a></h1>'; if (!empty($subpagetitle)) { echo '<h2>'.$subpagetitle.'</h2>'; } diff --git a/site/app/views/facebook/faq.thtml b/site/app/views/facebook/faq.thtml index 80b7157..65c1ff8 100644 --- a/site/app/views/facebook/faq.thtml +++ b/site/app/views/facebook/faq.thtml @@ -66,57 +66,48 @@ <h1>Frequently Asked Questions</h1> <div class="entry"> - <div class="question">What exactly is an add-on, and why should I download one?</div> - <div class="answer">Add-ons let you Rock Your Firefox by adding new features or changing the appearance of your Firefox. - For example, you can give your browser a whole new look with specially created themes. - Or you can try add-ons that will enhance listening to music, simplify photo sharing, block popup ads, and more.</div> + <div class="question">What exactly is an activity, and why should I download one?</div> + <div class="answer">Activities let you Rock Your Sugar by adding new features or changing the appearance of your computer. </div> <div class="entry"> - <div class="question">What is the difference between putting an add-on on my favorites list and actually installing the add-on for my Firefox?</div> - <div class="answer">Marking an add-on as a favorite lets your friends know that you use and recommend the add-on, but does not automatically install it. - Similarly, installing an add-on does not automatically mark it as a favorite.</div> + <div class="question">What is the difference between putting an activities on my favorites list and actually installing the activity for my sugar?</div> + <div class="answer">Marking an activity as a favorite lets your friends know that you use and recommend the acttivity, but does not automatically install it. + Similarly, installing an aativity does not automatically mark it as a favorite.</div> </div> <div class="entry"> <div class="question">I want to show my favorite add-ons on my profile. How do I do this?</div> - <div class="answer">Clicking "Add to Favorites" on an add-on's display page will add it to your favorites and make it appear in your Facebook profile.</div> + <div class="answer">Clicking "Add to Favorites" on an activities' display page will add it to your favorites and make it appear in your Facebook profile.</div> </div> <div class="entry"> - <div class="question">How do I share a cool add-on with my friends? (i.e. Can I invite people to add something?)</div> - <div class="answer">You can use the Share button on an addon's display page to share that add-on with a specific friend or post it on your profile. - You'll also be able to send add-ons as attachments in wall posts and messages very soon, so they can Rock their Firefox.</div> + <div class="question">How do I share a cool activities with my friends? (i.e. Can I invite people to add something?)</div> + <div class="answer">You can use the Share button on an activities's display page to share that activity with a specific friend or post it on your profile. + You'll also be able to send activities as attachments in wall posts and messages very soon, so they can Rock their Sugar.</div> </div> <div class="entry"> - <div class="question">I've installed an add-on. What's my next step to actually start using it?</div> - <div class="answer">Once you install an add-on, you'll need to restart Firefox for it to take effect. - If the add-on doesn't seem to have installed properly, go the Add-ons Manager in the Firefox tools menu to learn more.</div> + <div class="question">I've installed an activity. What's my next step to actually start using it?</div> + <div class="answer">If the activity doesn't seem to have installed properly, go the Activity Manager to learn more.</div> </div> <div class="entry"> - <div class="question">Is this application secure? Are these add-ons certified by Mozilla?</div> - <div class="answer">The add-ons listed in Rock Your Firefox were not made by Mozilla (unless otherwise noted). - It's best to check with the author of the add-on (listed next to each add-on description) for any support requests.</div> + <div class="question">Is this activity secure? Are these activities certified by Sugar Labs?</div> + <div class="answer">The activities listed in Rock Your Fugar were not made by Sugar Labs (unless otherwise noted). + It's best to check with the author of the activity (listed next to each add-on description) for any support requests.</div> </div> <div class="entry"> - <div class="question">Why do I need Firefox to use this Facebook application?</div> - <div class="answer">This application lets you Rock Your Firefox! - Only Firefox gives you the chance to customize nearly every aspect of your browser. - Find out what Firefox add-ons your friends are using and discover new favorites on your own.</div> + <div class="question">Why do I need Sugar to use this Facebook application?</div> + <div class="answer">This application lets you Rock Your Sugar! + Only Firefox gives you the chance to customize nearly every aspect of your desktop. + Find out what Sugar activites your friends are using and discover new favorites on your own.</div> </div> <div class="entry"> - <div class="question">Where can I find more information about Firefox extensions and themes?</div> - <div class="answer">You can submit and learn more about creating add-ons for Firefox at <a href="http://addons.mozilla.org">Mozilla Add-ons</a>. - Submitting your add-on in the <a href="http://addons.mozilla.org/developers">Developer Control Panel</a> there will enable it to be listed in Rock Your Firefox.</div> - </div> - - <div class="entry"> <div class="question">Where can I report a bug or enhancement request with this application?</div> <div class="answer">If you think you've found an issue with this application, or if you'd like to request a new feature, - please do so in Mozilla's <a href="https://bugzilla.mozilla.org/enter_bug.cgi?product=addons.mozilla.org&component=Facebook%20Application&op_sys=All&rep_platform=All">Bugzilla</a>.</div> + please do so in Sugar Lab's bugtracker.</div> </div> </div>
\ No newline at end of file diff --git a/site/app/views/facebook/import.thtml b/site/app/views/facebook/import.thtml index 298e1bd..0b5436c 100644 --- a/site/app/views/facebook/import.thtml +++ b/site/app/views/facebook/import.thtml @@ -165,7 +165,7 @@ if ($action == 'results') { <div class="frame"> <h1>Detect Installed Add-ons</h1> <p>Select the add-ons below that you'd like to add to your list of favorite add-ons.<br><a href="#" onClick="document.getElementById('missing-addons').style.display=''; this.style.display='none';">Why are some of my add-ons missing?</a></p> - <p id="missing-addons" style="display: none;">If some of your installed add-ons aren't detected, it's probably because they are not hosted on <a href="http://addons.mozilla.org">Mozilla Add-ons</a>. Only add-ons hosted on <a href="http://addons.mozilla.org">Mozilla Add-ons</a> can be detected and listed in Rock Your Firefox.</p> + <p id="missing-addons" style="display: none;">If some of your installed add-ons aren't detected, it's probably because they are not hosted on <a href="<?=SITE_URL?>">Sugar Labs Activities</a>. Only add-ons hosted on <a href="<?=SITE_URL?>">Sugar Labs Activities</a> can be detected and listed in Rock Your Sugar.</p> <form action="<?=SITE_URL.$html->url('/facebookinstall/import/'.$fbUserSession.'/favorites')?>" method="post" id="form"> <table id="addons" width="100%"> <tr><td width="50%" valign="top"> diff --git a/site/app/views/facebook/install.thtml b/site/app/views/facebook/install.thtml index 3a01bef..cb0398e 100644 --- a/site/app/views/facebook/install.thtml +++ b/site/app/views/facebook/install.thtml @@ -57,7 +57,7 @@ function install() { InstallTrigger.install(params, goBack); } else { - window.location = 'http://addons.mozilla.org'; + window.location = '<?=SITE_URL?>'; } } diff --git a/site/app/views/facebook/outage.thtml b/site/app/views/facebook/outage.thtml index ac1b3f7..7daeefb 100644 --- a/site/app/views/facebook/outage.thtml +++ b/site/app/views/facebook/outage.thtml @@ -74,6 +74,6 @@ </div> <div class="outage-alternative"> In the meantime, check out all the other great ways that you can listen to music, check the weather, upload photos, block stuff you don't like, - and do whatever you like to do best on the web with <a href="http://addons.mozilla.org">Firefox Add-ons</a>. + and do whatever you like to do best on the web with <a href="<?=SITE_URL?>">Firefox Add-ons</a>. </div> </div>
\ No newline at end of file diff --git a/site/app/views/facebook/view.thtml b/site/app/views/facebook/view.thtml index 2c732eb..421109b 100644 --- a/site/app/views/facebook/view.thtml +++ b/site/app/views/facebook/view.thtml @@ -216,7 +216,7 @@ <div class="profileActions clearfix"> <?=(!empty($addon['Translation']['privacypolicy']['string']) ? '<a href="#" clicktotoggle="privacypolicy">Privacy Policy</a>' : '')?> <?=(!empty($addon['Translation']['homepage']['string']) ? '<a href="'.$addon['Translation']['homepage']['string'].'" target="_blank">Add-on Homepage</a>' : '')?> - <a href="https://addons.mozilla.org/addon/<?=$addon['Addon']['id']?>">Mozilla Add-ons Listing</a> + <a href="<?=SSITE_URL?>/addon/<?=$addon['Addon']['id']?>">Sugar Labs Activities Listing</a> </div> <div class="header"><h2>Recommended By</h2></div> diff --git a/site/app/views/layouts/ajax_with_css.thtml b/site/app/views/layouts/ajax_with_css.thtml index 119b787..f95ad0c 100644 --- a/site/app/views/layouts/ajax_with_css.thtml +++ b/site/app/views/layouts/ajax_with_css.thtml @@ -45,7 +45,7 @@ <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <base target="_top"> <?=$html->css('rustico')?> - <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false)?>" title="Mozilla Add-ons" /> + <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false)?>" title="Sugar Labs Activities" /> <link rel="shortcut icon" href="<?=$html->url('/img/favicon.ico', null, false)?>" type="image/x-icon" /> <?php if (!empty($cssAdd)) { diff --git a/site/app/views/layouts/facebook.thtml b/site/app/views/layouts/facebook.thtml index 244d981..f7a1a4c 100644 --- a/site/app/views/layouts/facebook.thtml +++ b/site/app/views/layouts/facebook.thtml @@ -91,7 +91,7 @@ if (empty($page)) { <div class="page-footer"> Mozilla is providing links to these applications as a courtesy, and makes no representations regarding the applications or any information related there to. - <span title="<?=php_uname('n')?>">Use</span> of this service is subject to the Mozilla <a href="https://addons.mozilla.org/en-US/firefox/pages/privacy">Privacy Policy</a> and <a href="http://www.mozilla.com/en-US/about/legal.html">Legal Notices</a>. + <span title="<?=php_uname('n')?>">Use</span> of this service is subject to the Mozilla <a href="<?=SSITE_URL?>/en-US/firefox/pages/privacy">Privacy Policy</a> and <a href="http://www.mozilla.com/en-US/about/legal.html">Legal Notices</a>. </div> </div> diff --git a/site/app/views/layouts/mozilla.thtml b/site/app/views/layouts/mozilla.thtml index 0b4aa62..706e7d1 100644 --- a/site/app/views/layouts/mozilla.thtml +++ b/site/app/views/layouts/mozilla.thtml @@ -84,7 +84,7 @@ } ?> - <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false, false)?>" title="Mozilla Add-ons"/> + <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->url('/AMOSearch.xml', null, false, false)?>" title="Sugar Labs Activities"/> <?php if (isset($addon) && ($addon['Addon']['addontype_id'] == ADDON_SEARCH)) : ?> <link rel="search" type="application/opensearchdescription+xml" href="<?=$html->urlFile($addon['Version'][0]['File'][0]['id'], $addon['Version'][0]['File'][0]['filename'])?>" locale="<?=$addon['Translation']['name']['locale']?>" title="<?=$addon['Translation']['name']['string']?>"/> <?php endif; ?> diff --git a/site/app/views/layouts/rss.thtml b/site/app/views/layouts/rss.thtml index e0b9232..bbcdb84 100644 --- a/site/app/views/layouts/rss.thtml +++ b/site/app/views/layouts/rss.thtml @@ -7,7 +7,7 @@ <language><?=strtolower(LANG) ?></language> <pubDate><?=$time->toRss(gmmktime()) ?></pubDate> <docs>http://blogs.law.harvard.edu/tech/rss</docs> - <generator>Mozilla Add-ons</generator> + <generator>Sugar Labs Activities</generator> <?php echo $content_for_layout; ?> diff --git a/site/app/views/pages/robots.txt.thtml b/site/app/views/pages/robots.txt.thtml index 29e090a..2f4ac9d 100644 --- a/site/app/views/pages/robots.txt.thtml +++ b/site/app/views/pages/robots.txt.thtml @@ -39,7 +39,7 @@ $this->layout = null; header('Content-Type: text/plain'); ?> -# robots.txt file for Mozilla Add-ons, addons.mozilla.org +# robots.txt file for <?=SITE_NAME?>, addons.mozilla.org User-agent: * <?php /* default: allow access to all pages on prod, disallow on preview */ diff --git a/site/app/views/statistics/rss/summary.thtml b/site/app/views/statistics/rss/summary.thtml index 0aae396..25ee7ca 100644 --- a/site/app/views/statistics/rss/summary.thtml +++ b/site/app/views/statistics/rss/summary.thtml @@ -75,7 +75,7 @@ echo $this->renderElement('rss_listitem', array( 'title' => sprintf(_('statistics_rss_title_statsfordate'), strftime(_('statistics_rss_title_fulldate'))), 'url' => SITE_URL.$html->url('/statistics/addon/'.$addon['Addon']['id']), 'description' => "<![CDATA[{$summary}]]>", - 'author' => 'Mozilla Add-ons', + 'author' => SITE_NAME, 'pubDate' => $time->toRss($today), 'permalink' => SITE_URL.$html->url('/statistics/addon/'.$addon['Addon']['id']).'/'.date('Ymd', $today) )); diff --git a/site/app/views/users/delete.thtml b/site/app/views/users/delete.thtml index 0d7968a..60297e3 100644 --- a/site/app/views/users/delete.thtml +++ b/site/app/views/users/delete.thtml @@ -68,7 +68,7 @@ echo '</p>'; echo sprintf(___('user_del_error_addons_more_questions', 'If you ' .'have additional questions, please contact %1$s for assistance.'), - $link->email('amo-editors@mozilla.org')); + $link->email('aslo-editors@sugarlabs.org')); break; case 'checkbox': echo ___('user_del_error_checkbox', 'You need to check the box "I ' @@ -83,7 +83,7 @@ echo sprintf(___('user_del_error_unknown', 'An unknown error occured ' .'deleting your account. Please contact %1$s with the issue and ' .'we will delete it for you. We apologize for the inconvenience.'), - $link->email('amo-admins@mozilla.org')); + $link->email(ADMIN_EMAIL)); break; } ?> @@ -92,12 +92,12 @@ <h1><?php echo sprintf(___('user_del_header_delete_account', 'Delete User Account %s'), $useremail)?></h1> - <p><?=___('user_del_community_sad', 'The Mozilla Add-ons community is sad to see you go.')?></p> + <p><?=___('user_del_community_sad', 'The Sugar Labs Activity community is sad to see you go.')?></p> <p><?php sprintf(___('user_del_specific_problem_editors', 'If you have a ' .'specific problem we may help you with, please do not delete your account ' .'now, but contact us at %1$s and we will do our best to assist you in ' - .'solving it.'), $link->email('amo-editors@mozilla.org'))?></p> + .'solving it.'), $link->email('aslo-editors@sugarlabs.org'))?></p> <div class="corner-box"> <h2><?=___('user_del_header_confirm_deletion', 'Confirm account deletion')?></h2> @@ -105,7 +105,7 @@ <p><?=___('user_del_permanently_removed_means', 'By clicking "delete" your ' .'account is going to be <strong>permanently removed</strong>. That means:')?> <ul> - <li><?=___('user_del_nologin', 'You will not be able to log into Mozilla Add-ons anymore.')?></li> + <li><?=___('user_del_nologin', 'You will not be able to log into Sugar Labs Activities anymore.')?></li> <li><?=___('user_del_reviews_anonymized', 'Your reviews and ratings will ' .'not be deleted, but they will no longer be associated with you.')?></li> </ul> diff --git a/site/app/webroot/AMOSearch.xml b/site/app/webroot/AMOSearch.xml index 1feba30..f10422b 100644 --- a/site/app/webroot/AMOSearch.xml +++ b/site/app/webroot/AMOSearch.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/"> - <ShortName>Mozilla Add-ons</ShortName> + <ShortName>Sugar Labs Activities</ShortName> <Url type="text/html" method="get" - template="http://addons.mozilla.org/search/?q={searchTerms}"> + template="http://activities.sugarlabs.org/search/?q={searchTerms}"> </Url> <Image height="16" width="16">data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAABHNCSVQICAgIfAhkiAAAAAlwSFlz%0D%0AAAAN1wAADdcBQiibeAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAKoSURB%0D%0AVDiNjZNLaJRnFIaf75vvy2UGTWr8NYkxl0IFUYkNXSSZQNWFWlxIEVy1FLLo0i4adddVXRnS4kJw%0D%0AYxci2GaRTWlSFGKFGRXNmFBF62VMO4TENBdjMv9k5p%2F%2FOy4SLzgqHs7yPc95eTlHiQjvqniPbVYR%0D%0AzuBoR%2BFQDEvId4neIPNCY945DayNVff%2F8NUvn9XXNJMv5hhKnTvYP3ymHmj%2FIMBSbmHjjP8fycxv%0D%0A%2BMEzGqtatUI1vK7R7wM4J32XUv3Li%2Fl5imGBkbtXlsMw%2FPF1jXozg3iP3aM0Z8XRBFDr1fl7Og9E%0D%0AnTguXx30p%2F6fjAIozb%2Fi6C4BdB2z6QOfH27ZUFNL0QUELs%2Ftycs4J2zdGEerCADTM1P8df3PxyUZ%0D%0AiKPF8zyGHpwGFLC6QCCRuYA4QQQ6mw4hjhYT77GN2qiBWFnV5sXc0xMAgfKx5foVYKURB2vLPbxo%0D%0AM8auODE6ws%2FfH%2B77dHtjhxp5OHzywpWf%2FIIsRk25Rq0CRFY4UVNNndkmqZFRf3YuWaYUS0aE3RP5%0D%0AMXX3%2FiCOgu3Y1WYfL90sdSDgxRoYTY5mZ2anjwC%2FAqEBdM4tMJ4dwYs1YiOGSBkYrVHqlQNxoC34%0D%0AOV8BdxK9gQ%2Bguo7bwdYdrXu92nU6nR7Pzc%2FPSXxfazTj30IpRaWpIqbX4UQoBDkWJlRwLzVeLBTy%0D%0AGs2UcUX5duzvsfPqNpvDovQhnBIdELGaWFk1hclYmLx2fxmFbNm5qXJNvdi2DQ1WAsO1P%2F5petsh%0D%0Ayf6v25gJ0nxUUUeiP531s%2FkvAcor7MDOL2pjz3JzVKpqUoMTpb8QsSqdeTT98fomjyDv8LP5aKI3%0D%0AuAgQP2orCkGAVRVMZxbQhnQJIAzkm3s3Js6GSfkEQEd4%2Bbpa8%2BTW71P1ANqoB65I93OA2DgV%2BZ%2Bo%0D%0AmgAAAABJRU5ErkJggg%3D%3D</Image> <OutputEncoding>UTF-8</OutputEncoding> diff --git a/site/app/webroot/img/app-icons/sugar_small.png b/site/app/webroot/img/app-icons/sugar_small.png Binary files differnew file mode 100644 index 0000000..20eae85 --- /dev/null +++ b/site/app/webroot/img/app-icons/sugar_small.png |
