Merge branch 'master' into about_piwik_page_experiment

Conflicts:
	lang/en.json

1 files changed, 8 insertions, 6 deletions

diff --git a/lang/en.json b/lang/en.json
index dd2aa5437d..5a079b7efe 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -437,7 +437,8 @@
         "ViewDocumentationFor": "View documentation for %1$s",
         "WellDone": "Well done!",
         "All": "All",
-        "Segment": "Segment"
+        "Segment": "Segment",
+        "TimeAgo": "%s ago"
     },
     "Actions": {
         "PluginDescription": "Reports about the page views, the outlinks and downloads. Outlinks and Downloads tracking is automatic! You can also track your internal website's Search Engine.",
@@ -813,7 +814,7 @@
         "ByInstallingNewThemeFromMarketplace": "by %sinstalling a new theme from the Marketplace%s",
         "ByWritingOwnPlugin": "by %swriting your own plugin%s",
         "OrByUploadingAPlugin": "or by %suploading a plugin%s",
-        "ByDesigningOwnTheme": "by %sdesign your own theme%s",
+        "ByDesigningOwnTheme": "by %sdesigning your own theme%s",
         "OrByUploadingATheme": "or by %suploading a theme%s",
         "CorePluginTooltip": "Core plugins have no version since they are distributed with Piwik.",
         "MissingRequirementsNotice": "Please update %1$s %2$s to a newer version, %1$s %3$s is required."
@@ -939,9 +940,9 @@
         "ThankYou": "Thank you for helping us to make Piwik better!",
         "RateFeatureTitle": "Do you like the '%s' feature? Please rate and leave a comment",
         "RateFeatureThankYouTitle": "Thank you for rating '%s'!",
-        "RateFeatureLeaveMessageLike": "We are glad you like it! Please let us know what you like the most or if you miss a feature.",
-        "RateFeatureLeaveMessageDislike": "We are sorry to hear you don't like it! Please let us know what we can improve.",
-        "RateFeatureSendFeedbackInformation": "Your Piwik will send us an email containing your email address to let us get in contact with you in case there are questions.",
+        "RateFeatureLeaveMessageLike": "We are glad you like it! Please let us know what you like the most or if you have a feature request.",
+        "RateFeatureLeaveMessageDislike": "We are sorry to hear you don't like it! Please let us know how we can improve.",
+        "RateFeatureSendFeedbackInformation": "Your Piwik platform will send us (the Piwik team) an email (including your email address) so we can get in contact with you if you have any question.",
         "TopLinkTooltip": "Tell us what you think, or request Professional Support.",
         "WantToThankConsiderDonating": "Do you think Piwik is awesome and want to thank us?",
         "PrivacyClaim": "Piwik respects your %1$sprivacy%2$s and gives you full control over your data.",
@@ -2208,7 +2209,8 @@
         "ExceptionAccessValues": "The parameter access must have one of the following values : [ %s ]",
         "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth is expecting a MD5-hashed password (32 chars long string). Please call the md5() function on the password before calling this method.",
         "InjectedHostCannotChangePwd": "You are currently visiting with an unknown host (%1$s). You cannot change your password until this problem is fixed.",
-        "EmailYourAdministrator": "%1$sE-mail your administrator about this problem%2$s."
+        "EmailYourAdministrator": "%1$sE-mail your administrator about this problem%2$s.",
+        "LastSeen": "Last seen"
     },
     "VisitFrequency": {
         "PluginDescription": "Reports various statistics about the Returning Visitor versus the First time visitor.",