cleaned up some more duplicate keys/translations

3 files changed, 11 insertions, 11 deletions

diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig
index 24916b1434..cc09700869 100644
--- a/plugins/Live/templates/_actionsList.twig
+++ b/plugins/Live/templates/_actionsList.twig
@@ -42,14 +42,14 @@
                 <span {% if not isWidget %}style='margin-left:20px;'{% endif %}>
                     {% if action.type == 'ecommerceOrder' %}
                     <abbr title="
-                        {{ 'Live_GoalRevenue'|translate }}: {{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}
+                        {{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}
                         {% if action.revenueSubTotal is not empty %} - {{ 'General_Subtotal'|translate }}: {{ action.revenueSubTotal|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
                         {% if action.revenueTax is not empty %} - {{ 'General_Tax'|translate }}: {{ action.revenueTax|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
                         {% if action.revenueShipping is not empty %} - {{ 'General_Shipping'|translate }}: {{ action.revenueShipping|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
                         {% if action.revenueDiscount is not empty %} - {{ 'General_Discount'|translate }}: {{ action.revenueDiscount|money(javascriptVariablesToSet.idSite)|raw }}{% endif %}
-                        ">{{ 'Live_GoalRevenue'|translate }}:
+                        ">{{ 'General_ColumnRevenue'|translate }}:
                     {% else %}
-                        {% set revenueLeft %}{{ 'Live_GoalRevenue'|translate }}{% endset %}
+                        {% set revenueLeft %}{{ 'General_ColumnRevenue'|translate }}{% endset %}
                         {{ 'Goals_LeftInCart'|translate(revenueLeft) }}:
                     {% endif %}
                         <strong>{{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}</strong>
@@ -103,7 +103,7 @@
                 {# Goal conversion #}
                 <img src="{{ action.icon }}" />
                 <strong>{{ action.goalName }}</strong>
-                {% if action.revenue > 0 %}, {{ 'Live_GoalRevenue'|translate }}:
+                {% if action.revenue > 0 %}, {{ 'General_ColumnRevenue'|translate }}:
                     <strong>{{ action.revenue|money(javascriptVariablesToSet.idSite)|raw }}</strong>
                 {% endif %}
             {% endif %}
diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig
index cacdf68120..80a4d31420 100644
--- a/plugins/Live/templates/getLastVisitsStart.twig
+++ b/plugins/Live/templates/getLastVisitsStart.twig
@@ -9,7 +9,7 @@
                 <span style="display:none;" class="serverTimestamp">{{ visitor.serverTimestamp|raw }}</span>
                 {{ visitor.serverDatePretty }} - {{ visitor.serverTimePretty }} {% if visitor.visitDuration > 0 %}<em>({{ visitor.visitDurationPretty|raw }})</em>{% endif %}
                 &nbsp;<img src="{{ visitor.countryFlag }}" title="{{ visitor.location }}, {{ 'Provider_ColumnProvider'|translate }} {{ visitor.providerName }}"/>
-                &nbsp;<img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'UserSettings_Plugins'|translate }}: {{ visitor.plugins }}"/>
+                &nbsp;<img src="{{ visitor.browserIcon }}" title="{{ visitor.browserName }}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}"/>
                 &nbsp;<img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}, {{ visitor.resolution }}"/>
                 &nbsp;
                 {% if visitor.visitConverted %}
@@ -76,10 +76,10 @@
                                 {% endif %}
                                 -
                                 {% if action.type == 'ecommerceOrder' %}
-                                    {{ 'Live_GoalRevenue'|translate }}:
+                                    {{ 'General_ColumnRevenue'|translate }}:
                                 {% else %}
                                     {% set revenueLeft %}
-                                        {{ 'Live_GoalRevenue'|translate }}
+                                        {{ 'General_ColumnRevenue'|translate }}
                                     {% endset %}
                                     {{ 'Goals_LeftInCart'|translate(revenueLeft) }}:
                                 {% endif %}
@@ -93,7 +93,7 @@
                             <span title="{{ title }}">
 						        <img class='iconPadding' src="{{ action.icon }}"/>
                                 {% if action.type == 'ecommerceOrder' %}
-                                    {{ 'Live_GoalRevenue'|translate }}: {{ action.revenue|money(idSite) }}
+                                    {{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(idSite) }}
                                 {% endif %}
                             </span>
                         {% else %}
@@ -121,7 +121,7 @@
                                          title="{{ 'Actions_SubmenuSitesearch'|translate }}: {{ action.siteSearchKeyword }} - {{ action.serverTimePretty }}"/>
                                 {% else %}
                                     <img class='iconPadding' src="{{ action.icon }}"
-                                         title="{{ action.goalName }} - {% if action.revenue > 0 %}{{ 'Live_GoalRevenue'|translate }}: {{ action.revenue|money(idSite) }} - {% endif %} {{ action.serverTimePretty }}"/>
+                                         title="{{ action.goalName }} - {% if action.revenue > 0 %}{{ 'General_ColumnRevenue'|translate }}: {{ action.revenue|money(idSite) }} - {% endif %} {{ action.serverTimePretty }}"/>
                                 {% endif %}
                             </a>
                         {% endif %}
diff --git a/plugins/Live/templates/getVisitorLog.twig b/plugins/Live/templates/getVisitorLog.twig
index c7da605891..ab80e9c016 100644
--- a/plugins/Live/templates/getVisitorLog.twig
+++ b/plugins/Live/templates/getVisitorLog.twig
@@ -83,7 +83,7 @@
             {% if displayVisitorsInOwnColumn %}
                 {% if visitor.getColumn('pluginsIcons')|length > 0 %}
                     <hr/>
-                    {{ 'UserSettings_Plugins'|translate }}:
+                    {{ 'General_Plugins'|translate }}:
                     {% for pluginIcon in visitor.getColumn('pluginsIcons') %}
                         <img src="{{ pluginIcon.pluginIcon }}" title="{{ pluginIcon.pluginName|capitalize(true) }}" alt="{{ pluginIcon.pluginName|capitalize(true) }}"/>
                     {% endfor %}
@@ -180,7 +180,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit
                     <strong>
                         {{ visitor.getColumn('actionDetails')|length }}
                         {% if visitor.getColumn('actionDetails')|length <= 1 %}
-                            {{ 'Live_Action'|translate }}
+                            {{ 'General_Action'|translate }}
                         {% else %}
                             {{ 'General_Actions'|translate }}
                         {% endif %}