diff options
| author | diosmosis <benaka@piwik.pro> | 2015-02-08 06:10:12 +0300 |
|---|---|---|
| committer | diosmosis <benaka@piwik.pro> | 2015-02-08 06:10:12 +0300 |
| commit | fa86026bf18dc38b06b7ef203da140e236e743e5 (patch) | |
| tree | 2334ecbc12478f0a0204e972c99552f8e3b3e66c /plugins | |
| parent | a3f8358c43cc753104feab605e956297d91145e8 (diff) | |
| parent | bfd774185a5b8fdead32686de129e034f3231d69 (diff) | |
Merge branch 'master' into 6436_action_dupes
Diffstat (limited to 'plugins')
192 files changed, 507 insertions, 560 deletions
diff --git a/plugins/Actions/lang/nl.json b/plugins/Actions/lang/nl.json index 6905c5d20d..0f0629e06d 100644 --- a/plugins/Actions/lang/nl.json +++ b/plugins/Actions/lang/nl.json @@ -5,9 +5,9 @@ "ColumnClicks": "Kliks", "ColumnClicksDocumentation": "Aantal keer dat er op deze link geklikt is.", "ColumnDownloadURL": "Download link", - "ColumnEntryPageTitle": "Inkomende pagina titel", + "ColumnEntryPageTitle": "Inkomende paginatitel", "ColumnEntryPageURL": "Inkomende pagina URL", - "ColumnExitPageTitle": "Uitgaande pagina titel", + "ColumnExitPageTitle": "Uitgaande paginatitel", "ColumnExitPageURL": "Uitgaande pagina URL", "ColumnNoResultKeyword": "Sleutelwoord zonder zoekresultaten", "ColumnPageName": "Pagina naam", @@ -27,10 +27,10 @@ "ColumnUniqueOutlinks": "Unieke Outlinks", "DownloadsReportDocumentation": "Dit rapport laat zien welke bestanden door de bezoekers zijn gedownload. %s Piwik telt een klik op een downloadlink als een download. Piwik kan niet zien of de download succesvol is uitgevoerd en afgerond.", "EntryPagesReportDocumentation": "Dit rapport bevat informatie over de inkomende pagina's in de opgegeven periode. Een inkomende pagina is de eerste pagina waarop de bezoeker binnenkomt. %s De URL's van de inkomende pagina's worden getoond in een mapstructuur.", - "EntryPageTitles": "Inkomende pagina titels", + "EntryPageTitles": "Inkomende paginatitels", "EntryPageTitlesReportDocumentation": "Dit rapport bevat informatie over de titels van de inkomende pagina's in de opgegeven periode.", "ExitPagesReportDocumentation": "Dit rapport bevat informatie over de uitgaande pagina's tijdens de opgegeven periode. De iutgaande pagina is de laatste pagina die de bezoeker bekijkt. %s De URL's van de uitgaande pagina's worden getoond in een mapstructuur.", - "ExitPageTitles": "Uitgaande pagina titels", + "ExitPageTitles": "Uitgaande paginatitels", "ExitPageTitlesReportDocumentation": "Dit rapport bevat informatie over de titels van de uitgaande pagina's in de opgegeven periode.", "LearnMoreAboutSiteSearchLink": "Leer meer over de manier waarop bezoekers de zoekoptie in uw website gebruiken.", "OneSearch": "1 zoekopdracht", @@ -49,14 +49,14 @@ "SiteSearchKeywordsNoResultDocumentation": "Dit rapport toon een lijst met sleutelwoorden waarop door uw website geen zoekresultaten werden gegeven. Wellicht kan het zoekalgorithm worden verbeterd of misschien wordt gezocht op content dat (nog) niet beschikbaar is op uw website.", "SubmenuPagesEntry": "Pagina's waarlangs de bezoeker binnen kwam", "SubmenuPagesExit": "Pagina's die verlaten werden", - "SubmenuPageTitles": "Pagina titels", + "SubmenuPageTitles": "Paginatitels", "SubmenuSitesearch": "Lokale zoekopdracht", - "WidgetEntryPageTitles": "Inkomende pagina titels.", - "WidgetExitPageTitles": "Uitgaande pagina titels", + "WidgetEntryPageTitles": "Inkomende paginatitels.", + "WidgetExitPageTitles": "Uitgaande paginatitels", "WidgetPagesEntry": "Beginpagina's", "WidgetPagesExit": "Pagina's die verlaten werden.", - "WidgetPageTitles": "Pagina titels", - "WidgetPageTitlesFollowingSearch": "Pagina titels na zoekopdrachten", + "WidgetPageTitles": "Paginatitels", + "WidgetPageTitlesFollowingSearch": "Paginatitels na zoekopdrachten", "WidgetPageUrlsFollowingSearch": "Bestemmings pagina na lokale zoekopdracht", "WidgetSearchCategories": "Zoekcategorieën", "WidgetSearchKeywords": "Zoektermen lokale zoekopdracht", diff --git a/plugins/Contents/lang/es.json b/plugins/Contents/lang/es.json index 2d8d48572a..af41fb774c 100644 --- a/plugins/Contents/lang/es.json +++ b/plugins/Contents/lang/es.json @@ -3,7 +3,9 @@ "ContentName": "Nombre del contenido", "ContentPiece": "Pieza de Contenido", "Contents": "Contenidos", + "ContentTarget": "Contenido de objetivo", "Impressions": "Impresiones", + "InteractionRate": "Nivel de interaccion", "Interactions": "Interacciones" } }
\ No newline at end of file diff --git a/plugins/CoreAdminHome/lang/es.json b/plugins/CoreAdminHome/lang/es.json index 6b034059f4..5ef2bfa865 100644 --- a/plugins/CoreAdminHome/lang/es.json +++ b/plugins/CoreAdminHome/lang/es.json @@ -28,6 +28,8 @@ "JSTracking_CodeNote": "Asegúrate de que este código se encuentre en cada página de tu sitio web antes de la etiqueta %1$s.", "JSTracking_CustomCampaignQueryParam": "Utiliza nombres de parámetros de consulta personalizados para el nombre de la campaña y la palabra clave", "JSTracking_CustomCampaignQueryParamDesc": "Nota: %1$sPiwik detectara automáticamente los parámetros de Google Analytics.%2$s", + "JSTracking_DisableCookies": "Desactivar todas las cookies de rastreo", + "JSTracking_DisableCookiesDesc": "Desactiva todas las cookies de origen. Piwik cookies existentes de este sitio web seran eliminarán en la siguiente página vistada.", "JSTracking_EnableDoNotTrack": "Habilitar detección por parte del cliente de DoNotTrack", "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Nota: Soporte del lado del servidor para DoNotTrack ha sido activado, por lo que esta opción no tendrá ningún efecto.", "JSTracking_EnableDoNotTrackDesc": "De esta manera las solicitudes de seguimiento no será enviada si el visitante no desea ser seguido.", @@ -66,6 +68,7 @@ "PluginSettingReadNotAllowed": "No está permitido que leas el valor de la opción \"%s\" en el plugin \"%s\"", "PluginSettings": "Configuración del plugin", "PluginSettingsIntro": "Aquí puedes cambiar la configuración de los siguientes plugins de terceros:", + "PluginSettingsSaveFailed": "Error al guardar la configuración del plugin", "PluginSettingsValueNotAllowed": "El valor del campo \"%s\" del plugin \"%s\" no es permitido.", "SendPluginUpdateCommunication": "Enviarme una notificación por correo electrónico cuando hay una actualización para los plugins", "SendPluginUpdateCommunicationHelp": "Se enviará un correo electrónico a los Super Users cuando hay disponible una nueva versión de un plugin.", diff --git a/plugins/CoreAdminHome/lang/nl.json b/plugins/CoreAdminHome/lang/nl.json index 29c671240a..15d3b118d3 100644 --- a/plugins/CoreAdminHome/lang/nl.json +++ b/plugins/CoreAdminHome/lang/nl.json @@ -33,7 +33,7 @@ "JSTracking_EnableDoNotTrack": "Schakel Client side DoNotTrack detectie in.", "JSTracking_EnableDoNotTrack_AlreadyEnabled": "Opmerking: Server side DoNotTrack ondersteuning is ingeschakeld, deze optie heeft dus geen effect.", "JSTracking_EnableDoNotTrackDesc": "Tracking verzoeken zullen niet worden verzonden indien de bezoeker niet wenst gevolgd te worden.", - "JSTracking_GroupPageTitlesByDomain": "Plaats het site domein voor de pagina titel tijdens het traceren.", + "JSTracking_GroupPageTitlesByDomain": "Plaats het sitedomein voor de paginatitel tijdens het traceren.", "JSTracking_GroupPageTitlesByDomainDesc1": "Als iemand de 'over mij' bezoekt op blog.%1$s wordt het bewaard als 'blog \/ over mij'. Dit is de gemakkelijkste manier om een overzicht volgens subdomein te krijgen op je verkeer.", "JSTracking_MergeAliases": "In het \"Uitgaande links\" rapport, verberg kliks naar bekende aliassen van", "JSTracking_MergeAliasesDesc": "zo zullen kliks op links naar Ailias URL's (bijv. %s) zullen niet worden geteld worden als \"Uitgaande Link\"", diff --git a/plugins/CoreAdminHome/lang/ru.json b/plugins/CoreAdminHome/lang/ru.json index dcf244d77d..1020fcabae 100644 --- a/plugins/CoreAdminHome/lang/ru.json +++ b/plugins/CoreAdminHome/lang/ru.json @@ -63,6 +63,7 @@ "PluginSettingReadNotAllowed": "Вам не разрешено читать значение \"%s\" плагина \"%s\"", "PluginSettings": "Настройки плагина", "PluginSettingsIntro": "Здесь вы можете изменить настройки для следующих плагинов:", + "PluginSettingsSaveFailed": "Ошибка при сохранении настроек плагина", "SendPluginUpdateCommunication": "Отправить мне уведомление по электронной почте, когда есть новое обновление плагина", "SendPluginUpdateCommunicationHelp": "Письмо будет отправлено суперпользователю когда будет доступна новая версия плагина.", "StableReleases": "Если Piwik является важной частью вашего бизнеса, мы рекомендуем использовать последнюю стабильную версию. Если вы используете последнюю бета версию, и вы нашли ошибку или есть предложение, пожалуйста, %sперейдите по ссылке%s.", diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 5b37493a60..c339697a5f 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -22,7 +22,7 @@ var exports = require('piwik/UI'), * method, and this class instance is stored using the jQuery $.data function * with the 'uiControlObject' key. * - * To find a datatable element by report (ie, 'UserSettings.getBrowser'), + * To find a datatable element by report (ie, 'DevicesDetection.getBrowsers'), * use piwik.DataTable.getDataTableByReport. * * To get the dataTable JS instance (an instance of this class) for a @@ -67,7 +67,7 @@ DataTable.registerFooterIconHandler = function (id, handler) { /** * Returns the first datatable div displaying a specific report. * - * @param {string} report The report, eg, UserSettings.getLanguage + * @param {string} report The report, eg, UserLanguage.getLanguage * @return {Element} The datatable div displaying the report, or undefined if * it cannot be found. */ diff --git a/plugins/CoreHome/lang/cs.json b/plugins/CoreHome/lang/cs.json index 7b72a67a2e..4a36087378 100644 --- a/plugins/CoreHome/lang/cs.json +++ b/plugins/CoreHome/lang/cs.json @@ -4,6 +4,7 @@ "CheckForUpdates": "Zkontrolovat aktualizace", "CheckPiwikOut": "Vyzkoušejte Piwik!", "ClickRowToExpandOrContract": "Klikněte na tento řádek pro rozbalení nebo zbalení podtabulky.", + "ClickToEditX": "Klikněte pro úpravu %s", "CloseWidgetDirections": "Tento widget můžete zavřít kliknutím na ikonu X na horní části widgetu.", "DataForThisReportHasBeenPurged": "Data pro toto hlášení jsou starší než %s měsíců a byla odstraněna.", "DataTableExcludeAggregateRows": "Agregované řádky jsou zobrazeny %s Skrýt", diff --git a/plugins/CoreHome/lang/da.json b/plugins/CoreHome/lang/da.json index e62b9fd950..3f56462f9b 100644 --- a/plugins/CoreHome/lang/da.json +++ b/plugins/CoreHome/lang/da.json @@ -4,6 +4,7 @@ "CheckForUpdates": "Søg efter opdateringer", "CheckPiwikOut": "Tjek Piwik!", "ClickRowToExpandOrContract": "Klik på rækken for at udvide eller sammentrække undertabelen.", + "ClickToEditX": "Klik for at redigere %s", "CloseWidgetDirections": "Luk modulet ved at klikke på 'X' ikonet øverst.", "DataForThisReportHasBeenPurged": "Data til rapporten er er mere end %s måneder gamle og er blevet ryddet op.", "DataTableExcludeAggregateRows": "Samlede rækker vises %s Skjul dem", diff --git a/plugins/CoreHome/lang/de.json b/plugins/CoreHome/lang/de.json index 24ca6e25a1..bbcb29bbea 100644 --- a/plugins/CoreHome/lang/de.json +++ b/plugins/CoreHome/lang/de.json @@ -4,6 +4,7 @@ "CheckForUpdates": "Nach Aktualisierungen suchen", "CheckPiwikOut": "Sieh dir Piwik an!", "ClickRowToExpandOrContract": "Klicken Sie auf diese Zeile um die Untertabelle anzuzeigen oder zu verbergen.", + "ClickToEditX": "Klicken Sie um %s zu bearbeiten", "CloseWidgetDirections": "Sie können das Widget schließen, indem Sie auf das 'X' oben im Widget klicken.", "DataForThisReportHasBeenPurged": "Die Daten für diesen Bericht sind älter als %s Monate und wurden gelöscht", "DataTableExcludeAggregateRows": "Aggregierte Zeilen werden angezeigt %s Ausschließen", diff --git a/plugins/CoreHome/lang/el.json b/plugins/CoreHome/lang/el.json index 3251141515..a0be987bc3 100644 --- a/plugins/CoreHome/lang/el.json +++ b/plugins/CoreHome/lang/el.json @@ -4,6 +4,7 @@ "CheckForUpdates": "Έλεγχος για ενημερώσεις", "CheckPiwikOut": "Δοκιμάστε το Piwik!", "ClickRowToExpandOrContract": "Πατήστε στη γραμμή για να επεκταθεί ή να κρυφτεί ο υποπίνακας.", + "ClickToEditX": "Κάντε κλικ για να επεξεργαστείτε το %s", "CloseWidgetDirections": "Μπορείτε να κλείσετε αυτή τη λειτουργία κάνοντας κλικ στο εικονίδιο 'X' στην κορυφή του widget.", "DataForThisReportHasBeenPurged": "Τα δεδομένα για αυτή την αναφορά είναι περισσότερα από %s μήνες και κόπηκαν.", "DataTableExcludeAggregateRows": "Συγκεντρωτικές εγγραφές είναι ορατές %s Απόκρυωη", diff --git a/plugins/CoreHome/lang/it.json b/plugins/CoreHome/lang/it.json index 704abae336..9a5448aa78 100644 --- a/plugins/CoreHome/lang/it.json +++ b/plugins/CoreHome/lang/it.json @@ -4,6 +4,7 @@ "CheckForUpdates": "Cerca aggiornamenti", "CheckPiwikOut": "Controlla Piwik!", "ClickRowToExpandOrContract": "Clicca su questa riga per espandere o restringere la sotto-tabella.", + "ClickToEditX": "Clicca per modificare %s", "CloseWidgetDirections": "Potete chiudere questo widget cliccando sull'icona 'X' nella parte alta del widget stesso.", "DataForThisReportHasBeenPurged": "I dati di questo report hanno più di un mese %s e sono stati eliminato.", "DataTableExcludeAggregateRows": "Le righe di aggregazione vengono visualizzate %s Nascondile", diff --git a/plugins/CorePluginsAdmin/lang/ru.json b/plugins/CorePluginsAdmin/lang/ru.json index 5d5a8bf2a8..7a2326d92d 100644 --- a/plugins/CorePluginsAdmin/lang/ru.json +++ b/plugins/CorePluginsAdmin/lang/ru.json @@ -19,6 +19,7 @@ "CorePluginTooltip": "Основные плагины не имеют версию, так как они распространяются с Piwik.", "Deactivate": "Деактивировать", "Developer": "Разработчик", + "DoMoreContactPiwikAdmins": "Для установки нового плагина или новой темы, пожалуйста свяжитесь с вашим Piwik-администратором", "FeaturedPlugin": "Набирающий популярность плагин", "GetEarlyAccessForPaidPlugins": "Примечание: в настоящее время все плагины доступны бесплатно, в будущем мы включим платные плагины на Marketplace (%sсвяжитесь с нами%s для раннего доступа).", "History": "История", diff --git a/plugins/DevicePlugins/Reports/Base.php b/plugins/DevicePlugins/Reports/Base.php index cb075958be..81116f4d1d 100644 --- a/plugins/DevicePlugins/Reports/Base.php +++ b/plugins/DevicePlugins/Reports/Base.php @@ -15,7 +15,7 @@ abstract class Base extends \Piwik\Plugin\Report { protected function init() { - $this->category = 'UserSettings_VisitorSettings'; + $this->category = 'General_VisitorSettings'; } protected function getBasicDevicePluginsDisplayProperties(ViewDataTable $view) diff --git a/plugins/DevicePlugins/lang/cs.json b/plugins/DevicePlugins/lang/cs.json index 63c7807235..a760becbfa 100644 --- a/plugins/DevicePlugins/lang/cs.json +++ b/plugins/DevicePlugins/lang/cs.json @@ -2,6 +2,7 @@ "DevicePlugins": { "BrowserWithNoPluginsEnabled": "%1$s bez povolených zásuvných modulů", "BrowserWithPluginsEnabled": "%1$s s povolenými zásuvnými moduly %2$s", + "PluginDescription": "Hlásí zásuvné moduly prohlížeče", "PluginDetectionDoesNotWorkInIE": "Poznámka: Detekce zásuvných modulů nepracuje v prohlížeči Interet Explorer. Toto hlášení je založeno na ostatních prohlížečích", "WidgetPlugins": "Seznam zásuvných modulů", "WidgetPluginsDocumentation": "Toto hlášení zobrazuje zásuvné moduly, které měli vaši návštěvníci povoleny. Tato informace může být důležitá při rozhodování o tom, jakým způsobem prezentovat obsah." diff --git a/plugins/Ecommerce/lang/cs.json b/plugins/Ecommerce/lang/cs.json new file mode 100644 index 0000000000..e77b6363f3 --- /dev/null +++ b/plugins/Ecommerce/lang/cs.json @@ -0,0 +1,6 @@ +{ + "Ecommerce": { + "Sales": "Tržby", + "ViewSalesBy": "Zobrazí tržby podle %s" + } +}
\ No newline at end of file diff --git a/plugins/Ecommerce/lang/da.json b/plugins/Ecommerce/lang/da.json new file mode 100644 index 0000000000..4076385005 --- /dev/null +++ b/plugins/Ecommerce/lang/da.json @@ -0,0 +1,6 @@ +{ + "Ecommerce": { + "Sales": "Salg", + "ViewSalesBy": "Vis salg fra %s" + } +}
\ No newline at end of file diff --git a/plugins/Ecommerce/lang/el.json b/plugins/Ecommerce/lang/el.json new file mode 100644 index 0000000000..03666581e6 --- /dev/null +++ b/plugins/Ecommerce/lang/el.json @@ -0,0 +1,6 @@ +{ + "Ecommerce": { + "Sales": "Πωλήσεις", + "ViewSalesBy": "Εμφανίζει τις πωλήσεις ανά %s" + } +}
\ No newline at end of file diff --git a/plugins/Events/lang/ru.json b/plugins/Events/lang/ru.json index 61d63e59c4..86ff0366bb 100644 --- a/plugins/Events/lang/ru.json +++ b/plugins/Events/lang/ru.json @@ -1,6 +1,7 @@ { "Events": { "Event": "Событие", + "Events": "События", "MaxValue": "Максимальное значение", "MaxValueDocumentation": "Максимальное значения для этого события", "MinValue": "Минимальное значение", diff --git a/plugins/Goals/lang/cs.json b/plugins/Goals/lang/cs.json index 8310e48662..9092f9f084 100644 --- a/plugins/Goals/lang/cs.json +++ b/plugins/Goals/lang/cs.json @@ -38,6 +38,7 @@ "DefaultRevenue": "Výchozí příjem cíle je", "DefaultRevenueHelp": "Na příklad kontaktní formulář odeslaný návštěvníkem má průměrnou cenu $10. Piwik vám pomůže dobře pochopit chování skupin uživatelů", "DeleteGoalConfirm": "Jste si jisti, že chcete vymazat tento cíl %s?", + "Details": "Detaily cíle", "DocumentationRevenueGeneratedByProductSales": "Tržby produktu. Nepočítají se daně, poplatky za doručení a slevy.", "Download": "Stáhnout soubor", "Ecommerce": "Obchody", @@ -61,7 +62,10 @@ "GoalX": "Cíl: %s", "HelpOneConversionPerVisit": "Pokud byla stránka odpovídající cíli při návštěvě obnovena nebo zobrazena vícekrát, bude cíl započítán pouze jednou a to při prvním zobrazení.", "IsExactly": "je přesně %s", + "LearnMoreAboutGoalTrackingDocumentation": "Více o sledování cílu se dozvíte v %suživatelské dokumentaci%s.", "LeftInCart": "%s Zbylo v košíku", + "ManageGoals": "Spravovat cíle", + "ManageGoalsOrCreateANewGoal": "%sSpravovat cíle%s nebo ho vytvořte.", "Manually": "ručně", "ManuallyTriggeredUsingJavascriptFunction": "Cíl je ručně zaznamenáván pomocí JavaScriptového API trackGoal()", "MatchesExpression": "odpovídá %s", @@ -81,6 +85,7 @@ "ReturningVisitorsConversionRateIs": "Poměr konverze navracejících se uživatelů je %s", "SendEvent": "Poslat událost", "SingleGoalOverviewDocumentation": "Toto je přehled konverzí jednoho cíle. %s Linky lze zvětšit kliknutím na ně.", + "ThereIsNoGoalToManage": "Pro stránky %s není žádný cíl ke spravování", "UpdateGoal": "Aktualizovat cíl", "URL": "URL", "ViewAndEditGoals": "Zobrazit a editovat cíle", diff --git a/plugins/Goals/lang/da.json b/plugins/Goals/lang/da.json index 0ace8c2f88..f482cb2aa5 100644 --- a/plugins/Goals/lang/da.json +++ b/plugins/Goals/lang/da.json @@ -38,6 +38,7 @@ "DefaultRevenue": "Målets standard indtægter er", "DefaultRevenueHelp": "F.eks. en kontaktformular sendt af en besøgende kan være 10 kr. værd i gennemsnit. Piwik vil hjælpe dig med at forstå, hvor godt dine besøgssegmenter klarer sig.", "DeleteGoalConfirm": "Bekræft sletning af mål %s?", + "Details": "Mål detaljer", "DocumentationRevenueGeneratedByProductSales": "Produktsalg. Omfatter ikke moms, forsendelse og rabat", "Download": "Henter en fil", "Ecommerce": "E-handel", @@ -63,6 +64,8 @@ "IsExactly": "er nøjagtig %s", "LearnMoreAboutGoalTrackingDocumentation": "Lær mere om %s sporingsmål i Piwik%s i brugerdokumentationen.", "LeftInCart": "%s tilbage i kurven", + "ManageGoals": "Administrer mål", + "ManageGoalsOrCreateANewGoal": "%sAdministrer mål%s eller opret et nyt mål nu!", "Manually": "manuelt", "ManuallyTriggeredUsingJavascriptFunction": "Målet udløses manuelt ved hjælp af JavaScript API trackGoal ()", "MatchesExpression": "matcher udtrykket %s", @@ -82,6 +85,7 @@ "ReturningVisitorsConversionRateIs": "Tilbagevendende besøgendes konverteringsrate er %s", "SendEvent": "Send en hændelse", "SingleGoalOverviewDocumentation": "Oversigt over konverteringer for et enkelt mål. %s Minidiagrammer under diagrammet kan forstørres ved at klikke på dem.", + "ThereIsNoGoalToManage": "Der er ingen mål at administrere for hjemmeside %s", "UpdateGoal": "Opdater mål", "URL": "Netadresse", "ViewAndEditGoals": "Vis og rediger mål", diff --git a/plugins/Goals/lang/de.json b/plugins/Goals/lang/de.json index 3513dc5e9b..835bfb2c00 100644 --- a/plugins/Goals/lang/de.json +++ b/plugins/Goals/lang/de.json @@ -38,6 +38,7 @@ "DefaultRevenue": "Standard Zielumsatz ist", "DefaultRevenueHelp": "Das Absenden eines Kontaktformulars durch einen Besucher kann zum Beispiel durchschnittlich 10 € wert sein. Piwik hilft Ihnen, zu verstehen, wie sich Ihre Besucher-Segmente verhalten.", "DeleteGoalConfirm": "Wollen sie wirklich das Ziel %s löschen?", + "Details": "Ziel-Details", "DocumentationRevenueGeneratedByProductSales": "Verkaufsumsatz ohne Steuer, Versand und Rabatt", "Download": "eine Datei herunterladen wird", "Ecommerce": "Ecommerce", diff --git a/plugins/Goals/lang/el.json b/plugins/Goals/lang/el.json index 1e8902882a..5f20910ef8 100644 --- a/plugins/Goals/lang/el.json +++ b/plugins/Goals/lang/el.json @@ -38,6 +38,7 @@ "DefaultRevenue": "Η προεπιλεγμένη πρόσοδος του στόχου είναι", "DefaultRevenueHelp": "Για παράδειγμα, μια Φόρμα Επικοινωνίας που υποβλήθηκε από έναν επισκέπτη μπορεί να αξίζει 10€ κατά μέσο όρο. Το Piwik θα σας βοηθήσει να καταλάβετε πως λειτουργούν τα τμήματα των χρηστών σας.", "DeleteGoalConfirm": "Είστε σίγουροι ότι θέλετε να διαγράψετε το Στόχο %s;", + "Details": "Λεπτομέρειες στόχου", "DocumentationRevenueGeneratedByProductSales": "Πωλήσεις προϊόντος. Χωρίς φόρο, μεταφορικά και έκπτωση", "Download": "Τη λήψη ενός αρχείου", "Ecommerce": "Ηλεκτρονικό Εμπόριο", @@ -61,7 +62,10 @@ "GoalX": "Στόχος %s", "HelpOneConversionPerVisit": "Αν μια Σελίδα ταιριάζει, αυτός ο Στόχος ανανεώνεται ή προβάλεται περισσόερες φορές ανά Επίσκεψη και ο Στόχος θα καταγράφετε μόνο την πρώτη φορά που φορτώθηκε η σελίδα κατά την επίσκεψη.", "IsExactly": "είναι ακριβώς %s", + "LearnMoreAboutGoalTrackingDocumentation": "Μάθετε περισσότερα σχετικά με την %sΠαρακολούθηση Στόχων στο Piwik%s στην τεκμηρίωση για το χρήστη.", "LeftInCart": "%s απομένουν στο καλάθι", + "ManageGoals": "Διαχείριση των Στόχων", + "ManageGoalsOrCreateANewGoal": "%sΔιαχειριστείτε τους Στόχους%s ή δημιουργήστε τώρα έναν νέο!", "Manually": "χειροκίνητα", "ManuallyTriggeredUsingJavascriptFunction": "Ο Στόχος ενεργοποιείτε χειροκίνητα με χρήση του Javascript API trackGoal()", "MatchesExpression": "ταιριάζει στην έκφραση %s", @@ -81,6 +85,7 @@ "ReturningVisitorsConversionRateIs": "Ο βαθμός μετατροπής επιστρεφόμενων επισκεπτών είναι %s", "SendEvent": "Αποστολή συμβάντος", "SingleGoalOverviewDocumentation": "Αυτή είναι μια επισκόπηση των μετατροπών για ένα μόνο στόχο. %s Τα μικροδιαγράμματα κάτω από το διάγραμμα μπορούν να μεγεθυνθούν πατώντας επάνω τους.", + "ThereIsNoGoalToManage": "Δεν υπάρχει στόχος για να διαχειριστείτε για τον ιστοτόπο %s", "UpdateGoal": "Ενημέρωση Στόχου", "URL": "URL", "ViewAndEditGoals": "Προβολή και Επεξεργασία Στόχων", diff --git a/plugins/Goals/lang/it.json b/plugins/Goals/lang/it.json index 06874ed45d..f95ddbed16 100644 --- a/plugins/Goals/lang/it.json +++ b/plugins/Goals/lang/it.json @@ -38,6 +38,7 @@ "DefaultRevenue": "Il ricavo predefinito per l'obiettivo è", "DefaultRevenueHelp": "Per esempio, un Form di Contatto inviato da un visitatore può valere mediamente $10. Piwik pu%ograve; aiutarti a capire quanto rendono i tuoi visitatori.", "DeleteGoalConfirm": "Sei sicuro di voler cancellare il Goal %s?", + "Details": "Dettagli Goal", "DocumentationRevenueGeneratedByProductSales": "Vendite prodotti. Escluse tasse, spedizione e sconto", "Download": "Scaricano un file", "Ecommerce": "Ecommerce", diff --git a/plugins/Installation/lang/de.json b/plugins/Installation/lang/de.json index 98131b4731..6d44676866 100644 --- a/plugins/Installation/lang/de.json +++ b/plugins/Installation/lang/de.json @@ -83,7 +83,7 @@ "SystemCheckGlobHelp": "Diese eingebaute Funktion ist auf ihrem System deaktiviert. Piwik wird versuchen, diese Funktion zu emulieren, aber dabei möglicherweise auf weitere Sicherheitseinschränkungen stoßen. Die Funktionalität kann beeinträchtigt werden.", "SystemCheckGzcompressHelp": "Sie müssen die zlib Erweiterung und die gzcompress Funktion aktivieren.", "SystemCheckGzuncompressHelp": "Sie müssen die zlib Erweiterung und die gzuncompress Funktion aktivieren.", - "SystemCheckIconvHelp": "Sie müssen PHP mit \"iconv\" Unterstützung konfigurieren und neu übersetzen ( --with-iconv).", + "SystemCheckIconvHelp": "Sie müssen PHP mit \"iconv\" Unterstützung konfigurieren und neu bauen ( --with-iconv).", "SystemCheckJsonHelp": "Die php5-json Erweiterung wird benötigt, damit Piwik JSON-Daten lesen und schreiben kann.", "SystemCheckMailHelp": "Feedback und Nachrichten zu verlorenen Passwörtern können nicht ohne mail() versendet werden.", "SystemCheckMbstring": "mbstring", diff --git a/plugins/Installation/lang/pl.json b/plugins/Installation/lang/pl.json index 1c1deb7371..e4316c1f2d 100644 --- a/plugins/Installation/lang/pl.json +++ b/plugins/Installation/lang/pl.json @@ -44,6 +44,7 @@ "SetupWebSiteName": "nazwa portalu", "SetupWebsiteSetupSuccess": "Serwis %s utworzono pomyślnie!", "SetupWebSiteURL": "adres URL portalu", + "SiteSetup": "Proszę utworzyć pierwszą stronę, która miała by być anmalizowana prze Piwik'a:", "SiteSetupFootnote": "UWAGA: Nowe strony do śledzenia będzie mozna dodawać dopiero po zakończeniu instalacji Piwik'a", "SuperUser": "Super Użytkownik", "SuperUserLogin": "login super użytkownika", diff --git a/plugins/PleineLune b/plugins/PleineLune deleted file mode 160000 -Subproject d2d78dd7973811cfb3d0744655a2f0d763b0129 diff --git a/plugins/PrivacyManager/lang/pl.json b/plugins/PrivacyManager/lang/pl.json index 205f9abdb0..14a97b8c9e 100644 --- a/plugins/PrivacyManager/lang/pl.json +++ b/plugins/PrivacyManager/lang/pl.json @@ -1,6 +1,7 @@ { "PrivacyManager": { "AnonymizeIpDescription": "Wybierz \"Tak\" jeśli chcesz aby nie śledzić w pełni wykwalifikowanych adresów IP.", + "AnonymizeIpExtendedHelp": "Kiedy użytkownik odwiedzi twoją stronę. Piwik nie użyje całego adresu IP danej osoby (np %s), a zamiast tego wykona anonimizację adresu (do %s). Anonimizacja adresu IP jest wymogiem prawnym w niektórych krajach - na przykład w Niemczech.", "AnonymizeIpInlineHelp": "Anonimizacja ostatniego bajtu w adresie IP odwiedzających, by dostosować się do być może lokalnego prawa do prywatności\/wytycznych o prywatności.", "AnonymizeIpMaskLengtDescription": "Wybierz ile bajtów z odwiedzających' adresów IP powinny być zamaskowane.", "AnonymizeIpMaskLength": "%s bajt(ów) - np. %s", @@ -21,6 +22,7 @@ "DoNotTrack_DisabledMoreInfo": "Dla uszanowania prywatności odwiedzających zalecamy włączenie wsparcia DoNotTrack.", "DoNotTrack_Enable": "Włącz wspracie Do Not Track", "DoNotTrack_Enabled": "Obecnie szanujesz prywatności swojch użytkowników, Brawo!", + "DoNotTrack_EnabledMoreInfo": "Jeżeli użytkownik przeglądarki ustawi sobie ,,I do not want to be tracked \/ Nie chcę być śledzony'' (DoNotTrack jest aktywny) wtedy Piwik nie będzie analizował takich odwiedzin.", "KeepDataFor": "Zachowaj wszystkie dane dla:", "LastDelete": "Ostatnio był usunięte", "LeastDaysInput": "Proszę podać liczbę dni większą niż %s.", diff --git a/plugins/Provider/lang/am.json b/plugins/Provider/lang/am.json index fb7cbc4bc1..1c6787d220 100644 --- a/plugins/Provider/lang/am.json +++ b/plugins/Provider/lang/am.json @@ -1,7 +1,6 @@ { "Provider": { "ColumnProvider": "አቅራቢ", - "SubmenuLocationsProvider": "መገኛ እና አቅራቢ", "WidgetProviders": "አቅራቢዎች" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/ar.json b/plugins/Provider/lang/ar.json index 05c6b61ae3..2e95162c50 100644 --- a/plugins/Provider/lang/ar.json +++ b/plugins/Provider/lang/ar.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "مزود الخدمة", "PluginDescription": "يعرض تقارير عن مزود الخدمة للزوار.", - "SubmenuLocationsProvider": "المكان ومزود الخدمة", "WidgetProviders": "مزودو الخدمة" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/be.json b/plugins/Provider/lang/be.json index f673a9159b..bb65384aaa 100644 --- a/plugins/Provider/lang/be.json +++ b/plugins/Provider/lang/be.json @@ -3,7 +3,6 @@ "ColumnProvider": "Правайдар", "PluginDescription": "Справаздача правайдараў наведвальнікаў.", "ProviderReportDocumentation": "Гэтая справаздача паказвае, якія інтэрнэт-правайдэры наведвальнікаў выкарыстоўваюцца для доступу да вэб-сайту. Вы можаце націснуць на імя правайдэра для больш падрабязнай інфармацыі. %s Калі Piwik не можа вызначыць, правайдэра наведвальніка, ён паказваецца ў якасці IP-адраса.", - "SubmenuLocationsProvider": "Лакацыі і правайдары", "WidgetProviders": "Правайдары" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/bg.json b/plugins/Provider/lang/bg.json index 3d6cefdf5d..cd30212857 100644 --- a/plugins/Provider/lang/bg.json +++ b/plugins/Provider/lang/bg.json @@ -3,7 +3,6 @@ "ColumnProvider": "Интернет доставчик", "PluginDescription": "Доклад за доставчиците на посетителите.", "ProviderReportDocumentation": "Отчетът показва кои доставчици на интернет услуги използват вашите потребители за достъп до уеб сайта. Можете да щракнете върху името на доставчика за повече детайли. %s Ако Piwik не може да определи доставчика на потребителя, той е показан само като IP.", - "SubmenuLocationsProvider": "Места & Доставчици", "WidgetProviders": "Доставчици" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/ca.json b/plugins/Provider/lang/ca.json index a5daa7f4ba..96c08cd7b8 100644 --- a/plugins/Provider/lang/ca.json +++ b/plugins/Provider/lang/ca.json @@ -3,7 +3,6 @@ "ColumnProvider": "Proveïdor", "PluginDescription": "Informació del Proveïdor dels visitants.", "ProviderReportDocumentation": "Aquest informe mostra quin Proveïdor d'Internet han utiltizat els vostres visitants per accedir al lloc. Podeu click al nom del proveïdor per més detalls. %s Si el Piwik no pot determinar el proveïdor del visitant, es mostra la seva adreça IP.", - "SubmenuLocationsProvider": "Localitzacions i proveïdors", "WidgetProviders": "Proveïdors" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/cs.json b/plugins/Provider/lang/cs.json index 3914c77a5f..fcbc311fd4 100644 --- a/plugins/Provider/lang/cs.json +++ b/plugins/Provider/lang/cs.json @@ -4,7 +4,6 @@ "PluginDescription": "Zobrazí poskytovatele připojení návštěvníků", "ProviderReportDocumentation": "Toto hlášení poskytuje informace o tom, jakého poskytovatele internetového připojení vaši návštěvníci při přístupu na stránky použili. Pokud kliknete na jméno poskytovatele, zobrazí se podrobnosti. %s Pokud Piwik nebyl schopen poskytovatele zjistit, je zobrazen jako IP.", "ProviderReportFooter": "Neznámý poskytovatel znamená, že IP adresu nebylo možné vyhledat.", - "SubmenuLocationsProvider": "Umístění a poskytovatel", "WidgetProviders": "Poskytovatelé" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/da.json b/plugins/Provider/lang/da.json index 3f5f8dd911..9ebcd96f60 100644 --- a/plugins/Provider/lang/da.json +++ b/plugins/Provider/lang/da.json @@ -4,7 +4,6 @@ "PluginDescription": "Rapporter de besøgendes udbyder.", "ProviderReportDocumentation": "Rapporten viser hvilken Internet udbyder de besøgende bruger. Klik på en udbyders navn for flere oplysninger. %s Hvis Piwik ikke kan bestemme besøgendes udbyder, er den opført som IP.", "ProviderReportFooter": "Ukendt udbyder betyder at IP-adressen kunne ikke slås op.", - "SubmenuLocationsProvider": "Sted og udbyder", "WidgetProviders": "Udbydere" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/de.json b/plugins/Provider/lang/de.json index 1e2be2784c..d143173e82 100644 --- a/plugins/Provider/lang/de.json +++ b/plugins/Provider/lang/de.json @@ -4,7 +4,6 @@ "PluginDescription": "Stellt Informationen über den Provider des Besuchers dar.", "ProviderReportDocumentation": "Dieser Bericht zeigt Ihnen, welche Internetanbieter die Besucher Ihrer Webseite nutzen. Sie können auf den Namen eines Anbieters klicken, um mehr Informationen dazu zu erhalten. %s Wenn Piwik den Internetanbieter eines Besuchers nicht feststellen kann, wird er unter IP gelistet.", "ProviderReportFooter": "Unbekannter Provider bedeutet die IP-Adresse konnte nicht aufgelöst werden.", - "SubmenuLocationsProvider": "Standorte und Provider", "WidgetProviders": "Provider" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/el.json b/plugins/Provider/lang/el.json index 07eedc062d..cf32f5e7ec 100644 --- a/plugins/Provider/lang/el.json +++ b/plugins/Provider/lang/el.json @@ -4,7 +4,6 @@ "PluginDescription": "Αναφέρει τον Παροχέα των επισκεπτών.", "ProviderReportDocumentation": "Αυτή η αναφορά εμφανίζει ποιος Παροχέας Υπηρεσιών Διαδικτύου (ISP) χρησιμοποιείτε από τους επισκέπτες σας για να επισκεφθούν τις ιστοσελίδες σας. Μπορείτε να πατήσετε σε ένα όνομα Παροχέα για περισσότερες λεπτομέρειες. %s Αν το Piwik δεν μπορεί να ανιχνεύσει το παροχέα του επισκέπτη, χαρακτηρίζεται ως IP.", "ProviderReportFooter": "Άγνωστος πάροχος σημαίνει ότι δεν ήταν δυνατή η εύρεση της διεύθυνσης IP.", - "SubmenuLocationsProvider": "Τοποθεσίες & πάροχοι", "WidgetProviders": "Πάροχοι" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/es.json b/plugins/Provider/lang/es.json index 7ff037c1cb..f644f73079 100644 --- a/plugins/Provider/lang/es.json +++ b/plugins/Provider/lang/es.json @@ -3,7 +3,6 @@ "ColumnProvider": "Proveedor", "PluginDescription": "Reporta el Proveedor de los Visitantes.", "ProviderReportDocumentation": "Este reporte muestra que Proveedores de Servicios de Internet (ISPs) usan sus visitantes para acceder al sitio web. Usted puede hacer clic en el nombre de un proveedor para más detalles. %s Si Piwik no puede determinar el proveedor de un visitante, será puesto como la IP.", - "SubmenuLocationsProvider": "Localizaciones y proveedores", "WidgetProviders": "Proveedores" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/et.json b/plugins/Provider/lang/et.json index 62d493341f..6200fe1913 100644 --- a/plugins/Provider/lang/et.json +++ b/plugins/Provider/lang/et.json @@ -1,7 +1,6 @@ { "Provider": { "ColumnProvider": "Teenusepakkuja", - "SubmenuLocationsProvider": "Asukoht & pakkuja", "WidgetProviders": "Teenusepakkujad" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/eu.json b/plugins/Provider/lang/eu.json index 0c069cffeb..776906791b 100644 --- a/plugins/Provider/lang/eu.json +++ b/plugins/Provider/lang/eu.json @@ -1,7 +1,6 @@ { "Provider": { "ColumnProvider": "Hornitzailea", - "SubmenuLocationsProvider": "Kokalekuak eta hornitzailea", "WidgetProviders": "Hornitzaileak" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/fa.json b/plugins/Provider/lang/fa.json index ff4c40f973..3c3a4efdd0 100644 --- a/plugins/Provider/lang/fa.json +++ b/plugins/Provider/lang/fa.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "ارائه دهنده خدمات", "PluginDescription": "ارائه دهنده خدمات بازدیدکنندگان را گزارش کن.", - "SubmenuLocationsProvider": "محل و ارائه دهنده خدمات", "WidgetProviders": "ارائه دهندگان" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/fi.json b/plugins/Provider/lang/fi.json index fd31c3300e..4492ea9f82 100644 --- a/plugins/Provider/lang/fi.json +++ b/plugins/Provider/lang/fi.json @@ -3,7 +3,6 @@ "ColumnProvider": "Palveluntarjoajat", "PluginDescription": "Raportit käyttäjien palveluntarjoajista.", "ProviderReportDocumentation": "Tämä raportti näyttää, mitä internetin toimittajia kävijäsi käyttivät sivuillasi. Saat lisätietoja klikkaamalla toimittajan nimeä. %s Jos Piwik ei tunnista toimittajan nimeä, kävijästä näytetään IP.", - "SubmenuLocationsProvider": "Sijainnit & palveluntarjoajat", "WidgetProviders": "Palveluntarjoajat" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/fr.json b/plugins/Provider/lang/fr.json index c22839beb3..245f33cc51 100644 --- a/plugins/Provider/lang/fr.json +++ b/plugins/Provider/lang/fr.json @@ -4,7 +4,6 @@ "PluginDescription": "Effectue des rapports sur les FAI des visiteurs.", "ProviderReportDocumentation": "Ce rapport affiche quel Fournisseur d'Accès à Internet vos visiteurs ont utilisé pour accéder à votre site web. Vous pouvez cliquer sur le nom d'un FAI pour plus de détails. %s Si Piwik ne peut déterminer le FAI d'un visiteur, il est listé en tant qu'IP.", "ProviderReportFooter": "Fournisseur d'accès inconnu signifie que l'adresse IP ne peut pas être déterminée", - "SubmenuLocationsProvider": "Situation géographique et FAI", "WidgetProviders": "Fournisseurs d'accès à Internet" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/gl.json b/plugins/Provider/lang/gl.json index 4d6188a76a..e983b9143d 100644 --- a/plugins/Provider/lang/gl.json +++ b/plugins/Provider/lang/gl.json @@ -1,6 +1,5 @@ { "Provider": { - "SubmenuLocationsProvider": "Localizacións e provedor", "WidgetProviders": "Provedores" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/hi.json b/plugins/Provider/lang/hi.json index 1d0929f54d..4a9982d1c6 100644 --- a/plugins/Provider/lang/hi.json +++ b/plugins/Provider/lang/hi.json @@ -3,7 +3,6 @@ "ColumnProvider": "प्रदाता", "PluginDescription": "आगंतुकों के प्रदाता के रिपोर्ट.", "ProviderReportDocumentation": "इस रिपोर्ट से पता चलता है आपके आगंतुकों को वेबसाइट का उपयोग करने के लिए जो इंटरनेट सेवा प्रदाता इस्तेमाल किया है. आप अधिक जानकारी के लिए एक प्रदाता के नाम पर क्लिक कर सकते हैं. %sPiwik एक आगंतुक प्रदाता निर्धारित नहीं कर सकते हैं, यह आईपी के रूप में सूचीबद्ध किया जाता है.", - "SubmenuLocationsProvider": "स्थान और प्रदाता", "WidgetProviders": "प्रदाता" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/hu.json b/plugins/Provider/lang/hu.json index 443f485c8e..048fd62996 100644 --- a/plugins/Provider/lang/hu.json +++ b/plugins/Provider/lang/hu.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "Internetszolgáltató", "PluginDescription": "Jelentések a látogatók internetszolgáltatóról", - "SubmenuLocationsProvider": "Hely és internetszolgáltató", "WidgetProviders": "Internetszolgáltatók" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/id.json b/plugins/Provider/lang/id.json index 95094809f4..2c189c611e 100644 --- a/plugins/Provider/lang/id.json +++ b/plugins/Provider/lang/id.json @@ -3,7 +3,6 @@ "ColumnProvider": "Penyedia", "PluginDescription": "Membuat laporan Penyedia pengunjung.", "ProviderReportDocumentation": "Laporan ini menampilkan Penyedia Layanan Internet yang digunakan oleh pengunjung Anda untuk mengunjungi situs. Anda dapat mengeklik nama penyedia untuk melihat rinciannya. %s Bila Piwik tak dapat menentukan penyedia pengunjung, ini akan ditampikan sebagai IP.", - "SubmenuLocationsProvider": "Lokasi & Penyedia", "WidgetProviders": "Penyedia" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/is.json b/plugins/Provider/lang/is.json index 22c436a004..76f95f96a0 100644 --- a/plugins/Provider/lang/is.json +++ b/plugins/Provider/lang/is.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "Veitandi", "PluginDescription": "Skilar gögnum um þá sem veita gestum á vefinn.", - "SubmenuLocationsProvider": "Staðsetningar & Veitandi", "WidgetProviders": "Veitendur" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/it.json b/plugins/Provider/lang/it.json index 411f3565da..7e9acde2ab 100644 --- a/plugins/Provider/lang/it.json +++ b/plugins/Provider/lang/it.json @@ -4,7 +4,6 @@ "PluginDescription": "Riporta i Provider dei visitatori.", "ProviderReportDocumentation": "Questo reports mostra quali prvider Internet Service (ISP)i tuoi visitatori hanno utilizzato per accedere al sito web. È possibile fare clic su un nome per maggiori dettagli. %s Se Piwik non può determinare il provider di un visitatore, questo viene elencato come IP.", "ProviderReportFooter": "Provider sconosciuto significa che l'indirizzo IP non può essere ricercato", - "SubmenuLocationsProvider": "Località & Provider", "WidgetProviders": "Providers" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/ja.json b/plugins/Provider/lang/ja.json index 59bc3ff874..ea5a684935 100644 --- a/plugins/Provider/lang/ja.json +++ b/plugins/Provider/lang/ja.json @@ -4,7 +4,6 @@ "PluginDescription": "ビジターのプロバイダをリポートします。", "ProviderReportDocumentation": "このリポートは、ウェブサイトにアクセスする訪問者が使っているインターネットサービスプロバイダを示しています。詳細については、プロバイダ名をクリックしてください。 %s Piwikが訪問者のプロバイダを判別できない場合は、IPとして表示されます。", "ProviderReportFooter": "未知のプロバイダーとは IP アドレスが検索できなかったことを意味します。", - "SubmenuLocationsProvider": "所在地とプロバイダ", "WidgetProviders": "プロバイダ" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/ka.json b/plugins/Provider/lang/ka.json index 1b7884e94f..903b6a6085 100644 --- a/plugins/Provider/lang/ka.json +++ b/plugins/Provider/lang/ka.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "პროვაიდერი", "PluginDescription": "აკეტებს ანგარიშს ვიზიტორების პროვაიდერების შესახებ.", - "SubmenuLocationsProvider": "მდებარეობა და პროვაიდერი", "WidgetProviders": "პროვაიდერები" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/ko.json b/plugins/Provider/lang/ko.json index e5810e76f5..36a09ca4d2 100644 --- a/plugins/Provider/lang/ko.json +++ b/plugins/Provider/lang/ko.json @@ -3,7 +3,6 @@ "ColumnProvider": "공급자", "PluginDescription": "방문자의 공급자를 보고합니다.", "ProviderReportDocumentation": "이 보고서는 웹사이트를 방문하는 방문자가 사용하고있는 인터넷 서비스 공급자를 보여줍니다. 자세한 내용은 공급자 이름을 클릭하세요. %s Piwik가 방문자의 공급자를 확인할 수없는 경우는 IP로 표시됩니다.", - "SubmenuLocationsProvider": "위치 및 공급자", "WidgetProviders": "공급자" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/lt.json b/plugins/Provider/lang/lt.json index eb5beb4bca..f8dadfcd42 100644 --- a/plugins/Provider/lang/lt.json +++ b/plugins/Provider/lang/lt.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "IP tiekėjas", "PluginDescription": "Nurodo lankytojų interneto paslaugų tiekėją.", - "SubmenuLocationsProvider": "Vietovės ir IP tiekėjas", "WidgetProviders": "IP tiekėjai" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/lv.json b/plugins/Provider/lang/lv.json index 3e3bbeb285..f1f456274b 100644 --- a/plugins/Provider/lang/lv.json +++ b/plugins/Provider/lang/lv.json @@ -1,7 +1,6 @@ { "Provider": { "ColumnProvider": "Pakalpojumu sniedzējs", - "SubmenuLocationsProvider": "Lokācijas un pakalpojumu sniedzējs", "WidgetProviders": "Pakalpojumu sniedzēji" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/nb.json b/plugins/Provider/lang/nb.json index df2ddd6398..2d9b58595b 100644 --- a/plugins/Provider/lang/nb.json +++ b/plugins/Provider/lang/nb.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "Tilbyder", "PluginDescription": "Rapporterer tilbyderen for de besøkende.", - "SubmenuLocationsProvider": "Lokasjoner og tilbyder", "WidgetProviders": "Tilbydere" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/nl.json b/plugins/Provider/lang/nl.json index fdbc832388..ccd9cad639 100644 --- a/plugins/Provider/lang/nl.json +++ b/plugins/Provider/lang/nl.json @@ -3,7 +3,6 @@ "ColumnProvider": "Provider", "PluginDescription": "Rapporteert de provider van de bezoekers", "ProviderReportDocumentation": "Dit rapport toont de Internet Service Providers die uw bezoekers gebruiken om de website te bezoeken. Klik op een provider naam voor meer informatie. %s Als Piwik de naam van de provider niet kan achterhalen, dan wordt deze vermeld als IP.", - "SubmenuLocationsProvider": "Lokatie & provider", "WidgetProviders": "Providers" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/pl.json b/plugins/Provider/lang/pl.json index 392dc9fbf3..0c21c86927 100644 --- a/plugins/Provider/lang/pl.json +++ b/plugins/Provider/lang/pl.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "Dostawca", "PluginDescription": "Raporty dostawców o odwiedzających.", - "SubmenuLocationsProvider": "Lokalizacje & dostawcy", "WidgetProviders": "Dostawcy" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/pt-br.json b/plugins/Provider/lang/pt-br.json index 43cc0ecc0c..c585a5eeb3 100644 --- a/plugins/Provider/lang/pt-br.json +++ b/plugins/Provider/lang/pt-br.json @@ -3,7 +3,6 @@ "ColumnProvider": "Provedor", "PluginDescription": "Relata o provedor dos visitantes.", "ProviderReportDocumentation": "Este relatório mostra como o Internet Service Providers de seus visitantes -e usado para acessar o site. Você pode clicar no nome de um provedor para obter mais detalhes. %s Se o Piwik não puder determinar o fornecedor de um visitante, ele será listado como IP.", - "SubmenuLocationsProvider": "Lugares e Provedores", "WidgetProviders": "Provedores" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/pt.json b/plugins/Provider/lang/pt.json index 7e295d8279..7c5a619b3e 100644 --- a/plugins/Provider/lang/pt.json +++ b/plugins/Provider/lang/pt.json @@ -3,7 +3,6 @@ "ColumnProvider": "Fornecedor", "PluginDescription": "Relata os Fornecedores dos visitantes.", "ProviderReportDocumentation": "Este relatório mostra quais os ISPs que os seus visitantes usaram para aceder ao website. Você pode clicar num nome do ISP para obter mais detalhes. %s Se o Piwik não pode determinar o ISP do visitante, é listado como IP.", - "SubmenuLocationsProvider": "Localizações & Fornecedores", "WidgetProviders": "Fornecedores" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/ro.json b/plugins/Provider/lang/ro.json index b8d7812650..1f33330eb1 100644 --- a/plugins/Provider/lang/ro.json +++ b/plugins/Provider/lang/ro.json @@ -3,7 +3,6 @@ "ColumnProvider": "Operator", "PluginDescription": "Rapoarte ale Furnizorului de vizitatori.", "ProviderReportDocumentation": "Acest raport arată care furnizorii de servicii de Internet vizitatorii dvs. au folosit pentru a accesa site-ul. Puteți face clic pe un nume de furnizor pentru mai multe detalii. %s Daca Piwik nu poate determina furnizor un vizitator, acesta este listat ca IP.", - "SubmenuLocationsProvider": "Locație și operatori", "WidgetProviders": "Provideri" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/ru.json b/plugins/Provider/lang/ru.json index 02ed392a23..4008abd63c 100644 --- a/plugins/Provider/lang/ru.json +++ b/plugins/Provider/lang/ru.json @@ -3,7 +3,6 @@ "ColumnProvider": "Провайдер", "PluginDescription": "Отображает провайдеры посетителей.", "ProviderReportDocumentation": "Этот отчет показывает, какие интернет-провайдеры у посетителей вашего сайта. Вы можете кликнуть на имя провайдера, чтобы посмотреть детали. %s Если Piwik не может определить провайдера, отображается просто IP.", - "SubmenuLocationsProvider": "Локации и провайдеры", "WidgetProviders": "Провайдеры" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/sk.json b/plugins/Provider/lang/sk.json index a5d817600b..785fececee 100644 --- a/plugins/Provider/lang/sk.json +++ b/plugins/Provider/lang/sk.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "Poskytovateľ", "PluginDescription": "Report cez ktorého poskytovateľa pripojenia prišli návštevníci na web stránku.", - "SubmenuLocationsProvider": "Umiestnenie & poskytovateľ", "WidgetProviders": "Poskytovatelia" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/sl.json b/plugins/Provider/lang/sl.json index 9fa58d1d4a..aecafe7656 100644 --- a/plugins/Provider/lang/sl.json +++ b/plugins/Provider/lang/sl.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "Ponudnik", "ProviderReportFooter": "Neznan ponudnik pomeni, da IP številke ni bilo mogoče povezati s ponudnikom.", - "SubmenuLocationsProvider": "Lokacije & Ponudniki", "WidgetProviders": "Ponudniki" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/sq.json b/plugins/Provider/lang/sq.json index b710b409ef..2172f02a67 100644 --- a/plugins/Provider/lang/sq.json +++ b/plugins/Provider/lang/sq.json @@ -3,7 +3,6 @@ "ColumnProvider": "Mundësues", "PluginDescription": "Raporton Mundësuesin e vizitorëve.", "ProviderReportDocumentation": "Ky raport ju tregon cilët Mundësuesa Shërbimi Internet kanë përdorur vizitorët tuaj për të hyrë te site-i web. Për më tepër hollësi mund të klikoni mbi emrin e një mundësuesi. %s Nëse Piwik nuk arrin ta përcaktojë mundësuesin për një vizitor, e tregon thjesht si IP.", - "SubmenuLocationsProvider": "Vende & Mundësuesa", "WidgetProviders": "Mundësuesa" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/sr.json b/plugins/Provider/lang/sr.json index 4769ee4f59..0b3dd4893a 100644 --- a/plugins/Provider/lang/sr.json +++ b/plugins/Provider/lang/sr.json @@ -3,7 +3,6 @@ "ColumnProvider": "Provajder", "PluginDescription": "Izveštaj o provajderima", "ProviderReportDocumentation": "Ovaj izveštaj prikazuje koje Internet provajdere koriste vaši posetioci kako bi pristupili sajtu. Možete kliknuti na naziv provajdera kako biste videli više detalja. %s Ako Piwik ne može da odredi koji provajder je u pitanju, onda prikazuje IP.", - "SubmenuLocationsProvider": "Lokacije i provajderi", "WidgetProviders": "Provajderi" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/sv.json b/plugins/Provider/lang/sv.json index b07e603efb..ef80a50220 100644 --- a/plugins/Provider/lang/sv.json +++ b/plugins/Provider/lang/sv.json @@ -3,7 +3,6 @@ "ColumnProvider": "Internetleverantör", "PluginDescription": "Rapporterar Internetleverantören som besökaren använder.", "ProviderReportDocumentation": "Denna rapport visar vilka Internetleverantörer dina besökare använde för att få åtkomst till webbplatsen. Du kan klicka på en leverantörs namn för mer information. %s Om Piwik inte kan avgöra en besökares leverantör, så listas den som IP.", - "SubmenuLocationsProvider": "Ursprung och operatör", "WidgetProviders": "Internetleverantör" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/th.json b/plugins/Provider/lang/th.json index cd71ded0ba..2b1b52c53d 100644 --- a/plugins/Provider/lang/th.json +++ b/plugins/Provider/lang/th.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "ผู้ให้บริการ", "PluginDescription": "รายงานผู้ให้บริการของผู้เข้าชม", - "SubmenuLocationsProvider": "ตำแหน่งที่อยู่และผู้ให้บริการ", "WidgetProviders": "ผู้ให้บริการ" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/tl.json b/plugins/Provider/lang/tl.json index 561e248f46..151c759268 100644 --- a/plugins/Provider/lang/tl.json +++ b/plugins/Provider/lang/tl.json @@ -4,7 +4,6 @@ "PluginDescription": "Mga Ulat ng provider ng mga bisita.", "ProviderReportDocumentation": "Ang ulat na itoy ang nagpapakita kung anong Internet Server Providers ang gamit ng iyung bisita upang ma-access ang website. Maari mong e-click ang pangalan ng provider para sa karagdagang detalye. %s kung ang Piwik ay hindi matukoy ang provider ng bisita. ito ay nakalista bilang IP.", "ProviderReportFooter": "Ang hindi kilalang provider ay hindi makikita ang IP address.", - "SubmenuLocationsProvider": "Mga Lokasyon at Provider", "WidgetProviders": "Mga Tagapagtustos" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/tr.json b/plugins/Provider/lang/tr.json index 7526ee9471..644d760ddd 100644 --- a/plugins/Provider/lang/tr.json +++ b/plugins/Provider/lang/tr.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "Sağlayıcı", "PluginDescription": "Ziyaretciden Sağlayıcının Rapoarları", - "SubmenuLocationsProvider": "Konumlar & Sağlayıcı", "WidgetProviders": "Sağlayıcılar" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/uk.json b/plugins/Provider/lang/uk.json index 00717ecf37..b719aa329f 100644 --- a/plugins/Provider/lang/uk.json +++ b/plugins/Provider/lang/uk.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "Провайдер", "PluginDescription": "Звітує про провейдера відвідувачів", - "SubmenuLocationsProvider": "Місцезнаходження та провайдер", "WidgetProviders": "Провайдери" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/vi.json b/plugins/Provider/lang/vi.json index a123aed9ae..42cc2af83c 100644 --- a/plugins/Provider/lang/vi.json +++ b/plugins/Provider/lang/vi.json @@ -3,7 +3,6 @@ "ColumnProvider": "Nhà cung cấp", "PluginDescription": "Báo cáo nhà cung cấp của khách truy cập", "ProviderReportDocumentation": "Báo cáo này cho thấy Nhà cung cấp dịch vụ Internet mà khách truy cập sử dụng để truy cập website. Bạn có thể ckick trên tên nhà cung cấp để biết thêm chi tiết. %s Nếu Piwik không thể xác định được nhà cung cấp của khách truy cập, nó liệt kê danh sách IP.", - "SubmenuLocationsProvider": "Vị trí và nhà cung cấp", "WidgetProviders": "Các nhà cung cấp" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/zh-cn.json b/plugins/Provider/lang/zh-cn.json index 71cd2924f9..9d97f44b70 100644 --- a/plugins/Provider/lang/zh-cn.json +++ b/plugins/Provider/lang/zh-cn.json @@ -3,7 +3,6 @@ "ColumnProvider": "网络服务商", "PluginDescription": "访客的网络服务商的报表。", "ProviderReportDocumentation": "本报表显示访客的网络服务商。点击服务商名字查看详细资料。%s 如果 Piwik 无法判断访客的网络服务商，就列出IP地址。", - "SubmenuLocationsProvider": "地区和网络服务商", "WidgetProviders": "网络服务商" } }
\ No newline at end of file diff --git a/plugins/Provider/lang/zh-tw.json b/plugins/Provider/lang/zh-tw.json index 977a425aca..f37f4154a2 100644 --- a/plugins/Provider/lang/zh-tw.json +++ b/plugins/Provider/lang/zh-tw.json @@ -2,7 +2,6 @@ "Provider": { "ColumnProvider": "供應商", "PluginDescription": "訪客的網際網路服務供應商報表。", - "SubmenuLocationsProvider": "訪客分佈 & 網際網路服務供應商", "WidgetProviders": "網際網路服務供應商" } }
\ No newline at end of file diff --git a/plugins/Resolution/Reports/Base.php b/plugins/Resolution/Reports/Base.php index 4b0e9a5a42..259a164113 100644 --- a/plugins/Resolution/Reports/Base.php +++ b/plugins/Resolution/Reports/Base.php @@ -15,7 +15,7 @@ abstract class Base extends \Piwik\Plugin\Report { protected function init() { - $this->category = 'UserSettings_VisitorSettings'; + $this->category = 'General_VisitorSettings'; } protected function getBasicResolutionDisplayProperties(ViewDataTable $view) diff --git a/plugins/Resolution/lang/cs.json b/plugins/Resolution/lang/cs.json index 9173a432a8..18ff5e94ed 100644 --- a/plugins/Resolution/lang/cs.json +++ b/plugins/Resolution/lang/cs.json @@ -3,6 +3,7 @@ "ColumnConfiguration": "Konfigurace", "ColumnResolution": "Rozlišení", "Configurations": "Nastavení", + "PluginDescription": "Hlásí rozlišení návštěvníků", "Resolutions": "Rozlišení", "WidgetGlobalVisitors": "Hlavní nastavení návštěvníků", "WidgetGlobalVisitorsDocumentation": "Toto hlášení zobrazuje nejčastější konfigurace, které vaši návštěvníci měli. Konfigurace je kombinace operačního systému, prohlížeče a rozlišení.", diff --git a/plugins/ScheduledReports/lang/ar.json b/plugins/ScheduledReports/lang/ar.json index dd612352e5..6ca745ba36 100644 --- a/plugins/ScheduledReports/lang/ar.json +++ b/plugins/ScheduledReports/lang/ar.json @@ -10,7 +10,6 @@ "EmailReports": "التقارير البريدية", "EmailSchedule": "جدولة البريد", "FrontPage": "صفحة المقدمة", - "ManageEmailReports": "إدارة تقارير البريد", "MonthlyScheduleHelp": "الجدولة الشهرية: سيتم إرسال التقرير في الأول من كل شهر.", "MustBeLoggedIn": "يجب أن تسجل الدخول لإنشاء وجدولة التقارير.", "PiwikReports": "تقارير Piwik", diff --git a/plugins/ScheduledReports/lang/be.json b/plugins/ScheduledReports/lang/be.json index 4f920ab3f5..c8b66f3601 100644 --- a/plugins/ScheduledReports/lang/be.json +++ b/plugins/ScheduledReports/lang/be.json @@ -10,7 +10,6 @@ "EmailReports": "Справаздачы па Email", "EmailSchedule": "Расклад электроннай пошты", "FrontPage": "Галоўная старонка", - "ManageEmailReports": "Упраўленне справаздачамі па электроннай пошце", "MonthlyScheduleHelp": "Штомесячны расклад: справаздача будзе адпраўлена першым днём кожнага месяца.", "MustBeLoggedIn": "Вы павінны ўвайсці ў сістэму для стварэння і планавання карыстацкіх справаздач.", "Pagination": "Старонка %s з %s", diff --git a/plugins/ScheduledReports/lang/bg.json b/plugins/ScheduledReports/lang/bg.json index 85a63f3990..8496fda3de 100644 --- a/plugins/ScheduledReports/lang/bg.json +++ b/plugins/ScheduledReports/lang/bg.json @@ -17,7 +17,6 @@ "EmailSchedule": "Списък с е-пощи", "EvolutionGraph": "Показване на графиките с история за най-високите %s стойности", "FrontPage": "Заглавна страница", - "ManageEmailReports": "Управление на Email докладите", "MonthlyScheduleHelp": "Месечен график: докладът ще бъде изпратен на първия ден от всеки месец.", "MustBeLoggedIn": "Трябва да сте влязъл, за да създавате и планирате персонализирани отчети.", "NoRecipients": "Този доклад все още няма получатели", diff --git a/plugins/ScheduledReports/lang/ca.json b/plugins/ScheduledReports/lang/ca.json index 65472b7bcf..3dae4cc9d9 100644 --- a/plugins/ScheduledReports/lang/ca.json +++ b/plugins/ScheduledReports/lang/ca.json @@ -16,7 +16,6 @@ "EmailSchedule": "Programació per correu electrònic", "EvolutionGraph": "Mostrar els valors històrics pels %s valors més representatius.", "FrontPage": "Portada", - "ManageEmailReports": "Administra els informes per correu electrònic.", "MonthlyScheduleHelp": "Programació mensual: L'informe s'enviarà el primer día de cada més.", "MustBeLoggedIn": "Heu d'estar identificat per crear i programar informes personalitzats", "NoRecipients": "Aquest informe no té destinataris", diff --git a/plugins/ScheduledReports/lang/cs.json b/plugins/ScheduledReports/lang/cs.json index a05e8577a1..7c61c7d326 100644 --- a/plugins/ScheduledReports/lang/cs.json +++ b/plugins/ScheduledReports/lang/cs.json @@ -17,7 +17,6 @@ "EmailSchedule": "Plánování zasílání hlášení", "EvolutionGraph": "Zobrazit historické grafy pro %s nejvyšších hodnot", "FrontPage": "Hlavní strana", - "ManageEmailReports": "Spravovat emailové hlášení", "MonthlyScheduleHelp": "Měsíční plán: hlášení bude odesláno první den měsíce", "MustBeLoggedIn": "Musíte být přihlášen, abyste mohl vytvářet vlastní hlášení.", "NoRecipients": "Toto hlášení nemá příjemce", diff --git a/plugins/ScheduledReports/lang/da.json b/plugins/ScheduledReports/lang/da.json index 2c9443f8c6..9c9c5db6f0 100644 --- a/plugins/ScheduledReports/lang/da.json +++ b/plugins/ScheduledReports/lang/da.json @@ -17,7 +17,6 @@ "EmailSchedule": "E-mail tidsplan", "EvolutionGraph": "Vis historiske grafer for top %s værdier", "FrontPage": "Forside", - "ManageEmailReports": "Administrer e-mail rapporter", "MonthlyScheduleHelp": "Månedlig tidsplan: Rapporten vil blive sendt den første dag i hver måned.", "MustBeLoggedIn": "Du skal være logget på for at oprette og planlægge brugerdefinerede rapporter.", "NoRecipients": "Denne rapport har ingen modtagere", diff --git a/plugins/ScheduledReports/lang/de.json b/plugins/ScheduledReports/lang/de.json index b9a942d1ba..43347c5103 100644 --- a/plugins/ScheduledReports/lang/de.json +++ b/plugins/ScheduledReports/lang/de.json @@ -17,7 +17,6 @@ "EmailSchedule": "E-Mail-Zeitplan", "EvolutionGraph": "Zeige historischen Graph für die Top %s Werte", "FrontPage": "Titelseite", - "ManageEmailReports": "E-Mail-Berichte verwalten", "MonthlyScheduleHelp": "Monatlich: Bericht wird immer am ersten Tag des Monats verschickt.", "MustBeLoggedIn": "Sie müssen angemeldet sein, um Berichte anlegen und versenden zu können.", "NoRecipients": "Dieser Bericht hat keine Empfänger.", diff --git a/plugins/ScheduledReports/lang/el.json b/plugins/ScheduledReports/lang/el.json index 64fc8fd25b..3100e30182 100644 --- a/plugins/ScheduledReports/lang/el.json +++ b/plugins/ScheduledReports/lang/el.json @@ -17,7 +17,6 @@ "EmailSchedule": "Προγραμματισμός Ηλεκτρονικής Αλληλογραφίας", "EvolutionGraph": "Προβολή Ιστορικών Διαγραμμάτων για τις κορυφαίες %s τιμές", "FrontPage": "Εξώφυλλο", - "ManageEmailReports": "Διαχείριση Αναφορών Αλληλογραφίας", "MonthlyScheduleHelp": "Μηνιαίος προγραμματισμός: η αναφορά θα αποσταλεί την πρώτη μέρα κάθε μήνα.", "MustBeLoggedIn": "Πρέπει να έχετε συνδεθεί για να δημιουργήσετε και να προγραμματίσετε προσαρμοσμένες αναφορές.", "NoRecipients": "Αυτή η αναφορά δεν έχει παραλήπτες", diff --git a/plugins/ScheduledReports/lang/es.json b/plugins/ScheduledReports/lang/es.json index 0f7dbbbfa3..1f3783e377 100644 --- a/plugins/ScheduledReports/lang/es.json +++ b/plugins/ScheduledReports/lang/es.json @@ -17,7 +17,6 @@ "EmailSchedule": "Programe el envío del Email", "EvolutionGraph": "Mostrar Gráficas Históricas para los %s valores más altos", "FrontPage": "Página Incial", - "ManageEmailReports": "Administrar los Reportes por Email", "MonthlyScheduleHelp": "Envío mensual: los reportes serán enviados el primer día de cada mes.", "MustBeLoggedIn": "Usted debe haber iniciado sesión para crear y programar reportes personalizados.", "NoRecipients": "Este reporte no tiene destinatarios", diff --git a/plugins/ScheduledReports/lang/et.json b/plugins/ScheduledReports/lang/et.json index 71355349bb..cfbd4c26aa 100644 --- a/plugins/ScheduledReports/lang/et.json +++ b/plugins/ScheduledReports/lang/et.json @@ -13,7 +13,6 @@ "EmailReports": "E-posti raportid", "EmailSchedule": "E-posti ajastamine", "FrontPage": "Esileht", - "ManageEmailReports": "Halda e-posti raporteid", "OClock": "kell", "Pagination": "Lehekülg %s \/ %s", "PiwikReports": "Piwiku raportid", diff --git a/plugins/ScheduledReports/lang/fa.json b/plugins/ScheduledReports/lang/fa.json index 15ab6652be..2b0639a91c 100644 --- a/plugins/ScheduledReports/lang/fa.json +++ b/plugins/ScheduledReports/lang/fa.json @@ -17,7 +17,6 @@ "EmailSchedule": "زمانبندی ایمیل", "EvolutionGraph": "نمایش نمودارهای گرافیکی برای مقدار %s بالا", "FrontPage": "صفحه اول", - "ManageEmailReports": "مدیریت گزارش از راه ایمیل", "MonthlyScheduleHelp": "زمانبندی ماهانه: گزارش در اولین روز هر ماه فرستاده خواهد شد.", "MustBeLoggedIn": "برای ساخت و زمانبندی گزارشات دلخواه باید ابتدا وارد شوید", "NoRecipients": "این گزارش هیچ دریافت کننده ای ندارد.", diff --git a/plugins/ScheduledReports/lang/fi.json b/plugins/ScheduledReports/lang/fi.json index f0cc16e6c7..243c714d26 100644 --- a/plugins/ScheduledReports/lang/fi.json +++ b/plugins/ScheduledReports/lang/fi.json @@ -17,7 +17,6 @@ "EmailSchedule": "Sähköpostiaikataulu", "EvolutionGraph": "Näytä historiakuvaajat top-%s arvolle", "FrontPage": "Etusivu", - "ManageEmailReports": "Hallitse sähköpostiraportteja", "MonthlyScheduleHelp": "Kuukausittainen aikataulu: raportti lähetetään kuun ensimmäisenä päivänä.", "MustBeLoggedIn": "Sinun täytyy olla kirjautuneena sisään ennen kustomoitujen raporttien luomista ja ajastamista.", "NoRecipients": "Tällä raportilla ei ole vastaanottajia", diff --git a/plugins/ScheduledReports/lang/fr.json b/plugins/ScheduledReports/lang/fr.json index 4f02025ed8..98a8c2602c 100644 --- a/plugins/ScheduledReports/lang/fr.json +++ b/plugins/ScheduledReports/lang/fr.json @@ -17,7 +17,6 @@ "EmailSchedule": "Planification courriel", "EvolutionGraph": "Afficher les graphiques historiques pour les plus hautes %s valeurs", "FrontPage": "Première page", - "ManageEmailReports": "Gérer les rapports par e-mail", "MonthlyScheduleHelp": "Planification mensuelle : le rapport sera envoyé le premier jour de chaque mois.", "MustBeLoggedIn": "Vous devez être connecté pour créer et planifier des rapports personnalisés.", "NoRecipients": "Ce rapport n'a aucun destinataire", diff --git a/plugins/ScheduledReports/lang/hi.json b/plugins/ScheduledReports/lang/hi.json index 7eaff3b79d..0ab9d5f667 100644 --- a/plugins/ScheduledReports/lang/hi.json +++ b/plugins/ScheduledReports/lang/hi.json @@ -17,7 +17,6 @@ "EmailSchedule": "ईमेल कार्यक्रम तय करे", "EvolutionGraph": "शीर्ष %sमूल्यों के लिए ऐतिहासिक रेखाचित्र दिखाएँ", "FrontPage": "मुखपृष्ठ", - "ManageEmailReports": "ईमेल प्रतिवेदन प्रबंधन", "MonthlyScheduleHelp": "मासिक अनुसूची: रिपोर्ट प्रत्येक माह के पहले दिन भेजी जाएगी.", "MustBeLoggedIn": "तुम्हें विशिष्ट प्रतिवेदन बनाने और अनुसूची करने के लिए लॉग इन होना चाहिए.", "NoRecipients": "इस रिपोर्ट में कोई प्राप्तकर्ता नहीं हैं", diff --git a/plugins/ScheduledReports/lang/id.json b/plugins/ScheduledReports/lang/id.json index 4849633914..5f207a471a 100644 --- a/plugins/ScheduledReports/lang/id.json +++ b/plugins/ScheduledReports/lang/id.json @@ -17,7 +17,6 @@ "EmailSchedule": "Jadwal Surel", "EvolutionGraph": "Tampilkan Grapik Riwayat untuk nilai %s teratas", "FrontPage": "Halaman Depan", - "ManageEmailReports": "Pengatur Laporan Surel", "MonthlyScheduleHelp": "Laporan bulanan: laporan akan dikirim satiap hari pertama tiap bulan.", "MustBeLoggedIn": "Anda harus masuk-log untuk membuat dan mengatur jadwal laporan.", "NoRecipients": "Laporan ini tidak memiliki penerima", diff --git a/plugins/ScheduledReports/lang/it.json b/plugins/ScheduledReports/lang/it.json index f26669d8ca..c43d2b83bf 100644 --- a/plugins/ScheduledReports/lang/it.json +++ b/plugins/ScheduledReports/lang/it.json @@ -17,7 +17,6 @@ "EmailSchedule": "Pianifica Email", "EvolutionGraph": "Mostra Grafici Storici per i %s valori top", "FrontPage": "Prima pagina", - "ManageEmailReports": "Gestisci Report Email", "MonthlyScheduleHelp": "Pianificazione mensile: il report verrà inviato il primo giorno di ogni mese.", "MustBeLoggedIn": "Devi avere effettuato l'accesso per creare e pianificare i report personalizzati.", "NoRecipients": "Questo report non ha destinatari", diff --git a/plugins/ScheduledReports/lang/ja.json b/plugins/ScheduledReports/lang/ja.json index 6ff59005fd..1298149d96 100644 --- a/plugins/ScheduledReports/lang/ja.json +++ b/plugins/ScheduledReports/lang/ja.json @@ -17,7 +17,6 @@ "EmailSchedule": "メールのスケジュール", "EvolutionGraph": "トップの %s 値の履歴グラフを表示", "FrontPage": "表紙", - "ManageEmailReports": "メールリポートの管理", "MonthlyScheduleHelp": "月間スケジュール： リポートは毎月1日に送信されます。", "MustBeLoggedIn": "カスタムリポートの作成とスケジュールにはログインする必要があります。", "NoRecipients": "このレポートは、受取人がいません", diff --git a/plugins/ScheduledReports/lang/ko.json b/plugins/ScheduledReports/lang/ko.json index b59c39c1b6..1a81450362 100644 --- a/plugins/ScheduledReports/lang/ko.json +++ b/plugins/ScheduledReports/lang/ko.json @@ -16,7 +16,6 @@ "EmailSchedule": "이메일 예약", "EvolutionGraph": "%s의 값에 대한 이력 그래프 표시", "FrontPage": "시작 페이지", - "ManageEmailReports": "이메일 보고서 관리", "MonthlyScheduleHelp": "월간 스케줄: 보고서는 매월 1일에 발송됩니다.", "MustBeLoggedIn": "보고서 작성 및 일정을 사용자정의하려면 로그인해야합니다.", "NoRecipients": "이 보고서의 수신자가 없음", diff --git a/plugins/ScheduledReports/lang/lt.json b/plugins/ScheduledReports/lang/lt.json index d3a56495e8..5f6df46080 100644 --- a/plugins/ScheduledReports/lang/lt.json +++ b/plugins/ScheduledReports/lang/lt.json @@ -7,7 +7,6 @@ "EmailReports": "Ataskaitos el. paštu", "EmailSchedule": "Siuntimo tvarkaraštis", "FrontPage": "Pirminis puslapis", - "ManageEmailReports": "Administruoti ataskaitas", "MonthlyScheduleHelp": "Kas mėnesį: ataskaita bus išsiųsta kiekvieno mėnesio pirmąją dieną.", "Pagination": "Puslapis %s iš %s", "PiwikReports": "Piwik ataskaitos", diff --git a/plugins/ScheduledReports/lang/nb.json b/plugins/ScheduledReports/lang/nb.json index 22e703648c..4a524c5031 100644 --- a/plugins/ScheduledReports/lang/nb.json +++ b/plugins/ScheduledReports/lang/nb.json @@ -7,7 +7,6 @@ "EmailReports": "E-postrapporter", "EmailSchedule": "E-postplan", "FrontPage": "Forside", - "ManageEmailReports": "Administrer e-postrapporter", "MonthlyScheduleHelp": "Månedsplan: Rapportene blir sendt første dag i hver måned.", "NoRecipients": "Denne rapporten har ingen mottakere", "Pagination": "Side %s av %s", diff --git a/plugins/ScheduledReports/lang/nl.json b/plugins/ScheduledReports/lang/nl.json index 110898e58b..8689867aad 100644 --- a/plugins/ScheduledReports/lang/nl.json +++ b/plugins/ScheduledReports/lang/nl.json @@ -17,7 +17,6 @@ "EmailSchedule": "E-mail tijdsschema", "EvolutionGraph": "Toon historische grafieken voor de top %s waarden", "FrontPage": "Voorpagina", - "ManageEmailReports": "Beheer de e-mail rapporten", "MonthlyScheduleHelp": "Maandelijks versturen: Rapport zal worden verzonden elke eerste dag van de maand.", "MustBeLoggedIn": "U moet ingelogd zijn om aangepaste rapporten te maken en in te plannen.", "NoRecipients": "Dit rapport heeft geen ontvangers", diff --git a/plugins/ScheduledReports/lang/pl.json b/plugins/ScheduledReports/lang/pl.json index 4639f0b616..85d6b37322 100644 --- a/plugins/ScheduledReports/lang/pl.json +++ b/plugins/ScheduledReports/lang/pl.json @@ -13,7 +13,6 @@ "EmailReports": "Raporty pocztowe", "EmailSchedule": "Kalendarium poczty e-mail", "FrontPage": "Strona główna", - "ManageEmailReports": "Administracja raportami pocztowymi", "MonthlyScheduleHelp": "Planowanie miesięczne: raport będzie wysyłany pierwszego dnia każdego miesiąca.", "PiwikReports": "Raporty Piwik", "PleaseFindAttachedFile": "Prosimy odszukać w pliku załącznika twój %1$s raport dla %2$s.", diff --git a/plugins/ScheduledReports/lang/pt-br.json b/plugins/ScheduledReports/lang/pt-br.json index 9010596b78..a2057c8ef9 100644 --- a/plugins/ScheduledReports/lang/pt-br.json +++ b/plugins/ScheduledReports/lang/pt-br.json @@ -17,7 +17,6 @@ "EmailSchedule": "Agendamento de e-mail", "EvolutionGraph": "Mostrar gráficos históricos para os principais %s valores", "FrontPage": "Primeira página", - "ManageEmailReports": "Gerenciar relatórios de e-mail", "MonthlyScheduleHelp": "Programação mensal: relatório será enviado no primeiro dia de cada mês.", "MustBeLoggedIn": "Você precisa estar logado para criar e agendar relatórios personalizados.", "NoRecipients": "Este relatório não tem destinatários", diff --git a/plugins/ScheduledReports/lang/pt.json b/plugins/ScheduledReports/lang/pt.json index b91b390ec4..42a9fd7f95 100644 --- a/plugins/ScheduledReports/lang/pt.json +++ b/plugins/ScheduledReports/lang/pt.json @@ -14,7 +14,6 @@ "EmailReports": "Relatórios Email", "EmailSchedule": "Agenda de Email", "FrontPage": "Primeira Página", - "ManageEmailReports": "Gerir relatórios de email", "MonthlyScheduleHelp": "Agenda mensal: o relatório será enviado no primeiro dia de cada mês.", "MustBeLoggedIn": "Deve estar autenticado para criar e agendar relatórios personalizados.", "Pagination": "Página %s de %s", diff --git a/plugins/ScheduledReports/lang/ro.json b/plugins/ScheduledReports/lang/ro.json index d574374163..3b0822b5cb 100644 --- a/plugins/ScheduledReports/lang/ro.json +++ b/plugins/ScheduledReports/lang/ro.json @@ -17,7 +17,6 @@ "EmailSchedule": "E-mail Program", "EvolutionGraph": "Arata Graficele Istorice pentru valorile top %s", "FrontPage": "Pagina titlu", - "ManageEmailReports": "Gestionare e-mail Rapoarte", "MonthlyScheduleHelp": "Program lunar: Raportul va fi trimis în prima zi a fiecărei luni.", "MustBeLoggedIn": "Trebuie să fii logat pentru a crea și programa rapoarte personalizate.", "NoRecipients": "Acest raport nu are destinatari", diff --git a/plugins/ScheduledReports/lang/ru.json b/plugins/ScheduledReports/lang/ru.json index 82dde7dcd3..507d4bda0d 100644 --- a/plugins/ScheduledReports/lang/ru.json +++ b/plugins/ScheduledReports/lang/ru.json @@ -16,7 +16,6 @@ "EmailSchedule": "Расписание e-mail рассылки", "EvolutionGraph": "Показать историю изменения графика для первых %s значений.", "FrontPage": "Первая страница", - "ManageEmailReports": "Управление Email-отчетами", "MonthlyScheduleHelp": "Ежемесячное расписание: отчеты будут рассылаться каждый первый день месяца.", "MustBeLoggedIn": "Вы должны быть авторизованы для создания и редактирования расписания отчетов.", "NoRecipients": "У этого отчета нет получателей", diff --git a/plugins/ScheduledReports/lang/sl.json b/plugins/ScheduledReports/lang/sl.json index 1f68dfb058..6867ebf308 100644 --- a/plugins/ScheduledReports/lang/sl.json +++ b/plugins/ScheduledReports/lang/sl.json @@ -8,7 +8,6 @@ "EmailReports": "Email Poročila", "EmailSchedule": "Urnik Emailov", "FrontPage": "Prva Stran", - "ManageEmailReports": "Urejaj Email Poročila", "MonthlyScheduleHelp": "Mesečno poročilo: poročilo bo poslano vsak prvi dan v mesecu.", "Pagination": "Stran %s od %s", "PiwikReports": "Piwik Poročila", diff --git a/plugins/ScheduledReports/lang/sq.json b/plugins/ScheduledReports/lang/sq.json index af1d5e09f0..d0572d2881 100644 --- a/plugins/ScheduledReports/lang/sq.json +++ b/plugins/ScheduledReports/lang/sq.json @@ -14,7 +14,6 @@ "EmailReports": "Dërgo Raportet Me Email", "EmailSchedule": "Plan Dërgimi me Email", "FrontPage": "Faqja Ballore", - "ManageEmailReports": "Administroni Raporte Email", "MonthlyScheduleHelp": "Planifikim mujor: raporti do të dërgohet ditën e parë të çdo muaji.", "MustBeLoggedIn": "Duhet të jeni i futur që të krijoni dhe të planifikoni raporte të personalizuar.", "Pagination": "Faqja %s nga %s", diff --git a/plugins/ScheduledReports/lang/sr.json b/plugins/ScheduledReports/lang/sr.json index e24b0f6640..03d6f6048f 100644 --- a/plugins/ScheduledReports/lang/sr.json +++ b/plugins/ScheduledReports/lang/sr.json @@ -17,7 +17,6 @@ "EmailSchedule": "Zakaži slanje", "EvolutionGraph": "Prikaži istorijske grafikone za prvih %s vrednosti", "FrontPage": "Naslovna strana", - "ManageEmailReports": "Upravljanje izveštajima", "MonthlyScheduleHelp": "Mesečno zakazivanje: izveštaj će biti poslat svakog prvog u mesecu.", "MustBeLoggedIn": "Morate biti prijavljeni na sistem kako biste kreirali i zakazivali izveštaje.", "NoRecipients": "Nije definisan primaoc", diff --git a/plugins/ScheduledReports/lang/sv.json b/plugins/ScheduledReports/lang/sv.json index 7101c7f4c0..39cb85be69 100644 --- a/plugins/ScheduledReports/lang/sv.json +++ b/plugins/ScheduledReports/lang/sv.json @@ -17,7 +17,6 @@ "EmailSchedule": "Schemalagd e-post", "EvolutionGraph": "Visa historiska grafer för dom topp %s värdena", "FrontPage": "Startsida", - "ManageEmailReports": "Hantera e-postrapporter", "MonthlyScheduleHelp": "Månatligt schema: Rapporten kommer att skickas ut den första dagen i varje månad.", "MustBeLoggedIn": "Du måste vara inloggad för att skapa och schemalägga anpassade rapporter.", "NoRecipients": "Rapporten har ingen mottagare", diff --git a/plugins/ScheduledReports/lang/ta.json b/plugins/ScheduledReports/lang/ta.json index 956f74dad9..025dbfcad4 100644 --- a/plugins/ScheduledReports/lang/ta.json +++ b/plugins/ScheduledReports/lang/ta.json @@ -3,7 +3,6 @@ "CreateReport": "அறிக்கையை உருவாக்கு", "EmailReports": "மின்னஞ்சல் அறிக்கைகள்", "EmailSchedule": "மின்னஞ்சல் பட்டி", - "FrontPage": "முன் பக்கம்", - "ManageEmailReports": "மின்னஞ்சல் அறிக்கைகளை மேலாண் செய்" + "FrontPage": "முன் பக்கம்" } }
\ No newline at end of file diff --git a/plugins/ScheduledReports/lang/tl.json b/plugins/ScheduledReports/lang/tl.json index ffd25ed8c8..1ef12ad137 100644 --- a/plugins/ScheduledReports/lang/tl.json +++ b/plugins/ScheduledReports/lang/tl.json @@ -17,7 +17,6 @@ "EmailSchedule": "Iskedyul ng email", "EvolutionGraph": "Ipakita ang mga Makasaysayang Graph para sa nangungunang %s halaga", "FrontPage": "Pangunahing Pahina", - "ManageEmailReports": "Pamahalaan ang mga Ulat sa Email", "MonthlyScheduleHelp": "Buwanang iskedyul: ang ulat ay ipapadala sa unang araw ng bawat buwan.", "MustBeLoggedIn": "Kailangang naka-log in upang gumawa at mag-iskedyul ng mga pasadyang ulat", "NoRecipients": "Wala pang makakatanggap sa ulat na ito", diff --git a/plugins/ScheduledReports/lang/vi.json b/plugins/ScheduledReports/lang/vi.json index 7c516be7f3..f823b6ed6a 100644 --- a/plugins/ScheduledReports/lang/vi.json +++ b/plugins/ScheduledReports/lang/vi.json @@ -17,7 +17,6 @@ "EmailSchedule": "Lịch email", "EvolutionGraph": "Hiển thị đồ thị lịch sử cho các giá trị %s đứng đầu", "FrontPage": "Trang đầu", - "ManageEmailReports": "Quản lý các báo cáo email", "MonthlyScheduleHelp": "Lịch trình hàng tháng: báo cáo sẽ được gửi vào ngày đầu tiên của mỗi tháng.", "MustBeLoggedIn": "Bạn phải đăng nhập để tạo và lập lịch các báo cáo tùy chỉnh.", "NoRecipients": "Báo cáo này không có người nhận", diff --git a/plugins/ScheduledReports/lang/zh-cn.json b/plugins/ScheduledReports/lang/zh-cn.json index 15fcd666d3..4fbd319d04 100644 --- a/plugins/ScheduledReports/lang/zh-cn.json +++ b/plugins/ScheduledReports/lang/zh-cn.json @@ -17,7 +17,6 @@ "EmailSchedule": "邮件计划", "EvolutionGraph": "显示前 %s 个的历史图形", "FrontPage": "首页", - "ManageEmailReports": "管理报表邮件", "MonthlyScheduleHelp": "每月计划: 报表将会在每月的第一天寄出。", "MustBeLoggedIn": "登录后才能创建和自定义报表。", "NoRecipients": "这个报表没有收件人", diff --git a/plugins/ScheduledReports/tests/Integration/ApiTest.php b/plugins/ScheduledReports/tests/Integration/ApiTest.php index af8450308a..080e3b3be1 100644 --- a/plugins/ScheduledReports/tests/Integration/ApiTest.php +++ b/plugins/ScheduledReports/tests/Integration/ApiTest.php @@ -406,8 +406,8 @@ class ApiTest extends IntegrationTestCase public function getGetReportSubjectAndReportTitleTestCases() { return array( - array('<Piwik.org>', '<Piwik.org>', '<Piwik.org>', array('UserSettings_getBrowserType')), - array('Piwik.org', 'Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'UserSettings_getBrowserType')), + array('<Piwik.org>', '<Piwik.org>', '<Piwik.org>', array('DevicesDetection_getBrowserEngines')), + array('Piwik.org', 'Piwik.org', 'Piwik.org', array('MultiSites_getAll', 'DevicesDetection_getBrowserEngines')), array('General_MultiSitesSummary', 'General_MultiSitesSummary', 'Piwik.org', array('MultiSites_getAll')), ); } diff --git a/plugins/SitesManager/lang/pl.json b/plugins/SitesManager/lang/pl.json index 6e66aacd4d..f291f701d9 100644 --- a/plugins/SitesManager/lang/pl.json +++ b/plugins/SitesManager/lang/pl.json @@ -28,6 +28,7 @@ "ListOfQueryParametersToBeExcludedOnAllWebsites": "Parametry dotyczące listy zapytań z adresami URL przedstawione poniżej zostaną wykluczone ze statystyk na wszystkich stronach.", "ListOfQueryParametersToExclude": "Wprowadź listę z parametrami zapytań URL, po jednym w linii, by móc wykluczyć je z raportów o adresach URL stron.", "MainDescription": "Twoje raporty z analityką statystyczną stron wymagają posiadania serwisu internetowego! Dodaj, zaktualizuj, zmień serwis internetowy, i wyświetl kod JavaScript do umieszczenia na stronach.", + "NotAnEcommerceSite": "Strona nie jest typu Ecommerce", "NotFound": "Nie znaleziono stron dla", "NoWebsites": "Nie posiadasz żadnej strony którą możesz zarządzać.", "OnlyOneSiteAtTime": "W danym momencie możesz edytować tylko jedną ze stron. Zapisz lub zrezygnuj z wprowadzonych teraz modyfikacji dla strony %s.", diff --git a/plugins/TestRunner/TravisYml/TravisYmlView.php b/plugins/TestRunner/TravisYml/TravisYmlView.php index 71faf4408b..e923b29784 100644 --- a/plugins/TestRunner/TravisYml/TravisYmlView.php +++ b/plugins/TestRunner/TravisYml/TravisYmlView.php @@ -76,7 +76,7 @@ class TravisYmlView extends View /** * Sets the name of plugin the generated .travis.yml file is for. * - * @param string $pluginName ie, ExamplePlugin, UserSettings, etc. + * @param string $pluginName ie, ExamplePlugin, UserLanguage, etc. */ public function setPlugin($pluginName) { diff --git a/plugins/Transitions/lang/pl.json b/plugins/Transitions/lang/pl.json index fe46fd9685..07eb95002b 100644 --- a/plugins/Transitions/lang/pl.json +++ b/plugins/Transitions/lang/pl.json @@ -10,6 +10,7 @@ "LoopsInline": "%s odświeżeń stron", "OutgoingTraffic": "Ruch wychodzący", "ToFollowingSiteSearches": "Wyszukania Wewnętrzne", - "ToFollowingSiteSearchesInline": "%s wewnętrzne wyszukiwania" + "ToFollowingSiteSearchesInline": "%s wewnętrzne wyszukiwania", + "XOutOfYVisits": "%s (z %s)" } }
\ No newline at end of file diff --git a/plugins/UserCountry/lang/pl.json b/plugins/UserCountry/lang/pl.json index 826d1ac6bf..3ee40d3b98 100644 --- a/plugins/UserCountry/lang/pl.json +++ b/plugins/UserCountry/lang/pl.json @@ -289,12 +289,26 @@ "country_zm": "Zambia", "country_zr": "Zair", "country_zw": "Zimbabwe", + "CurrentLocationIntro": "Według tego dostawcy, twoją aktualną lokalizacją jest", + "DefaultLocationProviderDesc1": "Domyślny dostawca usług geolokacyjnych zgaduje państwo odwiedzającego na podstawie języka używanego w przeglądarce.", "DistinctCountries": "%s wyróżniających się krajów", "DownloadingDb": "Pobieranie %s", "DownloadNewDatabasesEvery": "Zaktualizuj bazę danych co", "FoundApacheModules": "Piwik znalazł następujące moduły Apache", "FromDifferentCities": "różne miasta", "GeoIPDatabases": "Baza danych GeoIP", + "GeoIPImplHasAccessTo": "Ta implementacja GeoIP ma dostęp do następujących typów baz danych", + "GeoIPIncorrectDatabaseFormat": "Twoja baza GeoIP ma niepoprawny format. Może być uszkodzona. Dopilnuj by używać wersji binarnej oraz spróbuj podmienić bazę na nową kopię\/wersję.", + "GeoIpLocationProviderDesc_Pecl2": "Ten dostawca nie podlega żadnym ograniczeniom w działaniu, dlatego polecamy jego używanie.", + "GeoIpLocationProviderDesc_Php2": "Jeżeli twoja strona ma bardzo dużo ruchu, ten dostawca usług lokacyjnych może okazać się za wolny. W takim wypadku zaleca się instalację %1$srozszerzenia PECL%2$s lub %3$smoduło serverowego%4$s.", + "GeoIpLocationProviderDesc_ServerBased2": "W przypadku importu plików logów lub wykonaniu innej operacji mogącej wymagać ustawienia adres IP, prosimy używać %1$simplementacji GeoIP PECL (rekomendowana)%2$s lub %3$simplementacji GeoIP PHP%4$s.", + "GeoIpLocationProviderDesc_ServerBasedAnonWarn": "NOTKA: Anonimizacja IP nie wywiera żadnego efektu gdy jest używana z tym dostawcą. Przed użyciem anonimizacji adresów IP, upewnij się, iż nie narusza ono żadnych praw do prywatności, który może podlegać.", + "GeoIpLocationProviderNotRecomnended": "Geolokacja działa, ale nie używasz rekomendowanego dostawcy.", + "GeoIPNoServerVars": "Piwik nie może znaleźć żadnych zmiennych %s GeoIP", + "GeoIPServerVarsFound": "Piwik wykrył następujące zmienne GeoIP %s", + "GeoIPUpdaterInstructions": "Wprowadź poniżej linki do twoich baz danych. Jeżeli bazy zostały zakupione od %3$sMaxMind%4$s, możesz znaleźć takowe linki %1$stutaj%2$s. W przypadku problemów z dostępem do plików, należy kontaktować się z %3$sMaxMind%4$s.", + "GeoIPUpdaterIntro": "Piwik zarządza aktualizacjami dla następujących baz GeoIP", + "GeoLiteCityLink": "W przypadku używania darmowej bazy GeoLite Miasta, użyj tego linka: %1$s%2$s%3$s", "Geolocation": "Geolokalizacja", "GeolocationPageDesc": "Na tej stronie można zmienić sposób wykrywania lokalizacji odwiedzających stosowany przez Piwik'a.", "getCityDocumentation": "Raport ten pokazuje miasta, w których przebywali odwiedzający gdy whcodzili na stronę.", @@ -322,6 +336,7 @@ "SetupAutomaticUpdatesOfGeoIP": "Ustaw automatyczne aktualizacje dla bazy danych GeoIP", "SubmenuLocations": "Położenia", "UnsupportedArchiveType": "Napotkał nieobsługiwany typ archiwum %1$s.", + "UpdaterHasNotBeenRun": "Aktualizacja nie została jeszcze wykonana.", "WidgetLocation": "Lokalizacja odwiedzającego" } }
\ No newline at end of file diff --git a/plugins/UserSettings/.gitignore b/plugins/UserLanguage/.gitignore index c8c9480010..c8c9480010 100644 --- a/plugins/UserSettings/.gitignore +++ b/plugins/UserLanguage/.gitignore diff --git a/plugins/UserLanguage/API.php b/plugins/UserLanguage/API.php new file mode 100644 index 0000000000..30d6ffd8ce --- /dev/null +++ b/plugins/UserLanguage/API.php @@ -0,0 +1,55 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\UserLanguage; + +use Piwik\Archive; +use Piwik\DataTable; +use Piwik\Metrics; +use Piwik\Piwik; + +/** + * @see plugins/UserLanguage/functions.php + */ +require_once PIWIK_INCLUDE_PATH . '/plugins/UserLanguage/functions.php'; + +/** + * The UserLanguage API lets you access reports about your Visitors language setting + * + * @method static \Piwik\Plugins\UserLanguage\API getInstance() + */ +class API extends \Piwik\Plugin\API +{ + protected function getDataTable($name, $idSite, $period, $date, $segment) + { + Piwik::checkUserHasViewAccess($idSite); + $archive = Archive::build($idSite, $period, $date, $segment); + $dataTable = $archive->getDataTable($name); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); + $dataTable->queueFilter('ReplaceColumnNames'); + $dataTable->queueFilter('ReplaceSummaryRowLabel'); + return $dataTable; + } + + public function getLanguage($idSite, $period, $date, $segment = false) + { + $dataTable = $this->getDataTable(Archiver::LANGUAGE_RECORD_NAME, $idSite, $period, $date, $segment); + $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\groupByLangCallback')); + $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\languageTranslate')); + + return $dataTable; + } + + public function getLanguageCode($idSite, $period, $date, $segment = false) + { + $dataTable = $this->getDataTable(Archiver::LANGUAGE_RECORD_NAME, $idSite, $period, $date, $segment); + $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\languageTranslateWithCode')); + + return $dataTable; + } +} diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserLanguage/Archiver.php index 28f405adf3..14fd369eec 100644 --- a/plugins/UserSettings/Archiver.php +++ b/plugins/UserLanguage/Archiver.php @@ -7,7 +7,7 @@ * */ -namespace Piwik\Plugins\UserSettings; +namespace Piwik\Plugins\UserLanguage; use Piwik\Common; use Piwik\Container\StaticContainer; @@ -16,16 +16,16 @@ use Piwik\DataTable; use Piwik\Intl\Data\Provider\RegionDataProvider; use Piwik\Metrics; -require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; +require_once PIWIK_INCLUDE_PATH . '/plugins/UserLanguage/functions.php'; /** - * Archiver for UserSettings Plugin + * Archiver for UserLanguage Plugin * * @see PluginsArchiver */ class Archiver extends \Piwik\Plugin\Archiver { - const LANGUAGE_RECORD_NAME = 'UserSettings_language'; + const LANGUAGE_RECORD_NAME = 'UserLanguage_language'; const LANGUAGE_DIMENSION = "log_visit.location_browser_lang"; diff --git a/plugins/UserSettings/Columns/Language.php b/plugins/UserLanguage/Columns/Language.php index 4f31778e2d..5812528688 100644 --- a/plugins/UserSettings/Columns/Language.php +++ b/plugins/UserLanguage/Columns/Language.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\Columns; +namespace Piwik\Plugins\UserLanguage\Columns; use Piwik\Common; use Piwik\Piwik; diff --git a/plugins/UserSettings/Reports/Base.php b/plugins/UserLanguage/Reports/Base.php index e802c9a3f1..5496a64b9e 100644 --- a/plugins/UserSettings/Reports/Base.php +++ b/plugins/UserLanguage/Reports/Base.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\Reports; +namespace Piwik\Plugins\UserLanguage\Reports; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\CoreVisualizations\Visualizations\Graph; @@ -15,7 +15,7 @@ abstract class Base extends \Piwik\Plugin\Report { protected function init() { - $this->category = 'UserSettings_VisitorSettings'; + $this->category = 'General_VisitorSettings'; } protected function getBasicUserSettingsDisplayProperties(ViewDataTable $view) diff --git a/plugins/UserSettings/Reports/GetLanguage.php b/plugins/UserLanguage/Reports/GetLanguage.php index 9c67e8b8ea..70f4304fa6 100644 --- a/plugins/UserSettings/Reports/GetLanguage.php +++ b/plugins/UserLanguage/Reports/GetLanguage.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\Reports; +namespace Piwik\Plugins\UserLanguage\Reports; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\UserSettings\Columns\Language; +use Piwik\Plugins\UserLanguage\Columns\Language; class GetLanguage extends Base { @@ -18,10 +18,10 @@ class GetLanguage extends Base { parent::init(); $this->dimension = new Language(); - $this->name = Piwik::translate('UserSettings_BrowserLanguage'); + $this->name = Piwik::translate('UserLanguage_BrowserLanguage'); $this->documentation = ''; // TODO $this->order = 10; - $this->widgetTitle = 'UserSettings_BrowserLanguage'; + $this->widgetTitle = 'UserLanguage_BrowserLanguage'; } public function configureView(ViewDataTable $view) diff --git a/plugins/UserSettings/Reports/GetLanguageCode.php b/plugins/UserLanguage/Reports/GetLanguageCode.php index c6b609c8f9..9b2ab021d9 100644 --- a/plugins/UserSettings/Reports/GetLanguageCode.php +++ b/plugins/UserLanguage/Reports/GetLanguageCode.php @@ -6,10 +6,10 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\Reports; +namespace Piwik\Plugins\UserLanguage\Reports; use Piwik\Piwik; -use Piwik\Plugins\UserSettings\Columns\Language; +use Piwik\Plugins\UserLanguage\Columns\Language; class GetLanguageCode extends GetLanguage { @@ -17,10 +17,10 @@ class GetLanguageCode extends GetLanguage { parent::init(); $this->dimension = new Language(); - $this->name = Piwik::translate('UserSettings_LanguageCode'); + $this->name = Piwik::translate('UserLanguage_LanguageCode'); $this->documentation = ''; $this->order = 11; - $this->widgetTitle = 'UserSettings_LanguageCode'; + $this->widgetTitle = 'UserLanguage_LanguageCode'; } public function getRelatedReports() diff --git a/plugins/UserLanguage/UserLanguage.php b/plugins/UserLanguage/UserLanguage.php new file mode 100644 index 0000000000..f8bad84ba2 --- /dev/null +++ b/plugins/UserLanguage/UserLanguage.php @@ -0,0 +1,16 @@ +<?php +/** + * Piwik - free/libre analytics platform + * + * @link http://piwik.org + * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later + * + */ +namespace Piwik\Plugins\UserLanguage; + +/** + * + */ +class UserLanguage extends \Piwik\Plugin +{ +}
\ No newline at end of file diff --git a/plugins/UserSettings/functions.php b/plugins/UserLanguage/functions.php index f00f717ea3..6e28cddf27 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserLanguage/functions.php @@ -7,10 +7,9 @@ * */ -namespace Piwik\Plugins\UserSettings; +namespace Piwik\Plugins\UserLanguage; use Piwik\Piwik; -use Piwik\Tracker\Request; /** * Returns the given language code to translated language name @@ -25,13 +24,13 @@ function languageTranslate($label) return Piwik::translate('General_Unknown'); } - $key = 'UserSettings_Language_' . $label; + $key = 'UserLanguage_Language_' . $label; $translation = Piwik::translate($key); // Show language code if unknown code if ($translation == $key) { - $translation = Piwik::translate('UserSettings_LanguageCode') . ' ' . $label; + $translation = Piwik::translate('UserLanguage_LanguageCode') . ' ' . $label; } return $translation; diff --git a/plugins/UserSettings/lang/am.json b/plugins/UserLanguage/lang/am.json index fdf11f9b68..52e9db00c0 100644 --- a/plugins/UserSettings/lang/am.json +++ b/plugins/UserLanguage/lang/am.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "አፋርኛ", "Language_ab": "አብሐዚኛ", "Language_af": "አፍሪካንስኛ", @@ -154,7 +154,6 @@ "Language_za": "ዡዋንግኛ", "Language_zh": "ቻይንኛ", "Language_zu": "ዙሉኛ", - "LanguageCode": "የቋንቋ ኮድ", - "VisitorSettings": "የጎበኚዎች ቅንብሮች" + "LanguageCode": "የቋንቋ ኮድ" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ar.json b/plugins/UserLanguage/lang/ar.json index f8e7b5a261..c02fc61e8c 100644 --- a/plugins/UserSettings/lang/ar.json +++ b/plugins/UserLanguage/lang/ar.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "الأفارية", "Language_ab": "الأبخازية", "Language_ae": "الأفستية", @@ -183,8 +183,6 @@ "Language_za": "الزهيونج", "Language_zh": "الصينية", "Language_zu": "الزولو", - "LanguageCode": "كود اللغة", - "PluginDescription": "تقارير عن إعدادات المستخدمين المختلفة: المتصفح، عائلة المتصفح، نظام التشغيل، الإضافات البرمجية، كثافة الشاشة النقطية، الإعدادات العامة.", - "VisitorSettings": "إعدادات الزوار" + "LanguageCode": "كود اللغة" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/be.json b/plugins/UserLanguage/lang/be.json index 567de44341..eca3f52fd8 100644 --- a/plugins/UserSettings/lang/be.json +++ b/plugins/UserLanguage/lang/be.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_ab": "абхазская", "Language_af": "афрыкаанс", "Language_am": "амхарская", @@ -114,8 +114,6 @@ "Language_yi": "ідыш", "Language_zh": "кітайская", "Language_zu": "зулу", - "LanguageCode": "Код мовы", - "PluginDescription": "Справаздачы наладак карыстальнікаў: Браўзэр, Сямейства Браўзэр сям'і, Аперацыйная сістэма, Плагіны, Глабальныя параметры.", - "VisitorSettings": "Налады карыстача" + "LanguageCode": "Код мовы" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/bg.json b/plugins/UserLanguage/lang/bg.json index 4507c890df..0696d8caaf 100644 --- a/plugins/UserSettings/lang/bg.json +++ b/plugins/UserLanguage/lang/bg.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Език на браузъра", "Language_aa": "афарски", "Language_ab": "абхазки", @@ -185,8 +185,6 @@ "Language_za": "зуанг", "Language_zh": "китайски", "Language_zu": "зулуски", - "LanguageCode": "Код на езика", - "PluginDescription": "Докладът за различните потребителски настройки: Браузър, Браузър Семейство, операционна система, модули, резолюция, Глобални настройки.", - "VisitorSettings": "Настройки на посетителя" + "LanguageCode": "Код на езика" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/bn.json b/plugins/UserLanguage/lang/bn.json index 5b8fcf773b..54b756072d 100644 --- a/plugins/UserSettings/lang/bn.json +++ b/plugins/UserLanguage/lang/bn.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "আফার", "Language_ab": "আব্খাজিয়", "Language_ae": "আবেস্তীয়", diff --git a/plugins/UserSettings/lang/bs.json b/plugins/UserLanguage/lang/bs.json index f1fe068ab9..ca9c0b02d2 100644 --- a/plugins/UserSettings/lang/bs.json +++ b/plugins/UserLanguage/lang/bs.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afarski", "Language_ab": "abkazijski", "Language_ae": "avestanski", diff --git a/plugins/UserSettings/lang/ca.json b/plugins/UserLanguage/lang/ca.json index bf108dbdc6..46c4b804ea 100644 --- a/plugins/UserSettings/lang/ca.json +++ b/plugins/UserLanguage/lang/ca.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "Afar", "Language_ab": "Abkhazian", "Language_ae": "Avestan", @@ -184,8 +184,6 @@ "Language_za": "Chuang", "Language_zh": "Xinès", "Language_zu": "Zulu", - "LanguageCode": "Codi de l'idioma", - "PluginDescription": "Informe sobre les preferències del usuari: Navegador, Família del navegador, Sistema Operatiu, Extensions, Resolució, Preferències Globals", - "VisitorSettings": "Configuració del visitant" + "LanguageCode": "Codi de l'idioma" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/cs.json b/plugins/UserLanguage/lang/cs.json index f635b64bdb..fa86208466 100644 --- a/plugins/UserSettings/lang/cs.json +++ b/plugins/UserLanguage/lang/cs.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Jazyk prohlížeče", "Language_aa": "afarština", "Language_ab": "abcházština", @@ -186,7 +186,6 @@ "Language_zh": "čínština", "Language_zu": "zulu", "LanguageCode": "Jazykový kód", - "PluginDescription": "Zobrazí různá uživatelská nastavení: prohlížeč, rodinu prohlížečů, operační systém, zásuvné moduly, rozlišení, globální nastavení.", - "VisitorSettings": "Nastavení návštěvníků" + "PluginDescription": "Hlásí jazyková nastavení vašich uživatelů." } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/cy.json b/plugins/UserLanguage/lang/cy.json index 10a3d95f56..a5ade8256f 100644 --- a/plugins/UserSettings/lang/cy.json +++ b/plugins/UserLanguage/lang/cy.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "Affareg", "Language_ab": "Abchaseg", "Language_ae": "Afestaneg", diff --git a/plugins/UserSettings/lang/da.json b/plugins/UserLanguage/lang/da.json index 93035bac1f..ed2ae51105 100644 --- a/plugins/UserSettings/lang/da.json +++ b/plugins/UserLanguage/lang/da.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Browser sprog", "Language_aa": "Afar", "Language_ab": "Abkhasisk", @@ -186,7 +186,6 @@ "Language_zh": "Kinesisk", "Language_zu": "Zulu", "LanguageCode": "Sprogkode", - "PluginDescription": "Rapporter brugerindstillinger: browser, browsertype, operativsystem, udvidelsesmoduler, opløsning, globale indstillinger.", - "VisitorSettings": "Besøgendes indstillinger" + "PluginDescription": "Rapporter om sprogindstillinger for dine brugere." } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/de.json b/plugins/UserLanguage/lang/de.json index ccbe596669..155f8b2538 100644 --- a/plugins/UserSettings/lang/de.json +++ b/plugins/UserLanguage/lang/de.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Browsersprache", "Language_aa": "Afar", "Language_ab": "Abchasisch", @@ -186,7 +186,6 @@ "Language_zh": "Chinesisch", "Language_zu": "IsiZulu", "LanguageCode": "Sprach-Code", - "PluginDescription": "Bericht über verschiedene Benutzereinstellungen: Browser, Browserfamilie, Betriebssystem, Plugins, Auflösung, Allgemeine Einstellungen.", - "VisitorSettings": "Besuchereinstellungen" + "PluginDescription": "Berichte über die Spracheinstellungen ihrer Benutzer." } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/el.json b/plugins/UserLanguage/lang/el.json index 17f71f9857..3d67020507 100644 --- a/plugins/UserSettings/lang/el.json +++ b/plugins/UserLanguage/lang/el.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Γλώσσα φυλλομετρητή", "Language_aa": "Αφαρικά", "Language_ab": "Αμπχαζικά", @@ -186,7 +186,6 @@ "Language_zh": "Κινεζικά", "Language_zu": "Ζουλού", "LanguageCode": "Κωδικός γλώσσας", - "PluginDescription": "Αναφέρει διάφορες Ρυθμίσεις Χρήστη: Φυλλομετρητής, Ομάδα Φυλλομετρητών, Λειτουργικό Σύστημα, Πρόσθετα, Ανάλυση, Γενικές Ρυθμίσεις.", - "VisitorSettings": "Ρυθμίσεις επισκέπτη" + "PluginDescription": "Αναφέρει σχετικά με τη γλώσσα των ρυθμίσεων των χρηστών σας." } }
\ No newline at end of file diff --git a/plugins/UserLanguage/lang/en.json b/plugins/UserLanguage/lang/en.json new file mode 100644 index 0000000000..f29cbb74ff --- /dev/null +++ b/plugins/UserLanguage/lang/en.json @@ -0,0 +1,191 @@ +{ + "UserLanguage": { + "BrowserLanguage": "Browser language", + "Language_aa": "Afar", + "Language_ab": "Abkhazian", + "Language_ae": "Avestan", + "Language_af": "Afrikaans", + "Language_ak": "Akan", + "Language_am": "Amharic", + "Language_an": "Aragonese", + "Language_ar": "Arabic", + "Language_as": "Assamese", + "Language_av": "Avaric", + "Language_ay": "Aymara", + "Language_az": "Azerbaijani", + "Language_ba": "Bashkir", + "Language_be": "Belarusian", + "Language_bg": "Bulgarian", + "Language_bh": "Bihari", + "Language_bi": "Bislama", + "Language_bm": "Bambara", + "Language_bn": "Bengali", + "Language_bo": "Tibetan", + "Language_br": "Breton", + "Language_bs": "Bosnian", + "Language_ca": "Catalan", + "Language_ce": "Chechen", + "Language_ch": "Chamorro", + "Language_co": "Corsican", + "Language_cr": "Cree", + "Language_cs": "Czech", + "Language_cu": "Church Slavic", + "Language_cv": "Chuvash", + "Language_cy": "Welsh", + "Language_da": "Danish", + "Language_de": "German", + "Language_dv": "Divehi", + "Language_dz": "Dzongkha", + "Language_ee": "Ewe", + "Language_el": "Greek", + "Language_en": "English", + "Language_eo": "Esperanto", + "Language_es": "Spanish", + "Language_et": "Estonian", + "Language_eu": "Basque", + "Language_fa": "Persian", + "Language_ff": "Fulah", + "Language_fi": "Finnish", + "Language_fj": "Fijian", + "Language_fo": "Faroese", + "Language_fr": "French", + "Language_fy": "Western Frisian", + "Language_ga": "Irish", + "Language_gd": "Scottish Gaelic", + "Language_gl": "Galician", + "Language_gn": "Guarani", + "Language_gu": "Gujarati", + "Language_gv": "Manx", + "Language_ha": "Hausa", + "Language_he": "Hebrew", + "Language_hi": "Hindi", + "Language_ho": "Hiri Motu", + "Language_hr": "Croatian", + "Language_ht": "Haitian Creole", + "Language_hu": "Hungarian", + "Language_hy": "Armenian", + "Language_hz": "Herero", + "Language_ia": "Interlingua", + "Language_id": "Indonesian", + "Language_ie": "Interlingue", + "Language_ig": "Igbo", + "Language_ii": "Sichuan Yi", + "Language_ik": "Inupiaq", + "Language_io": "Ido", + "Language_is": "Icelandic", + "Language_it": "Italian", + "Language_iu": "Inuktitut", + "Language_ja": "Japanese", + "Language_jv": "Javanese", + "Language_ka": "Georgian", + "Language_kg": "Kongo", + "Language_ki": "Kukuyu", + "Language_kj": "Kuanyama", + "Language_kk": "Kazakh", + "Language_kl": "Greenlandic", + "Language_km": "Central Khmer", + "Language_kn": "Kannada", + "Language_ko": "Korean", + "Language_kr": "Kanuri", + "Language_ks": "Kashmiri", + "Language_ku": "Kurdish", + "Language_kv": "Komi", + "Language_kw": "Cornish", + "Language_ky": "Kirghiz", + "Language_la": "Latin", + "Language_lb": "Luxembourgish", + "Language_lg": "Ganda", + "Language_li": "Limburgish", + "Language_ln": "Lingala", + "Language_lo": "Lao", + "Language_lt": "Lithuanian", + "Language_lu": "Luba-Katanga", + "Language_lv": "Latvian", + "Language_mg": "Malagasy", + "Language_mh": "Marshallese", + "Language_mi": "Maori", + "Language_mk": "Macedonian", + "Language_ml": "Malayalam", + "Language_mn": "Mongolian", + "Language_mr": "Marathi", + "Language_ms": "Malay", + "Language_mt": "Maltese", + "Language_my": "Burmese", + "Language_na": "Nauru", + "Language_nb": "Norwegian Bokm\u00e5l", + "Language_nd": "North Ndebele", + "Language_ne": "Nepali", + "Language_ng": "Ndonga", + "Language_nl": "Dutch", + "Language_nn": "Norwegian Nynorsk", + "Language_no": "Norwegian", + "Language_nr": "South Ndebele", + "Language_nv": "Navajo", + "Language_ny": "Chichewa", + "Language_oc": "Occitan", + "Language_oj": "Ojibwa", + "Language_om": "Oroma", + "Language_or": "Oriya", + "Language_os": "Ossetian", + "Language_pa": "Panjabi", + "Language_pi": "Pali", + "Language_pl": "Polish", + "Language_ps": "Pashto", + "Language_pt": "Portuguese", + "Language_qu": "Quechua", + "Language_rm": "Raeto-Romance", + "Language_rn": "Rundi", + "Language_ro": "Romanian", + "Language_ru": "Russian", + "Language_rw": "Kinyarwanda", + "Language_sa": "Sanskrit", + "Language_sc": "Sardinian", + "Language_sd": "Sindhi", + "Language_se": "Northern Sami", + "Language_sg": "Sango", + "Language_si": "Sinhala", + "Language_sk": "Slovak", + "Language_sl": "Slovenian", + "Language_sm": "Samoan", + "Language_sn": "Shona", + "Language_so": "Somali", + "Language_sq": "Albanian", + "Language_sr": "Serbian", + "Language_ss": "Swati", + "Language_st": "Sotho", + "Language_su": "Sundanese", + "Language_sv": "Swedish", + "Language_sw": "Swahili", + "Language_ta": "Tamil", + "Language_te": "Telugu", + "Language_tg": "Tajik", + "Language_th": "Thai", + "Language_ti": "Tigrinya", + "Language_tk": "Turkmen", + "Language_tl": "Tagalog", + "Language_tn": "Tswana", + "Language_to": "Tonga", + "Language_tr": "Turkish", + "Language_ts": "Tsonga", + "Language_tt": "Tatar", + "Language_tw": "Twi", + "Language_ty": "Tahitian", + "Language_ug": "Uighur", + "Language_uk": "Ukrainian", + "Language_ur": "Urdu", + "Language_uz": "Uzbek", + "Language_ve": "Venda", + "Language_vi": "Vietnamese", + "Language_vo": "Volap\u00fck", + "Language_wa": "Walloon", + "Language_wo": "Wolof", + "Language_xh": "Xhosa", + "Language_yi": "Yiddish", + "Language_yo": "Yoruba", + "Language_za": "Chuang", + "Language_zh": "Chinese", + "Language_zu": "Zulu", + "LanguageCode": "Language code", + "PluginDescription": "Reports about the language settings of your users." + } +}
\ No newline at end of file diff --git a/plugins/UserSettings/lang/es.json b/plugins/UserLanguage/lang/es.json index f921adc0dc..07f4b0cf7b 100644 --- a/plugins/UserSettings/lang/es.json +++ b/plugins/UserLanguage/lang/es.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Idioma de Navegador", "Language_aa": "Lejos", "Language_ab": "Abjasia", @@ -185,8 +185,6 @@ "Language_za": "Chuang", "Language_zh": "Chino", "Language_zu": "Zulú", - "LanguageCode": "Código de idioma", - "PluginDescription": "Reporta varias configuraciones de usuario: Navegador, Familia del Navegador, Sistema Operativo, Plugins, Resolución, Configuración General.", - "VisitorSettings": "Configuración de visitantes" + "LanguageCode": "Código de idioma" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/et.json b/plugins/UserLanguage/lang/et.json index 1db4c23fa3..21d96c38ef 100644 --- a/plugins/UserSettings/lang/et.json +++ b/plugins/UserLanguage/lang/et.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Veebisirvija keel", "Language_aa": "afari", "Language_ab": "abhaasi", @@ -185,7 +185,6 @@ "Language_za": "tšuangi", "Language_zh": "hiina", "Language_zu": "suulu", - "LanguageCode": "Keele kood", - "VisitorSettings": "Külastajate seaded" + "LanguageCode": "Keele kood" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/eu.json b/plugins/UserLanguage/lang/eu.json index a4949895d4..c3f072d669 100644 --- a/plugins/UserSettings/lang/eu.json +++ b/plugins/UserLanguage/lang/eu.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_ab": "abkhazera", "Language_af": "afrikaans", "Language_ak": "Akanera", @@ -145,7 +145,6 @@ "Language_yo": "yorubera", "Language_zh": "txinera", "Language_zu": "zuluera", - "LanguageCode": "Hizkuntza-kodea", - "VisitorSettings": "Bisitariaren ezarpenak" + "LanguageCode": "Hizkuntza-kodea" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/fa.json b/plugins/UserLanguage/lang/fa.json index fdefbdb01e..fcb4bd7071 100644 --- a/plugins/UserSettings/lang/fa.json +++ b/plugins/UserLanguage/lang/fa.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "زبان مرورگر", "Language_aa": "آفاری", "Language_ab": "آبخازیایی", @@ -185,8 +185,6 @@ "Language_za": "چوانگی", "Language_zh": "چینی", "Language_zu": "زولویی", - "LanguageCode": "کد زبان", - "PluginDescription": "گزارش تنظیمات کاربر های مختلف: مرورگر، Family (خانواده) مرورگر، سیستم عامل، پلاگین، سایز تصویر، تنظیمات جهانی است.", - "VisitorSettings": "تنظیمات بازدید کننده" + "LanguageCode": "کد زبان" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/fi.json b/plugins/UserLanguage/lang/fi.json index ad70ea0159..a49fb05355 100644 --- a/plugins/UserSettings/lang/fi.json +++ b/plugins/UserLanguage/lang/fi.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Selaimen kieli", "Language_aa": "afar", "Language_ab": "abkhazian", @@ -185,8 +185,6 @@ "Language_za": "chuang", "Language_zh": "kiinan kieli", "Language_zu": "zulu", - "LanguageCode": "Kielikoodi", - "PluginDescription": "Raportit käyttäjien asetuksista: selain, selaimen perhe, käyttöjärjestelmä, lisäosat, resoluutio, yleiset asetukset.", - "VisitorSettings": "Kävijöiden asetukset" + "LanguageCode": "Kielikoodi" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/fr.json b/plugins/UserLanguage/lang/fr.json index d90382ebc9..4ce253f215 100644 --- a/plugins/UserSettings/lang/fr.json +++ b/plugins/UserLanguage/lang/fr.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Langage du navigateur", "Language_aa": "Afar", "Language_ab": "Abkhaze", @@ -185,8 +185,6 @@ "Language_za": "Chuang", "Language_zh": "Chinois", "Language_zu": "Zoulou", - "LanguageCode": "Code langue", - "PluginDescription": "Effectue des rapports variés sur les paramètres utilisateurs: navigateur, famille du navigateur, système d'exploitation, plugins, résolution, paramètres généraux.", - "VisitorSettings": "Paramètres visiteur" + "LanguageCode": "Code langue" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/gl.json b/plugins/UserLanguage/lang/gl.json index dd30b05ce2..a0d8202653 100644 --- a/plugins/UserSettings/lang/gl.json +++ b/plugins/UserLanguage/lang/gl.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_ab": "abkhazo", "Language_af": "Afrikaans", "Language_ak": "Akán", diff --git a/plugins/UserSettings/lang/he.json b/plugins/UserLanguage/lang/he.json index 5a31eaa865..e7109e39ad 100644 --- a/plugins/UserSettings/lang/he.json +++ b/plugins/UserLanguage/lang/he.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "אפארית", "Language_ab": "אבחזית", "Language_ae": "אבסטן", diff --git a/plugins/UserSettings/lang/hi.json b/plugins/UserLanguage/lang/hi.json index 57f065402d..8edd9333ca 100644 --- a/plugins/UserSettings/lang/hi.json +++ b/plugins/UserLanguage/lang/hi.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "ब्राउज़र की भाषा", "Language_aa": "अफ़ार", "Language_ab": "अब्खाज़ियन्", @@ -185,8 +185,6 @@ "Language_za": "ज़ुआंग", "Language_zh": "चीनी", "Language_zu": "ज़ुलू", - "LanguageCode": "भाषा कोड", - "PluginDescription": "विभिन्न उपयोगकर्ता सेटिंग्स की रिपोर्ट: ब्राउज़र, ब्राउज़र परिवार, आपरेटिंग सिस्टम, प्लगइन्स, संकल्प, वैश्विक सेटिंग्स.", - "VisitorSettings": "आगंतुक सेटिंग्स" + "LanguageCode": "भाषा कोड" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/hr.json b/plugins/UserLanguage/lang/hr.json index 533587f029..1c5d7a9d54 100644 --- a/plugins/UserSettings/lang/hr.json +++ b/plugins/UserLanguage/lang/hr.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afarski", "Language_ab": "abhaski", "Language_ae": "avestan", @@ -183,7 +183,6 @@ "Language_yo": "joruba", "Language_za": "zhuang", "Language_zh": "kineski", - "Language_zu": "zulu", - "VisitorSettings": "Postavke posjetitelja" + "Language_zu": "zulu" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/hu.json b/plugins/UserLanguage/lang/hu.json index b4d3153cdc..a8db5c2c63 100644 --- a/plugins/UserSettings/lang/hu.json +++ b/plugins/UserLanguage/lang/hu.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afar", "Language_ab": "abház", "Language_ae": "avesztán", @@ -184,8 +184,6 @@ "Language_za": "zsuang", "Language_zh": "kínai", "Language_zu": "zulu", - "LanguageCode": "Nyelvi kód", - "PluginDescription": "Jelentéseket készít a látogatóknál észlelt beállításokról és rendszerkörnyezetről mint például: böngésző típusa, böngészőcsaládok, operációs rendszer, böngésző bővítmények, képernyőfelbontás, globális beállítások.", - "VisitorSettings": "Látogatók adatai" + "LanguageCode": "Nyelvi kód" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/id.json b/plugins/UserLanguage/lang/id.json index 54df69b53b..cfe49baf4b 100644 --- a/plugins/UserSettings/lang/id.json +++ b/plugins/UserLanguage/lang/id.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Bahasa Peramban", "Language_aa": "Afar", "Language_ab": "Abkhaz", @@ -185,8 +185,6 @@ "Language_za": "Zhuang", "Language_zh": "Cina", "Language_zu": "Zulu", - "LanguageCode": "Kode Bahasa", - "PluginDescription": "Laporan Pengaturan Pengguna: Peramban, Keluarga Peramban, Sistem Operasi, Pengaya, Resolusi Layar, Pengaturan Umum.", - "VisitorSettings": "Pengaturan Pengunjung" + "LanguageCode": "Kode Bahasa" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/is.json b/plugins/UserLanguage/lang/is.json index 230ee1aa28..b8752b4ac2 100644 --- a/plugins/UserSettings/lang/is.json +++ b/plugins/UserLanguage/lang/is.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afár", "Language_ab": "abkasíska", "Language_ae": "avestíska", @@ -184,8 +184,6 @@ "Language_za": "súang", "Language_zh": "kínverska", "Language_zu": "súlú", - "LanguageCode": "Kóði tungumáls", - "PluginDescription": "Gefur skýrslu um ýmsar stillingar gesta:Vafra, Vafrafjölskyldu, Stýrikerfi, Íbætur, Skjáupplausn, altækar stillingar.", - "VisitorSettings": "Stillingar gesta" + "LanguageCode": "Kóði tungumáls" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/it.json b/plugins/UserLanguage/lang/it.json index 35f98dd3a3..bdb5d0708f 100644 --- a/plugins/UserSettings/lang/it.json +++ b/plugins/UserLanguage/lang/it.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Lingua Browser", "Language_aa": "afar", "Language_ab": "abkhazian", @@ -186,7 +186,6 @@ "Language_zh": "cinese", "Language_zu": "zulu", "LanguageCode": "Codice della lingua", - "PluginDescription": "Mostra le varie impostazioni per gli utenti: Browser, Famiglia del Browser, Sistema Operativo, Plugin, Risoluzione, Impostazioni Globali.", - "VisitorSettings": "Impostazioni visitatori" + "PluginDescription": "Reports sulle impostazioni della lingua degli utenti." } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ja.json b/plugins/UserLanguage/lang/ja.json index 3a03d8a3e0..d16b5563e5 100644 --- a/plugins/UserSettings/lang/ja.json +++ b/plugins/UserLanguage/lang/ja.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "ブラウザの言語", "Language_aa": "アファル語", "Language_ab": "アブハズ語", @@ -185,8 +185,6 @@ "Language_za": "チワン語", "Language_zh": "中国語", "Language_zu": "ズールー語", - "LanguageCode": "言語コード", - "PluginDescription": "各種ユーザー設定（ブラウザ、ブラウザファミリー、オペレーティングシステム、プラグイン、解像度、全般設定）をリポートします。", - "VisitorSettings": "ビジターの環境" + "LanguageCode": "言語コード" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ka.json b/plugins/UserLanguage/lang/ka.json index c76c043e50..6002246265 100644 --- a/plugins/UserSettings/lang/ka.json +++ b/plugins/UserLanguage/lang/ka.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "აფარი", "Language_ab": "აფხაზური", "Language_ae": "ავესტა", @@ -157,8 +157,6 @@ "Language_yo": "იორუბა", "Language_zh": "ჩინური", "Language_zu": "ზულუ", - "LanguageCode": "ენის კოდი", - "PluginDescription": "იძლევა ანგარიშს მომხმარებლის სხვადასხვა პარამეტრებზე: ბრაუზერები, ბრაუზერის ოჯახი, ოპერაციული სისტემა, პლაგინები, რეზოლუცია, გლობალური პარამეტრები.", - "VisitorSettings": "ვიზიტორის პარამეტრები" + "LanguageCode": "ენის კოდი" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ko.json b/plugins/UserLanguage/lang/ko.json index 54a35a3c53..07a2b0e3a7 100644 --- a/plugins/UserSettings/lang/ko.json +++ b/plugins/UserLanguage/lang/ko.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "브라우저 언어", "Language_aa": "아파르어", "Language_ab": "압하스어", @@ -185,8 +185,6 @@ "Language_za": "주앙어", "Language_zh": "중국어", "Language_zu": "줄루어", - "LanguageCode": "언어 코드", - "PluginDescription": "각종 사용자 설정 (브라우저, 브라우저 페밀리, 운영 시스템, 플러그인, 해상도, 일반 설정)를 보고합니다.", - "VisitorSettings": "방문자 설정" + "LanguageCode": "언어 코드" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/lt.json b/plugins/UserLanguage/lang/lt.json index d2dae7529d..75f6dd4209 100644 --- a/plugins/UserSettings/lang/lt.json +++ b/plugins/UserLanguage/lang/lt.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afarų", "Language_ab": "abchazų", "Language_ae": "avestų", @@ -184,8 +184,6 @@ "Language_za": "chuang", "Language_zh": "kinų", "Language_zu": "zulų", - "LanguageCode": "Kalbos kodas", - "PluginDescription": "Parodo įvairius lankytojo nustatymus: naršyklę, naršyklės šeimą, operacinę sistemą, papildinius, ekrano raišką, skiriamąją gebą, globalius nustatymus.", - "VisitorSettings": "Lankytojų nustatymai" + "LanguageCode": "Kalbos kodas" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/lv.json b/plugins/UserLanguage/lang/lv.json index 26f072d5f1..bed7f8edeb 100644 --- a/plugins/UserSettings/lang/lv.json +++ b/plugins/UserLanguage/lang/lv.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afāru", "Language_ab": "abhāzu", "Language_ae": "avesta", @@ -184,8 +184,6 @@ "Language_za": "džuanu", "Language_zh": "ķīniešu", "Language_zu": "zulu", - "LanguageCode": "Valodas kods", - "PluginDescription": "Apskata dažādus lietotāju iestatījumus: pārlūku, pārlūku ģimeni, operētājsistēmu, spraudņus, ekrāna izšķirtspēju, globālos iestatījumus.", - "VisitorSettings": "Apmeklētāju iestatījumi" + "LanguageCode": "Valodas kods" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/nb.json b/plugins/UserLanguage/lang/nb.json index 6e25fa09e3..0a8f7d6b0c 100644 --- a/plugins/UserSettings/lang/nb.json +++ b/plugins/UserLanguage/lang/nb.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afar", "Language_ab": "abkhasisk", "Language_ae": "avestisk", @@ -184,8 +184,6 @@ "Language_za": "zhuang", "Language_zh": "kinesisk", "Language_zu": "zulu", - "LanguageCode": "Språkkode", - "PluginDescription": "Rapporterer forskjellige brukerinnstillinger: Nettleser, nettleserfamilie, operativsystem, tillegg, oppløsning, globale innstillinger.", - "VisitorSettings": "Besøkendes innstillinger" + "LanguageCode": "Språkkode" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/nl.json b/plugins/UserLanguage/lang/nl.json index ef48387e87..708e3b034f 100644 --- a/plugins/UserSettings/lang/nl.json +++ b/plugins/UserLanguage/lang/nl.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Browsertaal", "Language_aa": "Afar", "Language_ab": "Abchazisch", @@ -185,8 +185,6 @@ "Language_za": "Zhuang", "Language_zh": "Chinees", "Language_zu": "Zulu", - "LanguageCode": "Taal code", - "PluginDescription": "Rapporteert verschillende gebruikers instellingen: Browser, Browser familie, Besturingssysteem, Plugins, Resolutie, Globale Instellingen.", - "VisitorSettings": "Bezoekers Instellingen" + "LanguageCode": "Taal code" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/nn.json b/plugins/UserLanguage/lang/nn.json index bb721142f8..35699b3a50 100644 --- a/plugins/UserSettings/lang/nn.json +++ b/plugins/UserLanguage/lang/nn.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afar", "Language_ab": "abkhasisk", "Language_ae": "avestisk", @@ -184,8 +184,6 @@ "Language_za": "zhuang", "Language_zh": "kinesisk", "Language_zu": "zulu", - "LanguageCode": "Språkkode", - "PluginDescription": "Rapporter diverse vitjarinnstillingar: Nettlesar, Nettlesarfamilie, operativsystem, oppløysing og globale innstillingar.", - "VisitorSettings": "Vitjarinnstillingar" + "LanguageCode": "Språkkode" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/pl.json b/plugins/UserLanguage/lang/pl.json index 01697fe556..8ff635e825 100644 --- a/plugins/UserSettings/lang/pl.json +++ b/plugins/UserLanguage/lang/pl.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Język przeglądarki", "Language_aa": "afar", "Language_ab": "abchaski", @@ -185,8 +185,6 @@ "Language_za": "czuang", "Language_zh": "chiński", "Language_zu": "zulu", - "LanguageCode": "Kod języka", - "PluginDescription": "Raporty rozmaitych konfiguracji użytkownika: przeglądarki, rodziny przeglądarek, systemów operacyjnych, wtyczek, rozdzielczości, ogólnej konfiguracji.", - "VisitorSettings": "Konfiguracje użytkownika" + "LanguageCode": "Kod języka" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/pt-br.json b/plugins/UserLanguage/lang/pt-br.json index 0e4b6667da..dae4601280 100644 --- a/plugins/UserSettings/lang/pt-br.json +++ b/plugins/UserLanguage/lang/pt-br.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Idioma do navegador", "Language_aa": "afar", "Language_ab": "abcázio", @@ -185,8 +185,6 @@ "Language_za": "zhuang", "Language_zh": "chinês", "Language_zu": "zulu", - "LanguageCode": "Código do Idioma", - "PluginDescription": "Relatórios diversas configurações de usuário: navegador, navegador família, sistema operacional, plugins, resolução, configurações globais.", - "VisitorSettings": "Configurações dos visitantes" + "LanguageCode": "Código do Idioma" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/pt.json b/plugins/UserLanguage/lang/pt.json index d6ccab7375..7a0e0e8615 100644 --- a/plugins/UserSettings/lang/pt.json +++ b/plugins/UserLanguage/lang/pt.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afar", "Language_ab": "abcázio", "Language_ae": "avéstico", @@ -184,8 +184,6 @@ "Language_za": "zhuang", "Language_zh": "chinês", "Language_zu": "zulu", - "LanguageCode": "Código do idioma", - "PluginDescription": "Relata várias Definições de Utilizador: Navegador, Família de Navegadores, Sistema Operativo, Plugins, Resolução, Definições Globais", - "VisitorSettings": "Definições do Visitante" + "LanguageCode": "Código do idioma" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ro.json b/plugins/UserLanguage/lang/ro.json index de3768248d..b6362e4267 100644 --- a/plugins/UserSettings/lang/ro.json +++ b/plugins/UserLanguage/lang/ro.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Limba browser-ului", "Language_aa": "Afar", "Language_ab": "abhază", @@ -185,8 +185,6 @@ "Language_za": "zhuang", "Language_zh": "chineză", "Language_zu": "zulu", - "LanguageCode": "Cod limbă", - "PluginDescription": "Rapoarte difera la setări utilizator: Browser, Browser de familie, sistemul de operare, plugins, Rezolutie, Global Setări.", - "VisitorSettings": "Setări vizitatori" + "LanguageCode": "Cod limbă" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ru.json b/plugins/UserLanguage/lang/ru.json index 25716d1d0b..7362daece6 100644 --- a/plugins/UserSettings/lang/ru.json +++ b/plugins/UserLanguage/lang/ru.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Язык браузера", "Language_aa": "афар", "Language_ab": "абхазский", @@ -185,8 +185,6 @@ "Language_za": "чжуань", "Language_zh": "китайский", "Language_zu": "зулу", - "LanguageCode": "Код языка", - "PluginDescription": "Ведет учет различных настроек пользователя: браузер, семейство браузера, операционная система, плагины, разрешение экрана, а также глобальные настройки.", - "VisitorSettings": "Настройки посетителей" + "LanguageCode": "Код языка" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/sk.json b/plugins/UserLanguage/lang/sk.json index 800547c1fd..eeefdc8545 100644 --- a/plugins/UserSettings/lang/sk.json +++ b/plugins/UserLanguage/lang/sk.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "afarčina", "Language_ab": "abcházština", "Language_ae": "avestčina", @@ -184,8 +184,6 @@ "Language_za": "čuangčina", "Language_zh": "čínština", "Language_zu": "zuluština", - "LanguageCode": "Kód jazyka", - "PluginDescription": "Rôzne reporty užívateľského nastavenia: Prehliadač, Rodina prehliadača, Operačný systém, Pluginy, Rozlíšenie, Globálne nastavenia.", - "VisitorSettings": "Nastavenia návštevníkov" + "LanguageCode": "Kód jazyka" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/sl.json b/plugins/UserLanguage/lang/sl.json index 1ca2cb1142..6529bc25fa 100644 --- a/plugins/UserSettings/lang/sl.json +++ b/plugins/UserLanguage/lang/sl.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Jezik brskalnika", "Language_aa": "afarščina", "Language_ab": "abhaščina", @@ -185,7 +185,6 @@ "Language_za": "za", "Language_zh": "kitajščina", "Language_zu": "zulujščina", - "LanguageCode": "Šifra jezika", - "VisitorSettings": "Nastavitve obiskovalcev" + "LanguageCode": "Šifra jezika" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/sq.json b/plugins/UserLanguage/lang/sq.json index 9705d70fad..e7c32170f2 100644 --- a/plugins/UserSettings/lang/sq.json +++ b/plugins/UserLanguage/lang/sq.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_af": "Afrikanisht", "Language_am": "Amharike", "Language_ar": "Arabisht", @@ -101,8 +101,6 @@ "Language_yi": "Jiden", "Language_zh": "Kineze", "Language_zu": "Zulu", - "LanguageCode": "Kod Gjuhe", - "PluginDescription": "Raporton Rregullime të ndryshme të Përdoruesit: Shfletues, Familje Shfletuesi, Sistem Operativ, Shtojca, Qartësi, Rregullime Globale.", - "VisitorSettings": "Rregullimet për Vizitor" + "LanguageCode": "Kod Gjuhe" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/sr.json b/plugins/UserLanguage/lang/sr.json index 680d7b3e19..d967828998 100644 --- a/plugins/UserSettings/lang/sr.json +++ b/plugins/UserLanguage/lang/sr.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Jezik brauzera", "Language_aa": "Afar", "Language_ab": "Abhazijski", @@ -185,8 +185,6 @@ "Language_za": "Čueng", "Language_zh": "Kineski", "Language_zu": "Zulu", - "LanguageCode": "Kod jezika", - "PluginDescription": "Izveštaj o različitim parametrima vezanim za posetioce: brauzeri, operativni sistemi, dodaci, ekranske rezolucije, globalna podešavanja.", - "VisitorSettings": "Parametri posetilaca" + "LanguageCode": "Kod jezika" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/sv.json b/plugins/UserLanguage/lang/sv.json index 8c8d467c01..6bdb8ab128 100644 --- a/plugins/UserSettings/lang/sv.json +++ b/plugins/UserLanguage/lang/sv.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Webbläsarspråk", "Language_aa": "Afar", "Language_ab": "Abchaziska", @@ -185,8 +185,6 @@ "Language_za": "Zhuang", "Language_zh": "Kinesiska", "Language_zu": "Zulu", - "LanguageCode": "Språkkod", - "PluginDescription": "Rapporterar olika användarinställningar: Webbläsare, Webbläsarfamilj, operativsystem, Plugins, upplösning, Globala inställningar.", - "VisitorSettings": "Besökarinställningar" + "LanguageCode": "Språkkod" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/ta.json b/plugins/UserLanguage/lang/ta.json index 92e48896c8..4ecd3d9fb9 100644 --- a/plugins/UserSettings/lang/ta.json +++ b/plugins/UserLanguage/lang/ta.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "அஃபார்", "Language_ab": "அப்காஜியான்", "Language_ae": "அவெஸ்தான்", diff --git a/plugins/UserSettings/lang/te.json b/plugins/UserLanguage/lang/te.json index f61fd26b87..60380c9be4 100644 --- a/plugins/UserSettings/lang/te.json +++ b/plugins/UserLanguage/lang/te.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "అఫార్", "Language_ab": "అబ్ఖాజియన్", "Language_ae": "అవేస్టాన్", @@ -184,7 +184,6 @@ "Language_za": "జువాన్", "Language_zh": "చైనీస్", "Language_zu": "జూలూ", - "LanguageCode": "భాషా సంకేతం", - "VisitorSettings": "సందర్శకుల అమరికలు" + "LanguageCode": "భాషా సంకేతం" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/th.json b/plugins/UserLanguage/lang/th.json index a0c6ffacef..a4a07a3c70 100644 --- a/plugins/UserSettings/lang/th.json +++ b/plugins/UserLanguage/lang/th.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "อะฟาร์", "Language_ab": "อับคาซ", "Language_ae": "อเวสตะ", @@ -184,8 +184,6 @@ "Language_za": "จ้วง", "Language_zh": "จีน", "Language_zu": "ซูลู", - "LanguageCode": "รหัสภาษา", - "PluginDescription": "รายงานการตั้งค่าผู้ใช้ต่างๆ: เบราว์เซอร์, ตระกูลเบราว์เซอร์,ระบบปฏิบัติการ, ปลั๊กอิน, การแก้ไขและการตั้งค่าส่วนกลาง", - "VisitorSettings": "การตั้งค่าของผู้เข้าชม" + "LanguageCode": "รหัสภาษา" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/tl.json b/plugins/UserLanguage/lang/tl.json index 7fb967d127..96d6d77148 100644 --- a/plugins/UserSettings/lang/tl.json +++ b/plugins/UserLanguage/lang/tl.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "wika ng browser", "Language_aa": "Afar", "Language_ab": "Abkhazian", @@ -184,8 +184,6 @@ "Language_za": "Chuang", "Language_zh": "Tsino", "Language_zu": "Zulu", - "LanguageCode": "wika ng code", - "PluginDescription": "Ulat para sa ibat-ibang mga Setting ng user: Browser Pamilya ng browser Operating System Plugins Resolution Pang-kalahatang settings.", - "VisitorSettings": "Mga Setting ng bisita" + "LanguageCode": "wika ng code" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/tr.json b/plugins/UserLanguage/lang/tr.json index 74ceaf6900..79ae6fc82a 100644 --- a/plugins/UserSettings/lang/tr.json +++ b/plugins/UserLanguage/lang/tr.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "Afar", "Language_ab": "Abazca", "Language_ae": "Avestçe", @@ -184,8 +184,6 @@ "Language_za": "Zhuang", "Language_zh": "Çince", "Language_zu": "Zulu", - "LanguageCode": "Dil kodu", - "PluginDescription": "Çeşitli kullanıcı rapor ayalari: Tarayıcı, Tarayıcı Ailesi, İşletim Sistemi, Eklentiler, Çözünürlük, Genel Ayarlar.", - "VisitorSettings": "Ziyaretçi Ayarlari" + "LanguageCode": "Dil kodu" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/uk.json b/plugins/UserLanguage/lang/uk.json index 86784d750c..3a94be5699 100644 --- a/plugins/UserSettings/lang/uk.json +++ b/plugins/UserLanguage/lang/uk.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "Language_aa": "афарська", "Language_ab": "абхазька", "Language_ae": "авестійська", @@ -184,8 +184,6 @@ "Language_za": "чжуан", "Language_zh": "китайська", "Language_zu": "зулуська", - "LanguageCode": "Код мови", - "PluginDescription": "Повідомляє різні налаштуванян користовувача: веб-оглядач, родина веб-оглядача, операційна система, плагіни, роздільна здатність, глобальні налаштування.", - "VisitorSettings": "Налаштування відвідувача" + "LanguageCode": "Код мови" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/vi.json b/plugins/UserLanguage/lang/vi.json index 62ec4565ad..8bb7e99f59 100644 --- a/plugins/UserSettings/lang/vi.json +++ b/plugins/UserLanguage/lang/vi.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "Ngôn ngữ trình duyệt", "Language_aa": "Tiếng Afar", "Language_ab": "Tiếng Abkhazia", @@ -185,8 +185,6 @@ "Language_za": "Tiếng Zhuang", "Language_zh": "Tiếng Trung Quốc", "Language_zu": "Tiếng Zulu", - "LanguageCode": "Mã ngôn ngữ", - "PluginDescription": "Cài đặt báo cáo người dùng khác nhau: trình duyệt, họ trình duyệt, Hệ điều hành, Plugin, Độ phân giải, Cài đặt tổng quát.", - "VisitorSettings": "Thiết lập khách truy cập" + "LanguageCode": "Mã ngôn ngữ" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/zh-cn.json b/plugins/UserLanguage/lang/zh-cn.json index 9de7f32e3f..792fea9b17 100644 --- a/plugins/UserSettings/lang/zh-cn.json +++ b/plugins/UserLanguage/lang/zh-cn.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "浏览器语言", "Language_aa": "阿法文", "Language_ab": "阿布哈西亚文", @@ -185,8 +185,6 @@ "Language_za": "壮语", "Language_zh": "中文", "Language_zu": "祖鲁文", - "LanguageCode": "语言代码", - "PluginDescription": "用户环境报表: 浏览器、浏览器种类、操作系统、插件、分辨率、全局参数。", - "VisitorSettings": "访客设置" + "LanguageCode": "语言代码" } }
\ No newline at end of file diff --git a/plugins/UserSettings/lang/zh-tw.json b/plugins/UserLanguage/lang/zh-tw.json index fa535f0b85..4006c31d9d 100644 --- a/plugins/UserSettings/lang/zh-tw.json +++ b/plugins/UserLanguage/lang/zh-tw.json @@ -1,5 +1,5 @@ { - "UserSettings": { + "UserLanguage": { "BrowserLanguage": "瀏覽器語系", "Language_aa": "阿法文", "Language_ab": "阿布哈西亚文", @@ -185,8 +185,6 @@ "Language_za": "壮语", "Language_zh": "中文", "Language_zu": "祖鲁文", - "LanguageCode": "語系代碼", - "PluginDescription": "各個用戶設定報表：瀏覽器、瀏覽器家族、作業系統、外掛、解析度、全域設定。", - "VisitorSettings": "造訪者設定值" + "LanguageCode": "語系代碼" } }
\ No newline at end of file diff --git a/plugins/UserSettings/tests/Fixtures/LanguageFixture.php b/plugins/UserLanguage/tests/Fixtures/LanguageFixture.php index dd3089a365..3e015f776a 100644 --- a/plugins/UserSettings/tests/Fixtures/LanguageFixture.php +++ b/plugins/UserLanguage/tests/Fixtures/LanguageFixture.php @@ -7,12 +7,11 @@ * */ -namespace Piwik\Plugins\UserSettings\tests\Fixtures; +namespace Piwik\Plugins\UserLanguage\tests\Fixtures; use Piwik\Tests\Framework\Fixture; use Piwik\Date; -use Piwik\Common; class LanguageFixture extends Fixture { diff --git a/plugins/UserSettings/tests/System/GetLanguageSystemTest.php b/plugins/UserLanguage/tests/System/GetLanguageSystemTest.php index 3c409c1112..2ce1c215d5 100644 --- a/plugins/UserSettings/tests/System/GetLanguageSystemTest.php +++ b/plugins/UserLanguage/tests/System/GetLanguageSystemTest.php @@ -6,18 +6,18 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\tests\System; +namespace Piwik\Plugins\UserLanguage\tests\System; -use Piwik\Plugins\UserSettings\tests\Fixtures\LanguageFixture; +use Piwik\Plugins\UserLanguage\tests\Fixtures\LanguageFixture; use Piwik\Tests\Framework\TestCase\SystemTestCase; /** * Class GetLanguageSystemTest - * @package Piwik\Plugins\UserSettings\tests + * @package Piwik\Plugins\UserLanguage\tests * @group GetLanguageSystemTest * @group Plugins - * @group UserSettings + * @group UserLanguage */ class GetLanguageSystemTest extends SystemTestCase { @@ -45,8 +45,8 @@ class GetLanguageSystemTest extends SystemTestCase { public function getApiForTesting() { $apiToCall = array( - "UserSettings.getLanguage", - "UserSettings.getLanguageCode" + "UserLanguage.getLanguage", + "UserLanguage.getLanguageCode" ); $apiToTest = array(); diff --git a/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguageCode_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml index 02c15ad520..02c15ad520 100644 --- a/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguageCode_day.xml +++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguageCode_day.xml diff --git a/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguage_day.xml b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml index 18d4468a2e..18d4468a2e 100644 --- a/plugins/UserSettings/tests/System/expected/test___UserSettings.getLanguage_day.xml +++ b/plugins/UserLanguage/tests/System/expected/test___UserLanguage.getLanguage_day.xml diff --git a/plugins/UserSettings/API.php b/plugins/UserSettings/API.php index d2703489a4..68ff9b1f90 100644 --- a/plugins/UserSettings/API.php +++ b/plugins/UserSettings/API.php @@ -8,19 +8,7 @@ */ namespace Piwik\Plugins\UserSettings; -use Piwik\Archive; -use Piwik\DataTable; -use Piwik\Metrics; -use Piwik\Piwik; -use Piwik\Plugins\DevicesDetection\Archiver AS DDArchiver; -use Piwik\Plugins\CoreHome\Columns\Metrics\VisitsPercent; - -/** - * @see plugins/UserSettings/functions.php - */ -require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; - -/** +/* * The UserSettings API lets you access reports about some of your Visitors technical settings: * plugins supported in their browser, Screen resolution and Screen types (normal, widescreen, dual screen or mobile). * @@ -28,17 +16,6 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserSettings/functions.php'; */ class API extends \Piwik\Plugin\API { - protected function getDataTable($name, $idSite, $period, $date, $segment) - { - Piwik::checkUserHasViewAccess($idSite); - $archive = Archive::build($idSite, $period, $date, $segment); - $dataTable = $archive->getDataTable($name); - $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); - $dataTable->queueFilter('ReplaceColumnNames'); - $dataTable->queueFilter('ReplaceSummaryRowLabel'); - return $dataTable; - } - /** * @deprecated since 2.10.0 See {@link Piwik\Plugins\Resolution\API} for new implementation. */ @@ -77,7 +54,6 @@ class API extends \Piwik\Plugin\API } /** - * Gets a DataTable displaying number of visits by device type. * @deprecated since 2.10.0 See {@link Piwik\Plugins\DevicesDetector\API} for new implementation. */ public function getMobileVsDesktop($idSite, $period, $date, $segment = false) @@ -117,20 +93,19 @@ class API extends \Piwik\Plugin\API return \Piwik\Plugins\DevicePlugins\API::getInstance()->getPlugin($idSite, $period, $date, $segment); } + /** + * @deprecated since 2.11.0 See {@link Piwik\Plugins\UserLanguage\API} for new implementation. + */ public function getLanguage($idSite, $period, $date, $segment = false) { - $dataTable = $this->getDataTable(Archiver::LANGUAGE_RECORD_NAME, $idSite, $period, $date, $segment); - $dataTable->filter('GroupBy', array('label', __NAMESPACE__ . '\groupByLangCallback')); - $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\languageTranslate')); - - return $dataTable; + return \Piwik\Plugins\UserLanguage\API::getInstance()->getLanguage($idSite, $period, $date, $segment); } + /** + * @deprecated since 2.11.0 See {@link Piwik\Plugins\UserLanguage\API} for new implementation. + */ public function getLanguageCode($idSite, $period, $date, $segment = false) { - $dataTable = $this->getDataTable(Archiver::LANGUAGE_RECORD_NAME, $idSite, $period, $date, $segment); - $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\languageTranslateWithCode')); - - return $dataTable; + return \Piwik\Plugins\UserLanguage\API::getInstance()->getLanguageCode($idSite, $period, $date, $segment); } } diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php index 33640a55fb..ba18becf5b 100644 --- a/plugins/UserSettings/Controller.php +++ b/plugins/UserSettings/Controller.php @@ -10,7 +10,7 @@ namespace Piwik\Plugins\UserSettings; use Piwik\Plugin\Manager as PluginManager; use Piwik\Plugins\Resolution\Reports\GetConfiguration; -use Piwik\Plugins\UserSettings\Reports\GetLanguage; +use Piwik\Plugins\UserLanguage\Reports\GetLanguage; use Piwik\Plugins\DevicePlugins\Reports\GetPlugin; use Piwik\Plugins\Resolution\Reports\GetResolution; use Piwik\View; @@ -24,19 +24,20 @@ class Controller extends \Piwik\Plugin\Controller { $view = new View('@UserSettings/index'); - $isDeviceDetectionEnabled = PluginManager::getInstance()->isPluginLoaded('DevicesDetection'); + $isDeviceDetectionEnabled = PluginManager::getInstance()->isPluginActivated('DevicePlugins'); if ($isDeviceDetectionEnabled) { $view->dataTablePlugin = $this->renderReport(new GetPlugin()); } - $isResolutionEnabled = PluginManager::getInstance()->isPluginLoaded('Resolution'); + $isResolutionEnabled = PluginManager::getInstance()->isPluginActivated('Resolution'); if ($isResolutionEnabled) { $view->dataTableResolution = $this->renderReport(new GetResolution()); $view->dataTableConfiguration = $this->renderReport(new GetConfiguration()); } - $view->dataTableBrowserLanguage = $this->renderReport(new GetLanguage()); - + if (PluginManager::getInstance()->isPluginActivated('UserLanguage')) { + $view->dataTableBrowserLanguage = $this->renderReport(new GetLanguage()); + } return $view->render(); } } diff --git a/plugins/UserSettings/Segment.php b/plugins/UserSettings/Segment.php deleted file mode 100644 index 194ab6314a..0000000000 --- a/plugins/UserSettings/Segment.php +++ /dev/null @@ -1,21 +0,0 @@ -<?php -/** - * Piwik - free/libre analytics platform - * - * @link http://piwik.org - * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later - * - */ -namespace Piwik\Plugins\UserSettings; - -/** - * UserSettings segment base class. - * - */ -class Segment extends \Piwik\Plugin\Segment -{ - protected function init() - { - $this->setCategory('General_Visit'); - } -} diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index cb034c7d94..db8d2f5db3 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -55,6 +55,10 @@ class UserSettings extends \Piwik\Plugin $module = 'Resolution'; } + if ($module == 'UserSettings' && ($action == 'getLanguage' || $action == 'getLanguageCode')) { + $module = 'UserLanguage'; + } + if ($module == 'UserSettings' && $action == 'getPlugin') { $module = 'DevicePlugins'; } diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json index de1005438b..0dde158fc4 100644 --- a/plugins/UserSettings/lang/en.json +++ b/plugins/UserSettings/lang/en.json @@ -1,192 +1,5 @@ { "UserSettings": { - "BrowserLanguage": "Browser language", - "Language_aa": "Afar", - "Language_ab": "Abkhazian", - "Language_ae": "Avestan", - "Language_af": "Afrikaans", - "Language_ak": "Akan", - "Language_am": "Amharic", - "Language_an": "Aragonese", - "Language_ar": "Arabic", - "Language_as": "Assamese", - "Language_av": "Avaric", - "Language_ay": "Aymara", - "Language_az": "Azerbaijani", - "Language_ba": "Bashkir", - "Language_be": "Belarusian", - "Language_bg": "Bulgarian", - "Language_bh": "Bihari", - "Language_bi": "Bislama", - "Language_bm": "Bambara", - "Language_bn": "Bengali", - "Language_bo": "Tibetan", - "Language_br": "Breton", - "Language_bs": "Bosnian", - "Language_ca": "Catalan", - "Language_ce": "Chechen", - "Language_ch": "Chamorro", - "Language_co": "Corsican", - "Language_cr": "Cree", - "Language_cs": "Czech", - "Language_cu": "Church Slavic", - "Language_cv": "Chuvash", - "Language_cy": "Welsh", - "Language_da": "Danish", - "Language_de": "German", - "Language_dv": "Divehi", - "Language_dz": "Dzongkha", - "Language_ee": "Ewe", - "Language_el": "Greek", - "Language_en": "English", - "Language_eo": "Esperanto", - "Language_es": "Spanish", - "Language_et": "Estonian", - "Language_eu": "Basque", - "Language_fa": "Persian", - "Language_ff": "Fulah", - "Language_fi": "Finnish", - "Language_fj": "Fijian", - "Language_fo": "Faroese", - "Language_fr": "French", - "Language_fy": "Western Frisian", - "Language_ga": "Irish", - "Language_gd": "Scottish Gaelic", - "Language_gl": "Galician", - "Language_gn": "Guarani", - "Language_gu": "Gujarati", - "Language_gv": "Manx", - "Language_ha": "Hausa", - "Language_he": "Hebrew", - "Language_hi": "Hindi", - "Language_ho": "Hiri Motu", - "Language_hr": "Croatian", - "Language_ht": "Haitian Creole", - "Language_hu": "Hungarian", - "Language_hy": "Armenian", - "Language_hz": "Herero", - "Language_ia": "Interlingua", - "Language_id": "Indonesian", - "Language_ie": "Interlingue", - "Language_ig": "Igbo", - "Language_ii": "Sichuan Yi", - "Language_ik": "Inupiaq", - "Language_io": "Ido", - "Language_is": "Icelandic", - "Language_it": "Italian", - "Language_iu": "Inuktitut", - "Language_ja": "Japanese", - "Language_jv": "Javanese", - "Language_ka": "Georgian", - "Language_kg": "Kongo", - "Language_ki": "Kukuyu", - "Language_kj": "Kuanyama", - "Language_kk": "Kazakh", - "Language_kl": "Greenlandic", - "Language_km": "Central Khmer", - "Language_kn": "Kannada", - "Language_ko": "Korean", - "Language_kr": "Kanuri", - "Language_ks": "Kashmiri", - "Language_ku": "Kurdish", - "Language_kv": "Komi", - "Language_kw": "Cornish", - "Language_ky": "Kirghiz", - "Language_la": "Latin", - "Language_lb": "Luxembourgish", - "Language_lg": "Ganda", - "Language_li": "Limburgish", - "Language_ln": "Lingala", - "Language_lo": "Lao", - "Language_lt": "Lithuanian", - "Language_lu": "Luba-Katanga", - "Language_lv": "Latvian", - "Language_mg": "Malagasy", - "Language_mh": "Marshallese", - "Language_mi": "Maori", - "Language_mk": "Macedonian", - "Language_ml": "Malayalam", - "Language_mn": "Mongolian", - "Language_mr": "Marathi", - "Language_ms": "Malay", - "Language_mt": "Maltese", - "Language_my": "Burmese", - "Language_na": "Nauru", - "Language_nb": "Norwegian Bokm\u00e5l", - "Language_nd": "North Ndebele", - "Language_ne": "Nepali", - "Language_ng": "Ndonga", - "Language_nl": "Dutch", - "Language_nn": "Norwegian Nynorsk", - "Language_no": "Norwegian", - "Language_nr": "South Ndebele", - "Language_nv": "Navajo", - "Language_ny": "Chichewa", - "Language_oc": "Occitan", - "Language_oj": "Ojibwa", - "Language_om": "Oroma", - "Language_or": "Oriya", - "Language_os": "Ossetian", - "Language_pa": "Panjabi", - "Language_pi": "Pali", - "Language_pl": "Polish", - "Language_ps": "Pashto", - "Language_pt": "Portuguese", - "Language_qu": "Quechua", - "Language_rm": "Raeto-Romance", - "Language_rn": "Rundi", - "Language_ro": "Romanian", - "Language_ru": "Russian", - "Language_rw": "Kinyarwanda", - "Language_sa": "Sanskrit", - "Language_sc": "Sardinian", - "Language_sd": "Sindhi", - "Language_se": "Northern Sami", - "Language_sg": "Sango", - "Language_si": "Sinhala", - "Language_sk": "Slovak", - "Language_sl": "Slovenian", - "Language_sm": "Samoan", - "Language_sn": "Shona", - "Language_so": "Somali", - "Language_sq": "Albanian", - "Language_sr": "Serbian", - "Language_ss": "Swati", - "Language_st": "Sotho", - "Language_su": "Sundanese", - "Language_sv": "Swedish", - "Language_sw": "Swahili", - "Language_ta": "Tamil", - "Language_te": "Telugu", - "Language_tg": "Tajik", - "Language_th": "Thai", - "Language_ti": "Tigrinya", - "Language_tk": "Turkmen", - "Language_tl": "Tagalog", - "Language_tn": "Tswana", - "Language_to": "Tonga", - "Language_tr": "Turkish", - "Language_ts": "Tsonga", - "Language_tt": "Tatar", - "Language_tw": "Twi", - "Language_ty": "Tahitian", - "Language_ug": "Uighur", - "Language_uk": "Ukrainian", - "Language_ur": "Urdu", - "Language_uz": "Uzbek", - "Language_ve": "Venda", - "Language_vi": "Vietnamese", - "Language_vo": "Volap\u00fck", - "Language_wa": "Walloon", - "Language_wo": "Wolof", - "Language_xh": "Xhosa", - "Language_yi": "Yiddish", - "Language_yo": "Yoruba", - "Language_za": "Chuang", - "Language_zh": "Chinese", - "Language_zu": "Zulu", - "LanguageCode": "Language code", - "PluginDescription": "Reports various User Settings: Browser, Browser Family, Operating System, Plugins, Resolution, Global Settings.", - "VisitorSettings": "Visitor Settings" + "PluginDescription": "<i><b>Deprecated</b> Provides only fallbacks for deprecated methods. Will be removed in May 2015</i>" } }
\ No newline at end of file diff --git a/plugins/UserSettings/templates/index.twig b/plugins/UserSettings/templates/index.twig index c97562910e..e64d8e52a8 100644 --- a/plugins/UserSettings/templates/index.twig +++ b/plugins/UserSettings/templates/index.twig @@ -5,7 +5,7 @@ {% endif %} {% if dataTableBrowserLanguage|default is not empty %} - <h2 piwik-enriched-headline>{{ 'UserSettings_BrowserLanguage'|translate }}</h2> + <h2 piwik-enriched-headline>{{ 'UserLanguage_BrowserLanguage'|translate }}</h2> {{ dataTableBrowserLanguage|raw }} {% endif %} </div> diff --git a/plugins/UserSettings/tests/System/processed/.gitkeep b/plugins/UserSettings/tests/System/processed/.gitkeep deleted file mode 100644 index e69de29bb2..0000000000 --- a/plugins/UserSettings/tests/System/processed/.gitkeep +++ /dev/null diff --git a/plugins/UsersManager/lang/cs.json b/plugins/UsersManager/lang/cs.json index 338cf6d7e2..71d117e5d9 100644 --- a/plugins/UsersManager/lang/cs.json +++ b/plugins/UsersManager/lang/cs.json @@ -3,6 +3,7 @@ "AddUser": "Přidat nového uživatele", "Alias": "Alias", "AllWebsites": "Všechny weby", + "AnonymousUser": "Anonymní uživatel", "AnonymousUserHasViewAccess": "Poznámka: %1$s uživatel má právo k přístupu k %2$s", "AnonymousUserHasViewAccess2": "Vaše analytická hlášení a informace o návštěvnících je veřejně dostupná.", "ApplyToAllWebsites": "Použít na všechny weby", @@ -43,6 +44,7 @@ "MenuUserSettings": "Nastavení uživatele", "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Poznámka: Nemůžete měnit nastavení v této sekci, protože žádná z vašich stránek nemůže být zobrazena anonymním uživatelem.", "NoUsersExist": "Zatím nejsou žádní uživatelé.", + "PersonalSettings": "Osobní nastavení", "PluginDescription": "Správa uživatelů v Piwiku: přidat nového uživatele, upravit existujícícho, aktualizace oprávnění. Všechny akce jsou k dizpozici přes API", "PrivAdmin": "Administrátor", "PrivNone": "Žádné oprávnění", diff --git a/plugins/UsersManager/lang/da.json b/plugins/UsersManager/lang/da.json index 3d89a17b2f..c70a6fcdd0 100644 --- a/plugins/UsersManager/lang/da.json +++ b/plugins/UsersManager/lang/da.json @@ -3,6 +3,7 @@ "AddUser": "Opret ny bruger", "Alias": "Alias", "AllWebsites": "Alle hjemmesider", + "AnonymousUser": "Anonym bruger", "AnonymousUserHasViewAccess": "Bemærk: %1$s bruger har %2$s adgang til hjemmesiden.", "AnonymousUserHasViewAccess2": "Analyserapporter og besøgendes oplysninger er offentligt tilgængelige.", "ApplyToAllWebsites": "Tilføj til alle hjemmesider", @@ -43,6 +44,7 @@ "MenuUserSettings": "Bruger indstillinger", "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Bemærk: Indstillingerne kan ikke ændres i denne del, fordi der ikke er en hjemmeside, der kan tilgås af den anonyme bruger.", "NoUsersExist": "Der er endnu ingen brugere.", + "PersonalSettings": "Personlige indstillinger", "PluginDescription": "Brugere styring i Piwik: tilføje en ny bruger, redigere en eksisterende, opdatere tilladelserne. Alle handlinger er også tilgængelige via API.", "PrivAdmin": "Administration", "PrivNone": "Ingen adgang", diff --git a/plugins/UsersManager/lang/el.json b/plugins/UsersManager/lang/el.json index 3533237707..9e07c5531b 100644 --- a/plugins/UsersManager/lang/el.json +++ b/plugins/UsersManager/lang/el.json @@ -3,6 +3,7 @@ "AddUser": "Προσθήκη νέου χρήστη", "Alias": "Ψευδώνυμο", "AllWebsites": "Όλες οι ιστοσελίδες", + "AnonymousUser": "Ανώνυμος χρήστης", "AnonymousUserHasViewAccess": "Σημείωση: ο %1$s χρήστης έχει %2$s πρόσβαση στον ιστοτόπο.", "AnonymousUserHasViewAccess2": "Οι αναφορές στατιστικών σας και οι πληροφορίες για τους επισκέπτες είναι δημόσια προσπελάσιμες.", "ApplyToAllWebsites": "Εφαρμογή σε όλες τις ιστοσελίδες", @@ -43,6 +44,7 @@ "MenuUserSettings": "Ρυθμίσεις χρήστη", "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Σημείωση: Δεν μπορείτε να αλλάξετε τις ρυθμίσεις σε αυτό τον τομέα γιατί δεν έχετε κάποια ιστοσελίδα που μπορείτε να έχετε πρόσβαση ως ανώνυμος χρήστης.", "NoUsersExist": "Δεν υπάρχουν ακόμη χρήστες.", + "PersonalSettings": "Προσωπικές ρυθμίσεις", "PluginDescription": "Διαχείριση Χρηστών στο Piwik: προσθήκη ενός νέου Χρήστη, επεξεργασία ενός υπάρχοντος χρήστη, αναβαθμίστε τα δικαιώματα. Όλες οι δραστηριότητες είναι επίσης διαθέσιμες μέσω του API.", "PrivAdmin": "Διαχείριση", "PrivNone": "Χωρίς πρόσβαση", diff --git a/plugins/UsersManager/lang/pl.json b/plugins/UsersManager/lang/pl.json index 23487ca7e7..f45d493ceb 100644 --- a/plugins/UsersManager/lang/pl.json +++ b/plugins/UsersManager/lang/pl.json @@ -38,6 +38,8 @@ "PrivView": "Widok", "ReportDateToLoadByDefault": "Data raportu jako domyślna do wczytania, dotyczy", "ReportToLoadByDefault": "Raport jako domyślny do wczytania", + "SuperUserAccessManagement": "Zarządzaj dostępem Super Użytkowników", + "SuperUserAccessManagementMainDescription": "Super Użytkownicy mają najwyższe uprawnienia w systemie. Mogą zarządzać wszystkimi zadaniami jak: dodawanie strony do monitoringu, użytkowników, aktywowaći deaktywować wtyczki, zmieniać uprawnienia innym użytkownikom, a także instalować nowe wtyczki z Marketu.", "TheLoginScreen": "Ekran logowania", "ThereAreCurrentlyNRegisteredUsers": "Obecnie znajduje się %s zarejestrowanych użytkowników.", "TypeYourPasswordAgain": "Wpisz nowe hasło ponownie.", diff --git a/plugins/Widgetize/Controller.php b/plugins/Widgetize/Controller.php index 5b1d31b586..5dd61a66c7 100644 --- a/plugins/Widgetize/Controller.php +++ b/plugins/Widgetize/Controller.php @@ -30,7 +30,7 @@ class Controller extends \Piwik\Plugin\Controller public function testJsInclude1() { $view = new View('@Widgetize/testJsInclude1'); - $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday'; + $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=DevicesDetection&actionToWidgetize=getBrowsers&idSite=1&period=day&date=yesterday'; $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=API&actionToWidgetize=index&method=ExamplePlugin.getGoldenRatio&format=original'; return $view->render(); } @@ -38,7 +38,7 @@ class Controller extends \Piwik\Plugin\Controller public function testJsInclude2() { $view = new View('@Widgetize/testJsInclude2'); - $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=UserSettings&actionToWidgetize=getBrowser&idSite=1&period=day&date=yesterday'; + $view->url1 = '?module=Widgetize&action=js&moduleToWidgetize=DevicesDetection&actionToWidgetize=getBrowsers&idSite=1&period=day&date=yesterday'; $view->url2 = '?module=Widgetize&action=js&moduleToWidgetize=UserCountry&actionToWidgetize=getCountry&idSite=1&period=day&date=yesterday&viewDataTable=cloud&show_footer=0'; $view->url3 = '?module=Widgetize&action=js&moduleToWidgetize=Referrers&actionToWidgetize=getKeywords&idSite=1&period=day&date=yesterday&viewDataTable=table&show_footer=0'; return $view->render(); |