cleaned translations after usersettings cleanup

plugins/DevicesDetection/Columns/BrowserName.php

@@ -23,14 +23,14 @@ class BrowserName extends Base
     {
         $segment = new Segment();
         $segment->setSegment('browserCode');
-        $segment->setName('UserSettings_ColumnBrowser');
+        $segment->setName('DevicesDetection_ColumnBrowser');
         $segment->setAcceptedValues('FF, IE, CH, SF, OP, etc.');
         $this->addSegment($segment);
     }
 
     public function getName()
     {
-        return Piwik::translate('UserSettings_ColumnBrowser');
+        return Piwik::translate('DevicesDetection_ColumnBrowser');
     }
 
     /**

plugins/DevicesDetection/Columns/Os.php

@@ -24,14 +24,14 @@ class Os extends Base
     {
         $segment = new Segment();
         $segment->setSegment('operatingSystemCode');
-        $segment->setName('UserSettings_ColumnOperatingSystem');
+        $segment->setName('DevicesDetection_ColumnOperatingSystem');
         $segment->setAcceptedValues('WXP, WI7, MAC, LIN, AND, IPD, etc.');
         $this->addSegment($segment);
     }
 
     public function getName()
     {
-        return Piwik::translate('UserSettings_OperatingSystemFamily');
+        return Piwik::translate('DevicesDetection_OperatingSystemFamily');
     }
 
     /**

plugins/DevicesDetection/DevicesDetection.php

@@ -13,7 +13,6 @@ use Piwik\ArchiveProcessor;
 use Piwik\Db;
 use Piwik\Piwik;
 use Piwik\Plugin\Manager as PluginManager;
-use Piwik\Plugins\UserSettings\UserSettings;
 use Piwik\Plugins\DevicesDetection\Visitor;
 
 require_once PIWIK_INCLUDE_PATH . '/plugins/DevicesDetection/functions.php';

plugins/DevicesDetection/Reports/GetBrowsers.php

@@ -18,10 +18,10 @@ class GetBrowsers extends Base
     {
         parent::init();
         $this->dimension     = new BrowserName();
-        $this->name          = Piwik::translate('UserSettings_WidgetBrowsers');
-        $this->documentation = Piwik::translate('UserSettings_WidgetBrowsersDocumentation', '<br />');
+        $this->name          = Piwik::translate('DevicesDetection_WidgetBrowsers');
+        $this->documentation = Piwik::translate('DevicesDetection_WidgetBrowsersDocumentation', '<br />');
         $this->order = 1;
-        $this->widgetTitle  = 'UserSettings_WidgetBrowsers';
+        $this->widgetTitle  = 'DevicesDetection_WidgetBrowsers';
     }
 
     public function configureView(ViewDataTable $view)

plugins/DevicesDetection/functions.php

@@ -194,7 +194,7 @@ function getOSFamilyFullName($label)
     if ($label == 'unknown') {
         $label = Piwik::translate('General_Unknown');
     } else if ($label == 'Gaming Console') {
-        $label = Piwik::translate('UserSettings_GamingConsole');
+        $label = Piwik::translate('DevicesDetection_Console');
     }
 
     if ($label !== false) {

plugins/DevicesDetection/lang/en.json

 {
     "DevicesDetection": {
-        "BrowserVersions": "Browser versions",
         "BrowserEngine": "Browser engine",
-        "BrowserEngines": "Browser engines",
         "BrowserEngineDocumentation": "This report shows your visitors' browsers broken down into browser eninges. %s The most important information for web developers is what kind of rendering engine their visitors are using. The labels contain the names of the engines followed by the most common browser using that engine in brackets.",
+        "BrowserEngines": "Browser engines",
         "BrowserFamily": "Browser family",
+        "Browsers": "Browsers",
         "BrowserVersion": "Browser version",
+        "BrowserVersions": "Browser versions",
         "Camera": "Camera",
         "CarBrowser": "Car browser",
+        "ColumnBrowser": "Browser",
+        "ColumnOperatingSystem": "Operating system",
         "Console": "Console",
         "dataTableLabelBrands": "Brand",
         "dataTableLabelModels": "Model",
@@ -21,6 +24,8 @@
         "DeviceType": "Device type",
         "FeaturePhone": "Feature phone",
         "OperatingSystemFamilies": "Operating System families",
+        "OperatingSystemFamily": "Operating system family",
+        "OperatingSystems": "Operating systems",
         "OperatingSystemVersions": "Operating System versions",
         "PluginDescription": "This plugin provides extended information about mobile devices, such as Brand (manufacturer), Model (device version), better Device type detection (tv, consoles, smart phones, desktop, etc) and more. This plugin adds a new report in 'Visitors > Devices'.",
         "SmartDisplay": "Smart display",
@@ -28,6 +33,8 @@
         "submenu": "Devices",
         "Tablet": "Tablet",
         "TV": "Tv",
-        "UserAgent": "User-Agent"
+        "UserAgent": "User-Agent",
+        "WidgetBrowsers": "Visitor Browser",
+        "WidgetBrowsersDocumentation": "This report contains information about what kind of browser your visitors were using. Each browser version is listed separately."
     }
 }
\ No newline at end of file

plugins/DevicesDetection/templates/detection.twig

@@ -47,7 +47,7 @@
         <input type="submit" value="{{ 'General_Refresh'|translate }}" />
     </form>
 
-    <h3>{{ 'UserSettings_ColumnOperatingSystem'|translate }}</h3>
+    <h3>{{ 'DevicesDetection_ColumnOperatingSystem'|translate }}</h3>
     <table class="dataTable detection">
         <tr>
             <td>{{ 'General_Name'|translate }} <small>(<a href="javascript:showList('os');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
@@ -58,12 +58,12 @@
             <td>{{ os_version }}</td>
         </tr>
         <tr>
-            <td>{{ 'UserSettings_OperatingSystemFamily'|translate }}  <small>(<a href="javascript:showList('osfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
+            <td>{{ 'DevicesDetection_OperatingSystemFamily'|translate }}  <small>(<a href="javascript:showList('osfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>
             <td><img src="{{ os_family_logo }}" />{{ os_family }}</td>
         </tr>
     </table>
 
-    <h3>{{ 'UserSettings_ColumnBrowser'|translate }}</h3>
+    <h3>{{ 'DevicesDetection_ColumnBrowser'|translate }}</h3>
     <table class="dataTable detection">
         <tr>
             <td>{{ 'General_Name'|translate }} <small>(<a href="javascript:showList('browsers');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td>

plugins/DevicesDetection/templates/index.twig

@@ -8,9 +8,9 @@
 </div>
 
 <div id='rightcolumn'>
-    <h2 piwik-enriched-headline>{{ "UserSettings_OperatingSystems"|translate }}</h2>
+    <h2 piwik-enriched-headline>{{ "DevicesDetection_OperatingSystems"|translate }}</h2>
     {{ osReport  | raw}}
-    <h2 piwik-enriched-headline>{{ "UserSettings_Browsers"|translate }}</h2>
+    <h2 piwik-enriched-headline>{{ "DevicesDetection_Browsers"|translate }}</h2>
     {{ browserReport | raw }}
     <h2 piwik-enriched-headline>{{ "DevicesDetection_BrowserEngines"|translate }}</h2>
     {{ browserEngineReport | raw }}

plugins/Referrers/lang/en.json

@@ -48,7 +48,7 @@
         "WebsitesReportDocumentation": "In this table, you can see which websites referred visitors to your site. %s By clicking on a row in the table, you can see which URLs the links to your website were on.",
         "WidgetExternalWebsites": "Referrer Websites",
         "WidgetGetAll": "All Referrers",
-        "WidgetKeywords": "Keywords",
+        "WidgetKeywords": "List of keywords",
         "WidgetSocials": "List of social networks",
         "WidgetTopKeywordsForPages": "Top Keywords for Page URL",
         "XPercentOfVisits": "%s%% of visits"

plugins/UserSettings/lang/en.json

 {
     "UserSettings": {
-        "BrowserFamilies": "Browser families",
         "BrowserLanguage": "Browser language",
-        "Browsers": "Browsers",
         "BrowserWithNoPluginsEnabled": "%1$s with no plugins enabled",
         "BrowserWithPluginsEnabled": "%1$s with plugins %2$s enabled",
-        "ColumnBrowser": "Browser",
         "ColumnConfiguration": "Configuration",
-        "ColumnOperatingSystem": "Operating system",
         "ColumnResolution": "Resolution",
         "ColumnTypeOfScreen": "Type of screen",
         "ScreenTypes": "Screen types",
         "Configurations": "Configurations",
-        "GamingConsole": "Gaming Console",
         "Language_aa": "Afar",
         "Language_ab": "Abkhazian",
         "Language_ae": "Avestan",
@@ -198,18 +193,13 @@
         "Language_zh": "Chinese",
         "Language_zu": "Zulu",
         "LanguageCode": "Language code",
-        "OperatingSystemFamily": "Operating system family",
-        "OperatingSystems": "Operating systems",
         "PluginDescription": "Reports various User Settings: Browser, Browser Family, Operating System, Plugins, Resolution, Global Settings.",
         "PluginDetectionDoesNotWorkInIE": "Note: Plugins detection doesn't work in Internet Explorer. This report is only based on non-IE browsers.",
         "Resolutions": "Resolutions",
         "VisitorSettings": "Visitor Settings",
         "WideScreen": "Wide Screen",
-        "WidgetBrowsers": "Visitor Browser",
-        "WidgetBrowsersDocumentation": "This report contains information about what kind of browser your visitors were using. Each browser version is listed separately.",
         "WidgetGlobalVisitors": "Visitor Configuration",
         "WidgetGlobalVisitorsDocumentation": "This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.",
-        "WidgetOperatingSystems": "Operating System",
         "WidgetPlugins": "Browser Plugins",
         "WidgetPluginsDocumentation": "This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.",
         "WidgetResolutions": "Screen Resolution",