diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2014-06-18 04:04:56 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2014-06-18 04:04:56 +0400 |
commit | 69b4a70048ea681bc62bca79abe7c763f2233a60 (patch) | |
tree | 070b876a73f9402664f624e73de74ed4165518f5 /lang/en.json | |
parent | 031a2de96a2a3ec3f5f395977ee6c0c822b119b3 (diff) | |
parent | 02ffeeb228f88d6053edf777d094b34c47b086b4 (diff) |
Merge remote-tracking branch 'origin/master' into report_and_dimension_refactoring
Conflicts:
core/Tracker/Settings.php
core/Tracker/Visit.php
plugins/Actions/Widgets.php
plugins/CustomVariables/Widgets.php
plugins/DevicesDetection/DevicesDetection.php
plugins/DevicesDetection/Widgets.php
plugins/Events/Widgets.php
plugins/Provider/Widgets.php
plugins/UserCountry/Widgets.php
plugins/UserSettings/Widgets.php
plugins/VisitTime/Widgets.php
plugins/VisitorInterest/Widgets.php
Diffstat (limited to 'lang/en.json')
-rw-r--r-- | lang/en.json | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lang/en.json b/lang/en.json index 55b3e6872b..a44f85bbb7 100644 --- a/lang/en.json +++ b/lang/en.json @@ -1045,7 +1045,6 @@ }, "Installation": { "CollaborativeProject": "Piwik is a collaborative project, built with love by people from all over the world.", - "CommunityNewsletter": "email me with community updates (new plugins, new features, etc.)", "ConfigurationHelp": "Your Piwik configuration file appears to be misconfigured. You can either remove config\/config.ini.php and resume installation, or correct the database connection settings.", "ConfirmDeleteExistingTables": "Are you sure you want to delete the tables: %s from your database? WARNING: DATA FROM THESE TABLES CANNOT BE RECOVERED!", "Congratulations": "Congratulations", @@ -1091,7 +1090,8 @@ "Requirements": "Piwik Requirements", "RestartWebServer": "After making this change, restart your web server.", "ReusingTables": "Reusing the Tables", - "SecurityNewsletter": "email me with major Piwik upgrades and security alerts", + "PiwikOrgNewsletter": "email me with major Piwik community updates", + "PiwikProNewsletter": "I am interested in %sPiwik PRO%s services (no more than 1 email a month)", "SeeBelowForMoreInfo": "See below for more information.", "SetupWebsite": "Setup a Website", "SetupWebsiteError": "There was an error when adding the website", @@ -1153,6 +1153,7 @@ "SystemCheckZlibHelp": "You need to configure and rebuild PHP with \"zlib\" support enabled, --with-zlib.", "SystemCheckCronArchiveProcess": "Archive Cron", "SystemCheckCronArchiveProcessCLI": "Managing processes via CLI", + "SystemCheckSessionAutostart": "To prevent some issues please set the following in your php.ini file: session.auto_start=0", "NotSupported": "not supported", "Tables": "Creating the Tables", "TablesCreatedSuccess": "Tables created with success!", |