diff --git a/lang/en.json b/lang/en.json
index 73d903391d2..8c3f03167c3 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -764,7 +764,7 @@
         "StepThemeSuccessfullyInstalled": "You have successfully installed the theme %1$s %2$s.",
         "StepThemeSuccessfullyUpdated": "You have successfully updated the theme %1$s %2$s.",
         "ActionActivateTheme": "Activate theme",
-        "BackToExtendPiwik": "Back to Extend Piwik",
+        "BackToExtendPiwik": "Back to Marketplace",
         "StepDownloadingPluginFromMarketplace": "Downloading plugin from Marketplace",
         "StepUnzippingPlugin": "Unzipping plugin",
         "StepPluginSuccessfullyInstalled": "You have successfully installed the plugin %1$s %2$s.",
@@ -789,7 +789,13 @@
         "PluginWebsite": "Plugin Website",
         "Activity": "Activity",
         "ByXDevelopers": "by %s developers",
-        "LastCommitTime": "(last commit %s})"
+        "LastCommitTime": "(last commit %s})",
+        "InfoThemeIsUsedByOtherUsersAsWell": "Note: the other %1$s users registered in this Piwik are also using the theme %2$s.",
+        "NumUpdatesAvailable": "%s Update(s) available",
+        "InfoThemeUpdateIsRecommended": "Update your themes to enjoy the latest version.",
+        "InfoPluginUpdateIsRecommended": "Update your plugins now to benefit from the latest improvements."
+        "NumDownloadsLatestVersion": "Latest version: %s Downloads",
+        "EnjoyAnotherLookAndFeelOfThemes": "Enjoy another look & feel"
     },
     "CoreUpdater": {
         "PluginDescription": "Piwik updating mechanism",
diff --git a/plugins/CorePluginsAdmin/templates/extend.twig b/plugins/CorePluginsAdmin/templates/extend.twig
index 17ace18371d..2ad91038db7 100644
--- a/plugins/CorePluginsAdmin/templates/extend.twig
+++ b/plugins/CorePluginsAdmin/templates/extend.twig
@@ -50,7 +50,7 @@
             </div>
 
             <div class="byThemes">
-                <h3 class="header">Enjoy another look & feel</h3>
+                <h3 class="header">{{ 'CorePluginsAdmin_EnjoyAnotherLookAndFeelOfThemes'|translate }}</h3>
                 <span class="callToAction">by <a href="{{ linkTo({'action':'browseThemes', 'sort': ''}) }}">installing a new theme from the Marketplace</a></span>
 
                 <p>
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index 679b3f67ac5..ecc130a39d9 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -21,7 +21,7 @@
                     </td>
                     <td class="vers">
                         {% if plugin.repositoryChangelogUrl %}
-                            <a href="javascript:false;" title="Changelog" data-activePluginTab="changelog" data-pluginName="{{ plugin.name|e('html_attr') }}">{{ plugin.currentVersion }} => {{ plugin.latestVersion }}</a>
+                            <a href="javascript:false;" title="{{ 'CorePluginsAdmin_Changelog'|translate }}" data-activePluginTab="changelog" data-pluginName="{{ plugin.name|e('html_attr') }}">{{ plugin.currentVersion }} => {{ plugin.latestVersion }}</a>
                         {% else %}
                             {{ plugin.currentVersion }} => {{ plugin.latestVersion }}
                         {% endif %}
diff --git a/plugins/CorePluginsAdmin/templates/pluginDetails.twig b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
index 7ed857445ed..a8902ae571a 100644
--- a/plugins/CorePluginsAdmin/templates/pluginDetails.twig
+++ b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
@@ -7,6 +7,8 @@
             {{ errorMessage }}
         {% elseif plugin %}
 
+            {% set latestVersion = plugin.versions[plugin.versions|length - 1] %}
+
             <div class="header">
                 <div class="intro" style="width:75%;float:left;">
                     <h2>{{ plugin.name }}</h2>
@@ -39,25 +41,25 @@
                     <div id="pluginDetailsTabs">
                         <ul>
                             <li><a href="#tabs-description">{{ 'General_Description'|translate }}</a></li>
-                            {% if plugin.versions[plugin.versions|length - 1].readmeHtml.faq %}
+                            {% if latestVersion.readmeHtml.faq %}
                                 <li><a href="#tabs-faq">{{ 'General_Faq'|translate }}</a></li>
                             {% endif %}
                             <li><a href="#tabs-changelog">{{ 'CorePluginsAdmin_Changelog'|translate }}</a></li>
                             {% if plugin.screenshots|length %}
                                 <li><a href="#tabs-screenshots">{{ 'CorePluginsAdmin_Screenshots'|translate }}</a></li>
                             {% endif %}
-                            {% if plugin.versions[plugin.versions|length - 1].readmeHtml.support %}
+                            {% if latestVersion.readmeHtml.support %}
                                 <li><a href="#tabs-support">{{ 'CorePluginsAdmin_Support'|translate }}</a></li>
                             {% endif %}
                         </ul>
 
                         <div id="tabs-description">
-                            {{ plugin.versions[plugin.versions|length - 1].readmeHtml.description|raw }}
+                            {{ latestVersion.readmeHtml.description|raw }}
                         </div>
 
-                        {% if plugin.versions[plugin.versions|length - 1].readmeHtml.faq %}
+                        {% if latestVersion.readmeHtml.faq %}
                             <div id="tabs-faq">
-                                {{ plugin.versions[plugin.versions|length - 1].readmeHtml.faq|raw }}
+                                {{ latestVersion.readmeHtml.faq|raw }}
                             </div>
                         {% endif %}
 
@@ -68,8 +70,8 @@
                                 </p>
                             {% endif %}
 
-                            {% if plugin.versions[plugin.versions|length - 1].readmeHtml.changelog %}
-                                {{ plugin.versions[plugin.versions|length - 1].readmeHtml.changelog|raw }}
+                            {% if latestVersion.readmeHtml.changelog %}
+                                {{ latestVersion.readmeHtml.changelog|raw }}
                             {% endif %}
 
                             <h3>{{ 'CorePluginsAdmin_History'|translate }}</h3>
@@ -86,7 +88,7 @@
                                                 {% endif %}
                                             </strong>
                                         {% endset %}
-                                        {{ 'CorePluginsAdmin_PluginVersionInfo'|translate(versionName, version.release) }}
+                                        {{ 'CorePluginsAdmin_PluginVersionInfo'|translate(versionName, version.release)|raw }}
                                         </li>
                                 {% endfor %}
                             </ul>
@@ -109,10 +111,10 @@
                             </div>
                         {% endif %}
 
-                        {% if plugin.versions[plugin.versions|length - 1].readmeHtml.support %}
+                        {% if latestVersion.readmeHtml.support %}
                             <div id="tabs-support">
 
-                                {{ plugin.versions[plugin.versions|length - 1].readmeHtml.support|raw }}
+                                {{ latestVersion.readmeHtml.support|raw }}
 
                             </div>
                         {% endif %}
@@ -129,7 +131,7 @@
                         <dt>{{ 'CorePluginsAdmin_LastUpdated'|translate }}</dt>
                         <dd>{{ plugin.lastUpdated }}</dd>
                         <dt>{{ 'General_Downloads'|translate }}</dt>
-                        <dd title="Latest version: {{ plugin.versions[plugin.versions|length - 1].numDownloads|number_format }} Downloads">{{ plugin.numDownloads }}</dd>
+                        <dd title="{{ 'CorePluginsAdmin_NumDownloadsLatestVersion'|translate(latestVersion.numDownloads|number_format) }}">{{ plugin.numDownloads }}</dd>
                         <dt>{{ 'CorePluginsAdmin_Developer'|translate }}</dt>
                         <dd>{{ pluginsMacro.pluginDeveloper(plugin.owner) }}</dd>
                         <dt>{{ 'CorePluginsAdmin_Authors'|translate }}</dt>
diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig
index 9062e315e23..37cade2ec45 100644
--- a/plugins/CorePluginsAdmin/templates/plugins.twig
+++ b/plugins/CorePluginsAdmin/templates/plugins.twig
@@ -8,7 +8,7 @@
     {% if pluginsHavingUpdate|length %}
         <h2>{{ pluginsHavingUpdate|length }} Update(s) available</h2>
 
-        <p>{{ 'Update your plugins now to benefit from the latest improvements.'|translate }}</p>
+        <p>{{ 'CorePluginsAdmin_InfoPluginUpdateIsRecommended'|translate }}</p>
 
         {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, activateNonce, 0) }}
     {% endif %}
diff --git a/plugins/CorePluginsAdmin/templates/themes.twig b/plugins/CorePluginsAdmin/templates/themes.twig
index b0feab6b064..7fafac6c106 100644
--- a/plugins/CorePluginsAdmin/templates/themes.twig
+++ b/plugins/CorePluginsAdmin/templates/themes.twig
@@ -6,9 +6,9 @@
 <div style="max-width:980px;">
 
     {% if pluginsHavingUpdate|length %}
-        <h2>{{ pluginsHavingUpdate|length }} Update(s) available</h2>
+        <h2>{{ 'CorePluginsAdmin_NumUpdatesAvailable'|translate(pluginsHavingUpdate|length) }}</h2>
 
-        <p>{{ 'Update your themes to enjoy the latest version.'|translate }}</p>
+        <p>{{ 'CorePluginsAdmin_InfoThemeUpdateIsRecommended'|translate }}</p>
 
         {{ plugins.tablePluginUpdates(pluginsHavingUpdate, updateNonce, true) }}
     {% endif %}
@@ -17,7 +17,7 @@
 
     <p>{{ 'CorePluginsAdmin_ThemesDescription'|translate }}
     {% if otherUsersCount > 0 %}
-        <br/> Note: the other {{ otherUsersCount }} users registered in this Piwik are also using the theme {{ themeEnabled }}.
+        <br/> {{ 'CorePluginsAdmin_InfoThemeIsUsedByOtherUsersAsWell'|translate(otherUsersCount, themeEnabled) }}
     {% endif %}
     </p>