diff options
| author | sgiehl <stefan@piwik.org> | 2014-11-18 01:01:00 +0300 |
|---|---|---|
| committer | sgiehl <stefan@piwik.org> | 2014-11-18 01:01:00 +0300 |
| commit | 387879216d90065eb66c41ff143dab3c57666df9 (patch) | |
| tree | 7313f69acd2b1d5eb45af5c129982936a094c31b /plugins/Contents | |
| parent | cfcd7ff844dbbf36aaf094345cfbc4743724e68a (diff) | |
| parent | 9dca69878af18573bcc7e00d7e25880eb3711305 (diff) | |
Merge branch 'master' into deprecate_usersettings
Conflicts:
tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
Diffstat (limited to 'plugins/Contents')
| -rw-r--r-- | plugins/Contents/lang/fr.json | 9 | ||||
| -rw-r--r-- | plugins/Contents/lang/tl.json | 12 |
2 files changed, 20 insertions, 1 deletions
diff --git a/plugins/Contents/lang/fr.json b/plugins/Contents/lang/fr.json index 3d03a8af80..230b57b32e 100644 --- a/plugins/Contents/lang/fr.json +++ b/plugins/Contents/lang/fr.json @@ -1,5 +1,12 @@ { "Contents": { - "Contents": "Contenus" + "ContentName": "Nom du contenu", + "ContentPiece": "Partie du contenu", + "Contents": "Contenus", + "ContentTarget": "Cible du contenu", + "Impressions": "Impressions", + "Interaction": "Interaction", + "InteractionRate": "Taux d'interaction", + "Interactions": "Interactions" } }
\ No newline at end of file diff --git a/plugins/Contents/lang/tl.json b/plugins/Contents/lang/tl.json new file mode 100644 index 0000000000..df78c43854 --- /dev/null +++ b/plugins/Contents/lang/tl.json @@ -0,0 +1,12 @@ +{ + "Contents": { + "ContentName": "Pangalan ng Nilalaman", + "ContentPiece": "Piraso ng Nilalaman", + "Contents": "Mga Nilalaman", + "ContentTarget": "Target ng Nilalaman", + "Impressions": "Mga Impresyon", + "Interaction": "Pakikipag-ugnayan", + "InteractionRate": "Rate ng Pakikipag-ugnayan", + "Interactions": "Mga Pakikipag-ugnayan" + } +}
\ No newline at end of file |