Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mention Matomo is formerly known as Piwik in help page #12440

Merged
merged 2 commits into from
Jan 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@
"Password": "Password",
"Period": "Period",
"Piechart": "Piechart",
"PiwikIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "%1$sMatomo%2$s is a collaborative project brought to you by the %7$sMatomo team%8$s members as well as many other contributors around the globe. <br/> If you're a fan of Matomo, you can help: find out %3$sHow to participate in Matomo%4$s, or %5$sdonate now%6$s to help fund the next great Matomo release!",
"MatomoIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "%1$sMatomo%2$s, formerly known as Piwik, is a collaborative project brought to you by the %7$sMatomo team%8$s members as well as many other contributors around the globe. <br/> If you're a fan of Matomo, you can help: find out %3$sHow to participate in Matomo%4$s, or %5$sdonate now%6$s to help fund the next great Matomo release!",
"PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s is available. Please notify the %2$sMatomo administrator%3$s.",
"PiwikXIsAvailablePleaseUpdateNow": "Matomo %1$s is available. %2$sPlease update now!%3$s (see %4$schanges%5$s).",
"PleaseContactYourPiwikAdministrator": "Please contact your Matomo administrator.",
Expand Down
2 changes: 1 addition & 1 deletion plugins/Feedback/templates/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<div piwik-content-block
content-title="{{ headline|e('html_attr') }}"
feature="{{ 'General_Help'|translate|e('html_attr') }}">
<p>{{ 'General_PiwikIsACollaborativeProjectYouCanContributeAndDonateNextRelease'|translate(
<p>{{ 'General_MatomoIsACollaborativeProjectYouCanContributeAndDonateNextRelease'|translate(
"<a href='?module=Proxy&action=redirect&url=https://matomo.org' target='_blank'>",
"</a>",
"<a target='_blank' href='?module=Proxy&action=redirect&url=https://matomo.org/get-involved/'>",
Expand Down