Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/Actions/lang/en.json4
m---------plugins/CustomDimensions0
-rw-r--r--plugins/MobileMessaging/lang/en.json2
-rw-r--r--plugins/UsersManager/lang/en.json2
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml4
-rw-r--r--tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml4
6 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Actions/lang/en.json b/plugins/Actions/lang/en.json
index 27c9b2f72f..91d219f81b 100644
--- a/plugins/Actions/lang/en.json
+++ b/plugins/Actions/lang/en.json
@@ -29,10 +29,10 @@
"ColumnIdPageview": "Pageview ID",
"ColumnInteractionPosition": "Interaction Position",
"DownloadsReportDocumentation": "In this report, you can see which files your visitors have downloaded. %s What Piwik counts as a download is the click on a download link. Whether the download was completed or not isn't known to Piwik.",
- "EntryPagesReportDocumentation": "This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during his visit. %s The entry URLs are displayed as a folder structure.",
+ "EntryPagesReportDocumentation": "This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during their visit. %s The entry URLs are displayed as a folder structure.",
"EntryPageTitles": "Entry page titles",
"EntryPageTitlesReportDocumentation": "This report contains information about the titles of entry pages that were used during the specified period.",
- "ExitPagesReportDocumentation": "This report contains information about the exit pages that occurred during the specified period. An exit page is the last page that a user views during his visit. %s The exit URLs are displayed as a folder structure.",
+ "ExitPagesReportDocumentation": "This report contains information about the exit pages that occurred during the specified period. An exit page is the last page that a user views during their visit. %s The exit URLs are displayed as a folder structure.",
"ExitPageTitles": "Exit page titles",
"ExitPageTitlesReportDocumentation": "This report contains information about the titles of exit pages that occurred during the specified period.",
"LearnMoreAboutSiteSearchLink": "Learn more about Tracking how your visitors use your Search engine.",
diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions
-Subproject 4e0fdd35cfece7be43b65191ff1f1ae71f0acb0
+Subproject 3e7defb258ffb89ba2e9e2a98d38962fb2acfcc
diff --git a/plugins/MobileMessaging/lang/en.json b/plugins/MobileMessaging/lang/en.json
index 8414a84ef6..92f5581bda 100644
--- a/plugins/MobileMessaging/lang/en.json
+++ b/plugins/MobileMessaging/lang/en.json
@@ -27,7 +27,7 @@
"Settings_PhoneNumbers_Add": "Add a new Phone Number",
"Settings_PhoneNumbers_CountryCode_Help": "If you do not know the phone country code, look for your country here.",
"Settings_PhoneNumbers_Help": "Before receiving SMS (text messages) reports on a phone, the phone number must be entered below.",
- "Settings_PhoneNumbers_HelpAdd": "When you click \"Add\", a SMS containing a code will be sent to the phone. The user receiving the code should then login to Piwik, click on Settings, then click on Mobile Messaging. After entering the code, the user will be able to receive text reports on his phone.",
+ "Settings_PhoneNumbers_HelpAdd": "When you click \"Add\", a SMS containing a code will be sent to the phone. The user receiving the code should then login to Piwik, click on Settings, then click on Mobile Messaging. After entering the code, the user will be able to receive text reports on their phone.",
"Settings_PleaseSignUp": "To create SMS reports and receive short text messages with your websites' stats on your mobile phone, please sign up with the SMS API and enter your information below.",
"Settings_SMSAPIAccount": "Manage SMS API Account",
"Settings_SMSProvider": "SMS Provider",
diff --git a/plugins/UsersManager/lang/en.json b/plugins/UsersManager/lang/en.json
index 3fdedcc01f..d6333ddcdc 100644
--- a/plugins/UsersManager/lang/en.json
+++ b/plugins/UsersManager/lang/en.json
@@ -63,7 +63,7 @@
"TheLoginScreen": "The login screen",
"ThereAreCurrentlyNRegisteredUsers": "There are currently %s registered users.",
"TokenAuth": "API Authentication Token",
- "TokenRegenerateConfirm": "Changing the API authentication token will invalidate the user's current token. If the user is currently logged in, he may be required to log in again. Do you really want to continue?",
+ "TokenRegenerateConfirm": "Changing the API authentication token will invalidate the user's current token. If the user is currently logged in, they may be required to log in again. Do you really want to continue?",
"TokenRegenerateConfirmSelf": "Changing the API authentication token will invalidate your own token. You may be required to log in again if you proceed. Do you really want to change your authentication token?",
"TokenRegenerateLogoutWarning": "When you re-generate your token you will be logged out and need to log in again.",
"TokenRegenerateTitle": "Regenerate",
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
index b89ff58332..1622d19eba 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml
@@ -50,7 +50,7 @@
</row>
<row>
<name>Entry pages (Actions)</name>
- <documentation>This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during his visit. &lt;br /&gt; The entry URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
+ <documentation>This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during their visit. &lt;br /&gt; The entry URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
</row>
<row>
<name>Exit page titles (Actions)</name>
@@ -58,7 +58,7 @@
</row>
<row>
<name>Exit pages (Actions)</name>
- <documentation>This report contains information about the exit pages that occurred during the specified period. An exit page is the last page that a user views during his visit. &lt;br /&gt; The exit URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
+ <documentation>This report contains information about the exit pages that occurred during the specified period. An exit page is the last page that a user views during their visit. &lt;br /&gt; The exit URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
</row>
<row>
<name>Keywords (Referrers)</name>
diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
index f76ad01380..50e1fd9532 100644
--- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
+++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
@@ -1118,7 +1118,7 @@
<module>Actions</module>
<action>getEntryPageUrls</action>
<dimension>Entry Page URL</dimension>
- <documentation>This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during his visit. &lt;br /&gt; The entry URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
+ <documentation>This report contains information about the entry pages that were used during the specified period. An entry page is the first page that a user views during their visit. &lt;br /&gt; The entry URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
<metrics>
<entry_nb_visits>Entrances</entry_nb_visits>
<entry_bounce_count>Bounces</entry_bounce_count>
@@ -1191,7 +1191,7 @@
<module>Actions</module>
<action>getExitPageUrls</action>
<dimension>Exit Page URL</dimension>
- <documentation>This report contains information about the exit pages that occurred during the specified period. An exit page is the last page that a user views during his visit. &lt;br /&gt; The exit URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
+ <documentation>This report contains information about the exit pages that occurred during the specified period. An exit page is the last page that a user views during their visit. &lt;br /&gt; The exit URLs are displayed as a folder structure.&lt;br /&gt;Use the plus and minus icons on the left to navigate.</documentation>
<metrics>
<exit_nb_visits>Exits</exit_nb_visits>
<nb_visits>Unique Pageviews</nb_visits>