Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrobocoder <anthon.pang@gmail.com>2009-12-13 22:19:07 +0300
committerrobocoder <anthon.pang@gmail.com>2009-12-13 22:19:07 +0300
commit4fdf12bf7e2fdaee05e47e7b95fd1c346bc549c3 (patch)
tree34db68e08373cf8ced8e43ff0d2adfcaaa7366b3
parent32a5cb8a14db44557fa5dbcc9203702df9876f8c (diff)
refs #44 - translate columns in Live "Visitor Log"
rename typo'd translation string *OperatinsSystem to *OperatingSystem upcase submenu titles for consistency git-svn-id: http://dev.piwik.org/svn/trunk@1681 59fd770c-687e-43c8-a1e3-f5a4ff64c105
-rw-r--r--lang/be.php2
-rw-r--r--lang/bg.php4
-rw-r--r--lang/ca.php6
-rw-r--r--lang/cs.php4
-rw-r--r--lang/da.php4
-rw-r--r--lang/de.php4
-rw-r--r--lang/el.php2
-rw-r--r--lang/en.php14
-rw-r--r--lang/es.php4
-rw-r--r--lang/et.php2
-rw-r--r--lang/fi.php4
-rw-r--r--lang/fr.php4
-rw-r--r--lang/gl.php2
-rw-r--r--lang/hu.php4
-rw-r--r--lang/it.php4
-rw-r--r--lang/ja.php2
-rw-r--r--lang/ko.php4
-rw-r--r--lang/lt.php4
-rw-r--r--lang/nb.php4
-rw-r--r--lang/nl.php4
-rw-r--r--lang/pl.php2
-rw-r--r--lang/pt.php2
-rw-r--r--lang/ro.php2
-rw-r--r--lang/ru.php4
-rw-r--r--lang/sk.php4
-rw-r--r--lang/sq.php4
-rw-r--r--lang/sr.php4
-rw-r--r--lang/sv.php4
-rw-r--r--lang/th.php4
-rw-r--r--lang/uk.php2
-rw-r--r--lang/zh-cn.php2
-rw-r--r--lang/zh-tw.php4
-rw-r--r--plugins/Live/Controller.php18
-rw-r--r--plugins/Live/Live.php2
-rw-r--r--plugins/UserSettings/Controller.php2
-rw-r--r--plugins/UserSettings/templates/index.tpl2
36 files changed, 83 insertions, 61 deletions
diff --git a/lang/be.php b/lang/be.php
index a9efcc0c28..058c3bb028 100644
--- a/lang/be.php
+++ b/lang/be.php
@@ -120,7 +120,7 @@ $translations = array(
'UserSettings_Browsers' => 'Па браўзэрах',
'UserSettings_Plugins' => 'Падлучальныя модулі',
'UserSettings_Configurations' => 'Па канфігурацыі',
- 'UserSettings_OperatinsSystems' => 'Па аперацыйных сістэмах',
+ 'UserSettings_OperatingSystems' => 'Па аперацыйных сістэмах',
'UserSettings_Resolutions' => 'Па дазволе манітораў',
'UserSettings_WideScreen' => 'Па шырыні экрана',
'UserSettings_WidgetResolutions' => 'Па дазволе манітораў',
diff --git a/lang/bg.php b/lang/bg.php
index b181e1427c..e016628797 100644
--- a/lang/bg.php
+++ b/lang/bg.php
@@ -260,14 +260,14 @@ $translations = array(
'UserSettings_Browsers' => 'Браузери',
'UserSettings_Plugins' => 'Плъгини',
'UserSettings_Configurations' => 'Конфигурации',
- 'UserSettings_OperatinsSystems' => 'Операционни системи',
+ 'UserSettings_OperatingSystems' => 'Операционни системи',
'UserSettings_Resolutions' => 'Разделителна способност',
'UserSettings_WideScreen' => 'Екран',
'UserSettings_ColumnBrowserFamily' => 'Фамилия браузери',
'UserSettings_ColumnBrowser' => 'Браузер и версия',
'UserSettings_ColumnPlugin' => 'Плъгин',
'UserSettings_ColumnConfiguration' => 'Обобщена конфигурация',
- 'UserSettings_ColumnOperatinsSystem' => 'Операционна система и версия',
+ 'UserSettings_ColumnOperatingSystem' => 'Операционна система и версия',
'UserSettings_ColumnResolution' => 'Разделителна способност на екрана',
'UserSettings_ColumnTypeOfScreen' => 'Тип на екрана',
'UserSettings_WidgetResolutions' => 'Разделителна способност',
diff --git a/lang/ca.php b/lang/ca.php
index 173c001d1a..254fef077a 100644
--- a/lang/ca.php
+++ b/lang/ca.php
@@ -703,7 +703,7 @@ $translations = array(
'UserSettings_Browsers' => 'Navegadors',
'UserSettings_Plugins' => 'Connectors',
'UserSettings_Configurations' => 'Configuracions',
- 'UserSettings_OperatinsSystems' => 'Sistemes operatius',
+ 'UserSettings_OperatingSystems' => 'Sistemes operatius',
'UserSettings_Resolutions' => 'Resolucions',
'UserSettings_WideScreen' => 'Pantalla panoràmica',
'UserSettings_WidgetResolutions' => 'Resoulucions',
@@ -719,7 +719,7 @@ $translations = array(
'UserSettings_ColumnBrowser' => 'Navegador',
'UserSettings_ColumnPlugin' => 'Connector',
'UserSettings_ColumnConfiguration' => 'Configuració',
- 'UserSettings_ColumnOperatinsSystem' => 'Sistema operatiu',
+ 'UserSettings_ColumnOperatingSystem' => 'Sistema operatiu',
'UserSettings_ColumnResolution' => 'Resolució',
'UserSettings_ColumnTypeOfScreen' => 'Tipus de pantalla',
'UsersManager_ManageAccess' => 'Gestiona els permisos',
@@ -808,4 +808,4 @@ Podeu configurar els seus permisos a dalt.',
'VisitTime_NHour' => '%sh',
'VisitTime_ColumnServerTime' => 'Hora del servidor',
'VisitTime_ColumnLocalTime' => 'Hora local',
-); \ No newline at end of file
+);
diff --git a/lang/cs.php b/lang/cs.php
index 0ba371261b..88f8cf0a05 100644
--- a/lang/cs.php
+++ b/lang/cs.php
@@ -273,14 +273,14 @@ $translations = array(
'UserSettings_Browsers' => 'WWW prohlížeče',
'UserSettings_Plugins' => 'Pluginy',
'UserSettings_Configurations' => 'Nastavení',
- 'UserSettings_OperatinsSystems' => 'Operační systémy',
+ 'UserSettings_OperatingSystems' => 'Operační systémy',
'UserSettings_Resolutions' => 'Rozlišení',
'UserSettings_WideScreen' => 'Širokoúhlá obrazovka',
'UserSettings_ColumnBrowserFamily' => 'Rodina WWW prohlížeče',
'UserSettings_ColumnBrowser' => 'WWW prohlížeč',
'UserSettings_ColumnPlugin' => 'Plugin',
'UserSettings_ColumnConfiguration' => 'Konfigurace',
- 'UserSettings_ColumnOperatinsSystem' => 'Operační systém',
+ 'UserSettings_ColumnOperatingSystem' => 'Operační systém',
'UserSettings_ColumnResolution' => 'Rozlišení',
'UserSettings_ColumnTypeOfScreen' => 'Typ obrazovky',
'UserSettings_WidgetResolutions' => 'Rozlišení obrazovky',
diff --git a/lang/da.php b/lang/da.php
index 4130856d17..223bbf673a 100644
--- a/lang/da.php
+++ b/lang/da.php
@@ -273,14 +273,14 @@ $translations = array(
'UserSettings_Browsers' => 'Netlæsere',
'UserSettings_Plugins' => 'Plugins',
'UserSettings_Configurations' => 'Indstillinger',
-'UserSettings_OperatinsSystems' => 'Styresystemer',
+'UserSettings_OperatingSystems' => 'Styresystemer',
'UserSettings_Resolutions' => 'Opløsninger',
'UserSettings_WideScreen' => 'Widescreen',
'UserSettings_ColumnBrowserFamily' => 'Netlæsertype',
'UserSettings_ColumnBrowser' => 'Netlæser',
'UserSettings_ColumnPlugin' => 'Plugin',
'UserSettings_ColumnConfiguration' => 'Konfiguration',
-'UserSettings_ColumnOperatinsSystem' => 'Styresystem',
+'UserSettings_ColumnOperatingSystem' => 'Styresystem',
'UserSettings_ColumnResolution' => 'Opløsning',
'UserSettings_ColumnTypeOfScreen' => 'Skærmtype',
'UserSettings_WidgetResolutions' => 'Skærmopløsninger',
diff --git a/lang/de.php b/lang/de.php
index 15a82cc0fb..665b20b5b1 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -273,14 +273,14 @@ $translations = array(
'UserSettings_Browsers'=>'Browser',
'UserSettings_Plugins'=>'Plugins',
'UserSettings_Configurations'=>'Konfigurationen',
-'UserSettings_OperatinsSystems'=>'Betriebssysteme',
+'UserSettings_OperatingSystems'=>'Betriebssysteme',
'UserSettings_Resolutions'=>'Auflösungen',
'UserSettings_WideScreen'=>'Breitbild',
'UserSettings_ColumnBrowserFamily'=>'Browserfamilie',
'UserSettings_ColumnBrowser'=>'Browser',
'UserSettings_ColumnPlugin'=>'Plugin',
'UserSettings_ColumnConfiguration'=>'Konfiguration',
-'UserSettings_ColumnOperatinsSystem'=>'Betriebssystem',
+'UserSettings_ColumnOperatingSystem'=>'Betriebssystem',
'UserSettings_ColumnResolution'=>'Auflösung',
'UserSettings_ColumnTypeOfScreen'=>'Bildschirmtyp',
'UserSettings_WidgetResolutions'=>'Bildschirmauflösungen',
diff --git a/lang/el.php b/lang/el.php
index 45ae6bbd4d..60ff6a9ba7 100644
--- a/lang/el.php
+++ b/lang/el.php
@@ -600,7 +600,7 @@ $translations = array(
'UserSettings_Browsers' => 'Περιηγητές',
'UserSettings_Plugins' => 'Πρόσθετα',
'UserSettings_Configurations' => 'Ρυθμίσεις',
- 'UserSettings_OperatinsSystems' => 'Λειτουργικά συστήματα',
+ 'UserSettings_OperatingSystems' => 'Λειτουργικά συστήματα',
'UserSettings_Resolutions' => 'Αναλύσεις',
'UserSettings_WideScreen' => 'Ευρεία οθόνη',
'UserSettings_WidgetResolutions' => 'Αναλύσεις οθόνης',
diff --git a/lang/en.php b/lang/en.php
index f1140f4a7f..2a84956d38 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -278,7 +278,7 @@ $translations = array(
'Referers_DistinctWebsites' => 'distinct websites',
'Referers_UsingNDistinctUrls' => ' (using %2s distinct urls)',
'Referers_SubmenuEvolution' => 'Evolution',
- 'Referers_SubmenuSearchEngines' => 'Search engines & keywords',
+ 'Referers_SubmenuSearchEngines' => 'Search Engines &amp; Keywords',
'Referers_SubmenuWebsites' => 'Websites',
'Referers_SubmenuCampaigns' => 'Campaigns',
'Referers_WidgetKeywords' => 'List of Keywords',
@@ -291,14 +291,14 @@ $translations = array(
'UserSettings_Browsers' => 'Browsers',
'UserSettings_Plugins' => 'Plugins',
'UserSettings_Configurations' => 'Configurations',
- 'UserSettings_OperatinsSystems' => 'Operating systems',
+ 'UserSettings_OperatingSystems' => 'Operating systems',
'UserSettings_Resolutions' => 'Resolutions',
'UserSettings_WideScreen' => 'Wide Screen',
'UserSettings_ColumnBrowserFamily' => 'Browser family',
'UserSettings_ColumnBrowser' => 'Browser',
'UserSettings_ColumnPlugin' => 'Plugin',
'UserSettings_ColumnConfiguration' => 'Configuration',
- 'UserSettings_ColumnOperatinsSystem' => 'Operating system',
+ 'UserSettings_ColumnOperatingSystem' => 'Operating system',
'UserSettings_ColumnResolution' => 'Resolution',
'UserSettings_ColumnTypeOfScreen' => 'Type of screen',
'UserSettings_WidgetResolutions' => 'Screen resolutions',
@@ -628,7 +628,7 @@ $translations = array(
'VisitorInterest_ColumnPagesPerVisit' => 'Pages per visit',
'VisitorInterest_WidgetLengths' => 'Length of Visits',
'VisitorInterest_WidgetPages' => 'Pages per visit',
- 'VisitorInterest_SubmenuFrequencyLoyalty' => 'Frequency & Loyalty',
+ 'VisitorInterest_SubmenuFrequencyLoyalty' => 'Frequency &amp; Loyalty',
'VisitorInterest_PlusXMin' => '%s min',
'VisitorInterest_BetweenXYMinutes' => '%1s-%1s min',
'VisitorInterest_OnePage' => '1 page',
@@ -797,7 +797,7 @@ Note that it is not necessary to specify the URLs with and without \'www\' as Pi
'Installation_ErrorInvalidState' => 'Error: it seems you try to skip a step of the Installation process, or your cookies are disabled, or the Piwik configuration file is already created. %sMake sure your cookies are enabled%s and go back %s to the first page of the installation %s.',
'Provider_WidgetProviders' => 'Providers',
'Provider_ColumnProvider' => 'Provider',
- 'Provider_SubmenuLocationsProvider' => 'Locations & provider',
+ 'Provider_SubmenuLocationsProvider' => 'Locations &amp; Provider',
'Goals_ColumnConversions' => 'Conversions',
'Goals_ColumnConversionRate' => 'Conversion Rate',
'Goals_ColumnRevenue' => 'Revenue',
@@ -827,4 +827,8 @@ Note that it is not necessary to specify the URLs with and without \'www\' as Pi
'SecurityInfo_PluginDescription' => 'Based on PhpSecInfo from the <a href="http://phpsec.org/">PHP Security Consortium</a>, this plugin provides security information about your PHP environment and offers suggestions for improvement. It is a tool in a multilayered security approach. It does not replace secure development practices nor audit the code/application.',
'SecurityInfo_Test' => 'Test',
'SecurityInfo_Result' => 'Result',
+ 'Live_VisitorLog' => 'Visitor Log',
+ 'Live_Date' => 'Date',
+ 'Live_Time' => 'Time',
+ 'Live_Referrer_URL' => 'Referrer URL',
);
diff --git a/lang/es.php b/lang/es.php
index 6c00eb20ba..c0ffd9a18b 100644
--- a/lang/es.php
+++ b/lang/es.php
@@ -274,14 +274,14 @@ $translations = array(
'UserSettings_Browsers' => 'Navegadores',
'UserSettings_Plugins' => 'Plugins',
'UserSettings_Configurations' => 'Configuración',
- 'UserSettings_OperatinsSystems' => 'Sistemas operativos',
+ 'UserSettings_OperatingSystems' => 'Sistemas operativos',
'UserSettings_Resolutions' => 'Resoluciones',
'UserSettings_WideScreen' => 'Pantalla panorámica',
'UserSettings_ColumnBrowserFamily' => 'Buscadores por familia',
'UserSettings_ColumnBrowser' => 'Navegador',
'UserSettings_ColumnPlugin' => 'Plugin',
'UserSettings_ColumnConfiguration' => 'Configuración',
- 'UserSettings_ColumnOperatinsSystem' => 'Sistemas operativos',
+ 'UserSettings_ColumnOperatingSystem' => 'Sistemas operativos',
'UserSettings_ColumnResolution' => 'Resoluciones',
'UserSettings_ColumnTypeOfScreen' => 'Tipo de pantalla',
'UserSettings_WidgetResolutions' => 'Resoluciones de pantalla',
diff --git a/lang/et.php b/lang/et.php
index a475dfe03b..92288dcba1 100644
--- a/lang/et.php
+++ b/lang/et.php
@@ -191,7 +191,7 @@ $translations = array(
'UserSettings_Browsers' => 'Veebisirvijad',
'UserSettings_Plugins' => 'Pluginad',
'UserSettings_Configurations' => 'Konfiguratsioonid',
- 'UserSettings_OperatinsSystems' => 'Operatsioonisüsteemid',
+ 'UserSettings_OperatingSystems' => 'Operatsioonisüsteemid',
'UserSettings_Resolutions' => 'Resolutsioonid',
'UserSettings_WideScreen' => 'Laiekraan',
'UserSettings_WidgetResolutions' => 'Ekraani resolutsioonid',
diff --git a/lang/fi.php b/lang/fi.php
index 1795df4a2c..80db13f6d1 100644
--- a/lang/fi.php
+++ b/lang/fi.php
@@ -260,14 +260,14 @@ $translations = array(
'UserSettings_Browsers' => 'Selaimet',
'UserSettings_Plugins' => 'Lisäosat',
'UserSettings_Configurations' => 'Asetukset',
- 'UserSettings_OperatinsSystems' => 'Käyttöjärjestelmä',
+ 'UserSettings_OperatingSystems' => 'Käyttöjärjestelmä',
'UserSettings_Resolutions' => 'Resoluutio',
'UserSettings_WideScreen' => 'Laajakulma',
'UserSettings_ColumnBrowserFamily' => 'Selainperhe',
'UserSettings_ColumnBrowser' => 'Selain',
'UserSettings_ColumnPlugin' => 'Lisäosa',
'UserSettings_ColumnConfiguration' => 'Asetukset',
- 'UserSettings_ColumnOperatinsSystem' => 'Käyttöjärjestelmä',
+ 'UserSettings_ColumnOperatingSystem' => 'Käyttöjärjestelmä',
'UserSettings_ColumnResolution' => 'Resoluutio',
'UserSettings_ColumnTypeOfScreen' => 'Näytön tyyppi',
'UserSettings_WidgetResolutions' => 'Näytön resoluutio',
diff --git a/lang/fr.php b/lang/fr.php
index 7dc9e3b7fa..807516b024 100644
--- a/lang/fr.php
+++ b/lang/fr.php
@@ -286,14 +286,14 @@ $translations = array(
'UserSettings_Browsers' => 'Navigateurs',
'UserSettings_Plugins' => 'Plugins',
'UserSettings_Configurations' => 'Configurations',
- 'UserSettings_OperatinsSystems' => 'Système d\'exploitation',
+ 'UserSettings_OperatingSystems' => 'Système d\'exploitation',
'UserSettings_Resolutions' => 'Résolutions',
'UserSettings_WideScreen' => 'Largeur d\'écran',
'UserSettings_ColumnBrowserFamily' => 'Famille de navigateur',
'UserSettings_ColumnBrowser' => 'navigateur',
'UserSettings_ColumnPlugin' => 'Plugin',
'UserSettings_ColumnConfiguration' => 'Configuration',
- 'UserSettings_ColumnOperatinsSystem' => 'Système d\'exploitation',
+ 'UserSettings_ColumnOperatingSystem' => 'Système d\'exploitation',
'UserSettings_ColumnResolution' => 'Résolution',
'UserSettings_ColumnTypeOfScreen' => 'Type d\'écran',
'UserSettings_WidgetResolutions' => 'Résolutions d\'écran',
diff --git a/lang/gl.php b/lang/gl.php
index 960aaecb5f..a2a87baf57 100644
--- a/lang/gl.php
+++ b/lang/gl.php
@@ -117,7 +117,7 @@ $translations = array(
'UserSettings_Browsers' => 'Navegadores',
'UserSettings_Plugins' => 'Plugins',
'UserSettings_Configurations' => 'Configuracións',
- 'UserSettings_OperatinsSystems' => 'Sistemas Operativos',
+ 'UserSettings_OperatingSystems' => 'Sistemas Operativos',
'UserSettings_Resolutions' => 'Resolucións',
'UserSettings_WideScreen' => 'Pantalla panorámica',
'UserSettings_WidgetResolutions' => 'Resolucións de pantalla',
diff --git a/lang/hu.php b/lang/hu.php
index 885c292159..37a4702240 100644
--- a/lang/hu.php
+++ b/lang/hu.php
@@ -273,14 +273,14 @@ $translations = array(
'UserSettings_Browsers' => 'Böngészők',
'UserSettings_Plugins' => 'Bővítmények',
'UserSettings_Configurations' => 'Konfigurációk',
- 'UserSettings_OperatinsSystems' => 'Operációs rendszerek',
+ 'UserSettings_OperatingSystems' => 'Operációs rendszerek',
'UserSettings_Resolutions' => 'Felbontások',
'UserSettings_WideScreen' => 'Képernyő oldalarányai',
'UserSettings_ColumnBrowserFamily' => 'Böngészőcsalád',
'UserSettings_ColumnBrowser' => 'Böngésző',
'UserSettings_ColumnPlugin' => 'Bővítmény',
'UserSettings_ColumnConfiguration' => 'Konfiguráció',
- 'UserSettings_ColumnOperatinsSystem' => 'Operációs rendszer',
+ 'UserSettings_ColumnOperatingSystem' => 'Operációs rendszer',
'UserSettings_ColumnResolution' => 'Felbontás',
'UserSettings_ColumnTypeOfScreen' => 'Képernyő típusa',
'UserSettings_WidgetResolutions' => 'Képernyőfelbontások',
diff --git a/lang/it.php b/lang/it.php
index 3256bbf940..ff67392eb0 100644
--- a/lang/it.php
+++ b/lang/it.php
@@ -276,14 +276,14 @@ $translations = array(
'UserSettings_Browsers' => 'Browsers',
'UserSettings_Plugins' => 'Plugins',
'UserSettings_Configurations' => 'Configurazioni',
- 'UserSettings_OperatinsSystems' => 'Sistemi Operativi',
+ 'UserSettings_OperatingSystems' => 'Sistemi Operativi',
'UserSettings_Resolutions' => 'Risoluzioni',
'UserSettings_WideScreen' => 'Schermo panoramico',
'UserSettings_ColumnBrowserFamily' => 'Famiglia del Browser',
'UserSettings_ColumnBrowser' => 'Browser',
'UserSettings_ColumnPlugin' => 'Plugin',
'UserSettings_ColumnConfiguration' => 'Configurazione',
- 'UserSettings_ColumnOperatinsSystem' => 'Sistema operativo',
+ 'UserSettings_ColumnOperatingSystem' => 'Sistema operativo',
'UserSettings_ColumnResolution' => 'Risoluzione',
'UserSettings_ColumnTypeOfScreen' => 'Tipo di schermo',
'UserSettings_WidgetResolutions' => 'Risoluzione schermo',
diff --git a/lang/ja.php b/lang/ja.php
index d821a6c57e..13e32fd903 100644
--- a/lang/ja.php
+++ b/lang/ja.php
@@ -181,7 +181,7 @@ $translations = array(
'UserSettings_Browsers' => 'ブラウザ',
'UserSettings_Plugins' => 'プラグイン',
'UserSettings_Configurations' => '環境設定',
- 'UserSettings_OperatinsSystems' => 'OS',
+ 'UserSettings_OperatingSystems' => 'OS',
'UserSettings_Resolutions' => '解像度',
'UserSettings_WideScreen' => 'ワイド画面',
'UserSettings_WidgetResolutions' => '画面解像度',
diff --git a/lang/ko.php b/lang/ko.php
index 835b5b8a86..b9bc7ed1ba 100644
--- a/lang/ko.php
+++ b/lang/ko.php
@@ -274,14 +274,14 @@ $translations = array(
'UserSettings_Browsers' => '브라우저',
'UserSettings_Plugins' => '플러그인',
'UserSettings_Configurations' => '구성',
- 'UserSettings_OperatinsSystems' => '운영체제',
+ 'UserSettings_OperatingSystems' => '운영체제',
'UserSettings_Resolutions' => '해상도',
'UserSettings_WideScreen' => '와이드 스크린',
'UserSettings_ColumnBrowserFamily' => '브라우저 타입',
'UserSettings_ColumnBrowser' => '브라우저',
'UserSettings_ColumnPlugin' => '플러그인',
'UserSettings_ColumnConfiguration' => '구성',
- 'UserSettings_ColumnOperatinsSystem' => '운영체제',
+ 'UserSettings_ColumnOperatingSystem' => '운영체제',
'UserSettings_ColumnResolution' => '해상도',
'UserSettings_ColumnTypeOfScreen' => '스크린 타입',
'UserSettings_WidgetResolutions' => '스크린 해상도',
diff --git a/lang/lt.php b/lang/lt.php
index e4d425ddf3..fdf4aa1193 100644
--- a/lang/lt.php
+++ b/lang/lt.php
@@ -660,14 +660,14 @@ $translations = array(
'UserSettings_Browsers' => 'Naršyklės',
'UserSettings_Plugins' => 'Papildiniai',
'UserSettings_Configurations' => 'Konfigūracijos',
- 'UserSettings_OperatinsSystems' => 'Operacinės sistemos',
+ 'UserSettings_OperatingSystems' => 'Operacinės sistemos',
'UserSettings_Resolutions' => 'Ekranų raiškos',
'UserSettings_WideScreen' => 'Plačiaekranis',
'UserSettings_ColumnBrowserFamily' => 'Naršyklių šeimos',
'UserSettings_ColumnBrowser' => 'Naršyklė',
'UserSettings_ColumnPlugin' => 'Papildinys',
'UserSettings_ColumnConfiguration' => 'Konfigūracija',
- 'UserSettings_ColumnOperatinsSystem' => 'Operacinė sistema',
+ 'UserSettings_ColumnOperatingSystem' => 'Operacinė sistema',
'UserSettings_ColumnResolution' => 'Ekrano raiška',
'UserSettings_ColumnTypeOfScreen' => 'Ekrano tipas',
'UserSettings_WidgetResolutions' => 'Ekrano raiška',
diff --git a/lang/nb.php b/lang/nb.php
index 66963c7984..4ffadb3d18 100644
--- a/lang/nb.php
+++ b/lang/nb.php
@@ -552,7 +552,7 @@ $translations = array(
'UserSettings_Browsers' => 'Nettlesere',
'UserSettings_Plugins' => 'Tillegg',
'UserSettings_Configurations' => 'Konfigurasjon',
- 'UserSettings_OperatinsSystems' => 'Operativsystemer',
+ 'UserSettings_OperatingSystems' => 'Operativsystemer',
'UserSettings_Resolutions' => 'Oppløsninger',
'UserSettings_WideScreen' => 'Widescreen',
'UserSettings_WidgetResolutions' => 'Skjermoppløsninger',
@@ -729,7 +729,7 @@ $translations = array(
'UserSettings_ColumnBrowser' => 'Nettleser',
'UserSettings_ColumnPlugin' => 'Tillegg',
'UserSettings_ColumnConfiguration' => 'Konfigurasjon',
- 'UserSettings_ColumnOperatinsSystem' => 'Operativsystem',
+ 'UserSettings_ColumnOperatingSystem' => 'Operativsystem',
'UserSettings_ColumnResolution' => 'Oppløsning',
'UserSettings_ColumnTypeOfScreen' => 'Skjermtype',
'UserCountry_country_ax' => 'Aland øyene',
diff --git a/lang/nl.php b/lang/nl.php
index fad2bc2a28..53f778b2d2 100644
--- a/lang/nl.php
+++ b/lang/nl.php
@@ -577,7 +577,7 @@ $translations = array(
'UserSettings_Browsers' => 'Browser per versie',
'UserSettings_Plugins' => 'Ge&iuml;nstalleerde plugins',
'UserSettings_Configurations' => 'Configuraties',
- 'UserSettings_OperatinsSystems' => 'Besturings systemen',
+ 'UserSettings_OperatingSystems' => 'Besturings systemen',
'UserSettings_Resolutions' => 'Scherm resoluties',
'UserSettings_WideScreen' => 'Scherm configuratie',
'UserSettings_WidgetResolutions' => 'Scherm resoluties',
@@ -659,4 +659,4 @@ $translations = array(
'VisitTime_WidgetServerTime' => 'Uur van de dag (tijdzone server)',
'VisitTime_SubmenuTimes' => 'Uur van de dag',
'VisitTime_NHour' => '%s uur',
-); \ No newline at end of file
+);
diff --git a/lang/pl.php b/lang/pl.php
index cf3a41143e..3d9220800d 100644
--- a/lang/pl.php
+++ b/lang/pl.php
@@ -194,7 +194,7 @@ $translations = array(
'UserSettings_Browsers' => 'Przeglądarki',
'UserSettings_Plugins' => 'Plugin\'y',
'UserSettings_Configurations' => 'Konfiguracja',
- 'UserSettings_OperatinsSystems' => 'Systemy operacyjne',
+ 'UserSettings_OperatingSystems' => 'Systemy operacyjne',
'UserSettings_Resolutions' => 'Rozdzielczość',
'UserSettings_WideScreen' => 'Ekran panoramiczny',
'UserSettings_WidgetResolutions' => 'Rozdzielczość ekrany',
diff --git a/lang/pt.php b/lang/pt.php
index e23a319ae8..58495bebc3 100644
--- a/lang/pt.php
+++ b/lang/pt.php
@@ -147,7 +147,7 @@ $translations = array(
'UserSettings_Browsers' => 'Navegadores',
'UserSettings_Plugins' => 'Plugins',
'UserSettings_Configurations' => 'Configura&ccedil;&otilde;es',
- 'UserSettings_OperatinsSystems' => 'Sistemas Operacionais',
+ 'UserSettings_OperatingSystems' => 'Sistemas Operacionais',
'UserSettings_Resolutions' => 'Resolu&ccedil;&otilde;es',
'UserSettings_WideScreen' => 'Wide Screen',
'UserSettings_WidgetResolutions' => 'Resolu&ccedil;&otilde;es de Tela',
diff --git a/lang/ro.php b/lang/ro.php
index 48fffd7bdc..2677a0c3ad 100644
--- a/lang/ro.php
+++ b/lang/ro.php
@@ -207,7 +207,7 @@ $translations = array(
'UserSettings_Browsers' => 'Browsere',
'UserSettings_Plugins' => 'Pluginuri',
'UserSettings_Configurations' => 'Configurare',
- 'UserSettings_OperatinsSystems' => 'Sisteme operare',
+ 'UserSettings_OperatingSystems' => 'Sisteme operare',
'UserSettings_Resolutions' => 'Rezolutii',
'UserSettings_WideScreen' => 'Ecran extins',
'UserSettings_WidgetResolutions' => 'Rezolutii ecran',
diff --git a/lang/ru.php b/lang/ru.php
index c0f193fb03..294bab1d1d 100644
--- a/lang/ru.php
+++ b/lang/ru.php
@@ -274,14 +274,14 @@ $translations = array(
'UserSettings_Browsers' => 'По браузерам',
'UserSettings_Plugins' => 'Плагины',
'UserSettings_Configurations' => 'По конфигурации',
- 'UserSettings_OperatinsSystems' => 'По операционным системам',
+ 'UserSettings_OperatingSystems' => 'По операционным системам',
'UserSettings_Resolutions' => 'По разрешению мониторов',
'UserSettings_WideScreen' => 'По ширине экрана',
'UserSettings_ColumnBrowserFamily' => 'Семейство браузеров',
'UserSettings_ColumnBrowser' => 'Браузер',
'UserSettings_ColumnPlugin' => 'Плагин',
'UserSettings_ColumnConfiguration' => 'Конфигурация',
- 'UserSettings_ColumnOperatinsSystem' => 'Операционная система',
+ 'UserSettings_ColumnOperatingSystem' => 'Операционная система',
'UserSettings_ColumnResolution' => 'Разрешение',
'UserSettings_ColumnTypeOfScreen' => 'Тип экрана',
'UserSettings_WidgetResolutions' => 'По разрешению мониторов',
diff --git a/lang/sk.php b/lang/sk.php
index b9b8fdff11..e3e5726856 100644
--- a/lang/sk.php
+++ b/lang/sk.php
@@ -220,7 +220,7 @@ $translations = array(
'UserSettings_Browsers' => 'Prehliadače',
'UserSettings_Plugins' => 'Zásuvné moduly',
'UserSettings_Configurations' => 'Konfigurácia',
- 'UserSettings_OperatinsSystems' => 'Operačný systém',
+ 'UserSettings_OperatingSystems' => 'Operačný systém',
'UserSettings_Resolutions' => 'Rozlíšenie',
'UserSettings_WideScreen' => 'Širokouhlá obrazovka',
'UserSettings_WidgetResolutions' => 'Rozlíšenie obrazovky',
@@ -770,7 +770,7 @@ $translations = array(
'UserSettings_ColumnBrowser' => 'Prehliadač',
'UserSettings_ColumnPlugin' => 'Zásuvný modul',
'UserSettings_ColumnConfiguration' => 'Konfigurácia',
- 'UserSettings_ColumnOperatinsSystem' => 'Operačný systém',
+ 'UserSettings_ColumnOperatingSystem' => 'Operačný systém',
'UserSettings_ColumnResolution' => 'Rozlíšenie',
'UserSettings_ColumnTypeOfScreen' => 'Typ obrazovky',
'VisitFrequency_ColumnReturningVisits' => 'Vracajúce sa návštevy',
diff --git a/lang/sq.php b/lang/sq.php
index 93234e595e..224ae42a99 100644
--- a/lang/sq.php
+++ b/lang/sq.php
@@ -693,14 +693,14 @@ Shënim: ky element do të skadojë brenda 24 orësh.
'UserSettings_Browsers' => 'Shfletuesa',
'UserSettings_Plugins' => 'Shtojca',
'UserSettings_Configurations' => 'Formësime',
- 'UserSettings_OperatinsSystems' => 'Sisteme operativë',
+ 'UserSettings_OperatingSystems' => 'Sisteme operativë',
'UserSettings_Resolutions' => 'Qartësi',
'UserSettings_WideScreen' => 'Ekran së Gjeri',
'UserSettings_ColumnBrowserFamily' => 'Familje shfletuesi',
'UserSettings_ColumnBrowser' => 'Shfletues',
'UserSettings_ColumnPlugin' => 'Shtojcë',
'UserSettings_ColumnConfiguration' => 'Formësim',
- 'UserSettings_ColumnOperatinsSystem' => 'Sistem operativ',
+ 'UserSettings_ColumnOperatingSystem' => 'Sistem operativ',
'UserSettings_ColumnResolution' => 'Qartësi',
'UserSettings_ColumnTypeOfScreen' => 'Lloj ekrani',
'UserSettings_WidgetResolutions' => 'Qartësi ekrani',
diff --git a/lang/sr.php b/lang/sr.php
index 8d569c2086..ae26757ddc 100644
--- a/lang/sr.php
+++ b/lang/sr.php
@@ -274,14 +274,14 @@ $translations = array(
'UserSettings_Browsers' => 'Web čitači',
'UserSettings_Plugins' => 'Dodaci',
'UserSettings_Configurations' => 'Podešavanja',
- 'UserSettings_OperatinsSystems' => 'Operativni sistemi',
+ 'UserSettings_OperatingSystems' => 'Operativni sistemi',
'UserSettings_Resolutions' => 'Rezolucije',
'UserSettings_WideScreen' => 'Širok ekran',
'UserSettings_ColumnBrowserFamily' => 'Tip Web čitača',
'UserSettings_ColumnBrowser' => 'Web čitači',
'UserSettings_ColumnPlugin' => 'Dodaci',
'UserSettings_ColumnConfiguration' => 'Podešavanja',
- 'UserSettings_ColumnOperatinsSystem' => 'Operativni sistem',
+ 'UserSettings_ColumnOperatingSystem' => 'Operativni sistem',
'UserSettings_ColumnResolution' => 'Rezolucija',
'UserSettings_ColumnTypeOfScreen' => 'Tip ekrana',
'UserSettings_WidgetResolutions' => 'Rezolucija ekrana',
diff --git a/lang/sv.php b/lang/sv.php
index 4248fe23e5..1e77ed92a9 100644
--- a/lang/sv.php
+++ b/lang/sv.php
@@ -273,14 +273,14 @@ $translations = array(
'UserSettings_Browsers' => 'Webbl&auml;sare',
'UserSettings_Plugins' => 'Till&auml;gg',
'UserSettings_Configurations' => 'Konfigurationer',
- 'UserSettings_OperatinsSystems' => 'Operativsystem',
+ 'UserSettings_OperatingSystems' => 'Operativsystem',
'UserSettings_Resolutions' => 'Sk&auml;rmuppl&ouml;sning',
'UserSettings_WideScreen' => 'Wide Screen',
'UserSettings_ColumnBrowserFamily' => 'Webbl&auml;sarfamilj',
'UserSettings_ColumnBrowser' => 'Webbl&auml;sare',
'UserSettings_ColumnPlugin' => 'Till&auml;gg',
'UserSettings_ColumnConfiguration' => 'Konfiguration',
- 'UserSettings_ColumnOperatinsSystem' => 'Operativsystem',
+ 'UserSettings_ColumnOperatingSystem' => 'Operativsystem',
'UserSettings_ColumnResolution' => 'Sk&auml;rmuppl&ouml;sning',
'UserSettings_ColumnTypeOfScreen' => 'Typ av sk&auml;rm',
'UserSettings_WidgetResolutions' => 'Sk&auml;rmuppl&ouml;sning',
diff --git a/lang/th.php b/lang/th.php
index 64af325d0a..d534e2ec44 100644
--- a/lang/th.php
+++ b/lang/th.php
@@ -676,7 +676,7 @@ $translations = array(
'UserSettings_Browsers' => 'บราวเซอร์',
'UserSettings_Plugins' => 'ปลั้กอิน',
'UserSettings_Configurations' => 'ระบบของผู้เข้าชม',
- 'UserSettings_OperatinsSystems' => 'ระบบปฎิบัติการ',
+ 'UserSettings_OperatingSystems' => 'ระบบปฎิบัติการ',
'UserSettings_Resolutions' => 'ความละเอียด',
'UserSettings_WideScreen' => 'จอภาพแบบกว้าง',
'UserSettings_WidgetResolutions' => 'ความละเอียดจอภาพ',
@@ -692,7 +692,7 @@ $translations = array(
'UserSettings_ColumnBrowser' => 'บราวเซอร์',
'UserSettings_ColumnPlugin' => 'ปลักอิน',
'UserSettings_ColumnConfiguration' => 'การตั้งค่า',
- 'UserSettings_ColumnOperatinsSystem' => 'ระบบปฏิบัติการ',
+ 'UserSettings_ColumnOperatingSystem' => 'ระบบปฏิบัติการ',
'UserSettings_ColumnResolution' => 'ความละเอียด',
'UserSettings_ColumnTypeOfScreen' => 'ชนิดของจอภาพ',
'UsersManager_UsersManagement' => 'การจัดการ User',
diff --git a/lang/uk.php b/lang/uk.php
index 8bd4271104..5123c1f1fd 100644
--- a/lang/uk.php
+++ b/lang/uk.php
@@ -606,7 +606,7 @@ $translations = array(
'UserSettings_Browsers' => 'Браузери',
'UserSettings_Plugins' => 'Плагіни',
'UserSettings_Configurations' => 'Конфігурації',
- 'UserSettings_OperatinsSystems' => 'Операційні системи',
+ 'UserSettings_OperatingSystems' => 'Операційні системи',
'UserSettings_Resolutions' => 'Роздільні здатності',
'UserSettings_WideScreen' => 'Широкоформатність',
'UserSettings_WidgetResolutions' => 'Роздільні здатності',
diff --git a/lang/zh-cn.php b/lang/zh-cn.php
index 50a701d456..f13ac670ee 100644
--- a/lang/zh-cn.php
+++ b/lang/zh-cn.php
@@ -181,7 +181,7 @@ $translations = array(
'UserSettings_Browsers' => '使用浏览器',
'UserSettings_Plugins' => '浏览器插件',
'UserSettings_Configurations' => '客户端配置',
- 'UserSettings_OperatinsSystems' => '操作系统',
+ 'UserSettings_OperatingSystems' => '操作系统',
'UserSettings_Resolutions' => '分辨率',
'UserSettings_WideScreen' => '宽屏幕',
'UserSettings_WidgetResolutions' => '画面分辨率',
diff --git a/lang/zh-tw.php b/lang/zh-tw.php
index c3d0d97848..2381edc41b 100644
--- a/lang/zh-tw.php
+++ b/lang/zh-tw.php
@@ -273,14 +273,14 @@ $translations = array(
'UserSettings_Browsers' => '使用瀏覽器',
'UserSettings_Plugins' => '瀏覽器外掛',
'UserSettings_Configurations' => '客端配置',
- 'UserSettings_OperatinsSystems' => '作業系統',
+ 'UserSettings_OperatingSystems' => '作業系統',
'UserSettings_Resolutions' => '解析度',
'UserSettings_WideScreen' => '寬螢幕',
'UserSettings_ColumnBrowserFamily' => '瀏覽器家族',
'UserSettings_ColumnBrowser' => '瀏覽器',
'UserSettings_ColumnPlugin' => '外掛',
'UserSettings_ColumnConfiguration' => '客端配置',
- 'UserSettings_ColumnOperatinsSystem' => '作業系統',
+ 'UserSettings_ColumnOperatingSystem' => '作業系統',
'UserSettings_ColumnResolution' => '解析度',
'UserSettings_ColumnTypeOfScreen' => '螢幕類型',
'UserSettings_WidgetResolutions' => '畫面解析度',
diff --git a/plugins/Live/Controller.php b/plugins/Live/Controller.php
index 45c8d15ef2..074f6dc3e9 100644
--- a/plugins/Live/Controller.php
+++ b/plugins/Live/Controller.php
@@ -57,6 +57,7 @@ class Piwik_Live_Controller extends Piwik_Controller
//'serverDatePretty', 'serverTimePretty', 'actionDetails'
$view->setColumnsToDisplay(array(
+// 'label',
'idVisit',
'serverDatePretty',
'serverTimePretty',
@@ -72,6 +73,23 @@ class Piwik_Live_Controller extends Piwik_Controller
'plugins',
));
+ $view->setColumnsTranslations(array(
+// 'label' => Piwik_Translate('translation'),
+ 'idVisit' => Piwik_Translate(''),
+ 'serverDatePretty' => Piwik_Translate('Live_Date'),
+ 'serverTimePretty' => Piwik_Translate('Live_Time'),
+ 'ip' => 'IP',
+ 'countActions' => Piwik_Translate('VisitorInterest_ColumnPagesPerVisit'),
+ 'visitLengthPretty' => Piwik_Translate('VisitorInterest_ColumnVisitDuration'),
+ 'keywords' => Piwik_Translate('Referers_ColumnKeyword'),
+ 'refererUrl' => Piwik_Translate('Live_Referrer_URL'),
+ 'operatingSystemShortName' => Piwik_Translate('UserSettings_ColumnOperatingSystem'),
+ 'browser' => Piwik_Translate('UserSettings_ColumnBrowser'),
+ 'screen' => Piwik_Translate('UserSettings_ColumnTypeOfScreen'),
+ 'resolution' => Piwik_Translate('UserSettings_ColumnResolution'),
+ 'plugins' => Piwik_Translate('UserSettings_ColumnPlugin'),
+ ));
+
$view->disableSort();
$view->setLimit(10);
$view->disableExcludeLowPopulation();
diff --git a/plugins/Live/Live.php b/plugins/Live/Live.php
index be24743437..ff8d73f6f5 100644
--- a/plugins/Live/Live.php
+++ b/plugins/Live/Live.php
@@ -57,7 +57,7 @@ class Piwik_Live extends Piwik_Plugin
function addMenu()
{
- Piwik_AddMenu('General_Visitors', 'VisitorLog', array('module' => 'Live', 'action' => 'getLastVisitsDetails'));
+ Piwik_AddMenu('General_Visitors', 'Live_VisitorLog', array('module' => 'Live', 'action' => 'getLastVisitsDetails'));
}
public function addWidget() {
diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php
index 367ef275d2..ac3a72291e 100644
--- a/plugins/UserSettings/Controller.php
+++ b/plugins/UserSettings/Controller.php
@@ -58,7 +58,7 @@ class Piwik_UserSettings_Controller extends Piwik_Controller
__FUNCTION__,
'UserSettings.getOS'
);
- $view->setColumnTranslation('label', Piwik_Translate('UserSettings_ColumnOperatinsSystem'));
+ $view->setColumnTranslation('label', Piwik_Translate('UserSettings_ColumnOperatingSystem'));
return $this->renderView($view, $fetch);
}
diff --git a/plugins/UserSettings/templates/index.tpl b/plugins/UserSettings/templates/index.tpl
index 91400a6e7c..35c0e4b51a 100644
--- a/plugins/UserSettings/templates/index.tpl
+++ b/plugins/UserSettings/templates/index.tpl
@@ -13,7 +13,7 @@
<h2>{'UserSettings_Configurations'|translate}</h2>
{$dataTableConfiguration}
- <h2>{'UserSettings_OperatinsSystems'|translate}</h2>
+ <h2>{'UserSettings_OperatingSystems'|translate}</h2>
{$dataTableOS}
<h2>{'UserSettings_Resolutions'|translate}</h2>