diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 06:29:18 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 06:29:18 +0300 |
commit | 3eb0cf055146c0b77b592cf9ef4bf2eb2e2f1ca3 (patch) | |
tree | 99817781db0a0626fa4d14f96697f6e04e66f983 /plugins/UserLanguage | |
parent | 1854f5c456a76af807431d52bcb19ad207ba658e (diff) | |
parent | 0f38083969261b95a00c59f1f5596d35365506cd (diff) |
Merge branch 'master' into 3.0-m03
Conflicts:
core/Version.php
core/WidgetsList.php
plugins/CustomDimensions
plugins/Goals/templates/getGoalReportView.twig
plugins/Goals/templates/getOverviewView.twig
tests/UI/expected-ui-screenshots
Diffstat (limited to 'plugins/UserLanguage')
-rw-r--r-- | plugins/UserLanguage/lang/fi.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/UserLanguage/lang/fi.json b/plugins/UserLanguage/lang/fi.json index 57a7794cc9..140e43780b 100644 --- a/plugins/UserLanguage/lang/fi.json +++ b/plugins/UserLanguage/lang/fi.json @@ -1,6 +1,7 @@ { "UserLanguage": { "BrowserLanguage": "Selaimen kieli", - "LanguageCode": "Kielikoodi" + "LanguageCode": "Kielikoodi", + "PluginDescription": "Raportoi käyttäjän selaimen kieliasetukset." } }
\ No newline at end of file |