language update refs #3430

10 files changed, 186 insertions, 37 deletions

diff --git a/lang/ca.php b/lang/ca.php
index 5db1be6b4c..5329d82f51 100644
--- a/lang/ca.php
+++ b/lang/ca.php
@@ -205,7 +205,7 @@ $translations = array(
 	'General_DisplaySimpleTable' => 'Mostrar una taula simple',
 	'General_DisplayTableWithMoreMetrics' => 'Mostrar una taula amb més paràmetres',
 	'General_DisplayTableWithGoalMetrics' => 'Mostrar una taula amb paràmetres globals',
-	'General_PiwikIsACollaborativeProjectYouCanContributeAndDonate' => '%1$s Piwik %2$s es un projecte col·laboratiu. %3$s Si ets fan de Piwik, pots ajudar al seu desenvolupament:  %4$s Com partircipar al Piwik %5$s, o %6$s %7$feu una donació ara%8$s per col·laborar amb el Piwik 2.0!',
+	'General_PiwikIsACollaborativeProjectYouCanContributeAndDonate' => '%1$s Piwik %2$s es un projecte col·laboratiu. %3$s Si sou fan de Piwik, podeu ajudar al seu desenvolupament:  %4$s Com participar al Piwik %5$s, o %6$s %7$feu una donació ara%8$s per col·laborar amb el Piwik 2.0!',
 	'General_YouAreViewingDemoShortMessage' => 'Ara mateix estàs veient la demo del Piwik',
 	'General_YouAreCurrentlyUsing' => 'Ara mateix estàs fent servir el Piwik %s.',
 	'General_DownloadFullVersion' => '%1$sDescarrega%2$s la versió completa! Ves a %3$s',
diff --git a/lang/da.php b/lang/da.php
index ea7af84468..2c6adeed94 100644
--- a/lang/da.php
+++ b/lang/da.php
@@ -42,6 +42,7 @@ $translations = array(
 	'General_Close' => 'Luk',
 	'General_Cancel' => 'Fortryd',
 	'General_OrCancel' => 'eller %s Fortryd %s',
+	'General_And' => 'og',
 	'General_Logout' => 'Log af',
 	'General_Username' => 'Brugernavn',
 	'General_Description' => 'Beskrivelse',
@@ -268,6 +269,10 @@ $translations = array(
 	'General_Daily' => 'Daglig',
 	'General_Weekly' => 'Ugentligt',
 	'General_Monthly' => 'Månedlig',
+	'General_DailyReport' => 'daglig',
+	'General_WeeklyReport' => 'ugentlig',
+	'General_MonthlyReport' => 'månedligt',
+	'General_YearlyReport' => 'årligt',
 	'General_DailyReports' => 'Daglige rapporter',
 	'General_WeeklyReports' => 'Ugentlige rapporter',
 	'General_MonthlyReports' => 'Månedlige rapporter',
@@ -372,6 +377,19 @@ $translations = array(
 	'General_MoreDetails' => 'Flere detaljer',
 	'General_Source' => 'Kilde',
 	'General_Options' => 'Indstillinger',
+	'General_Matches' => 'Matcher',
+	'General_OperationEquals' => 'Lig med',
+	'General_OperationNotEquals' => 'Ikke lig med',
+	'General_OperationAtMost' => 'Højst',
+	'General_OperationAtLeast' => 'Mindst',
+	'General_OperationLessThan' => 'Mindre end',
+	'General_OperationGreaterThan' => 'Større end',
+	'General_OperationContains' => 'Indeholder',
+	'General_OperationDoesNotContain' => 'Indeholder ikke',
+	'General_OperationIs' => 'Er',
+	'General_OperationIsNot' => 'Er ikke',
+	'General_DefaultAppended' => '(standard)',
+	'General_SearchNoResults' => 'Ingen resultater',
 	'General_ReadThisToLearnMore' => '%1$sLæs dette for at lære mere.%2$s',
 	'Actions_PluginDescription' => 'Rapporter om sidevisninger, udgående links og fil-hentninger. Udgående links og filhentninger spores automatisk!',
 	'Actions_Actions' => 'Handlinger',
@@ -2265,6 +2283,27 @@ $translations = array(
 	'UserLanguage_Language_zh' => 'Kinesisk',
 	'UserLanguage_Language_zu' => 'Zulu',
 	'UserSettings_BrowserLanguage' => 'Browser sprog',
+	'SegmentEditor_AddNewSegment' => 'Tilføj nyt segment',
+	'SegmentEditor_NewSegment' => 'Nyt segment',
+	'SegmentEditor_SelectSegmentOfVisitors' => 'Vælg et segment af besøgende:',
+	'SegmentEditor_YouMustBeLoggedInToCreateSegments' => 'Du skal være logget ind for at oprette og anvende brugerdefinerede besøgssegmenter.',
+	'SegmentEditor_DragDropCondition' => 'Træk og slip betingelse',
+	'SegmentEditor_OperatorAND' => 'OG',
+	'SegmentEditor_OperatorOR' => 'ELLER',
+	'SegmentEditor_DefaultAllVisits' => 'Alle besøg',
+	'SegmentEditor_AddANDorORCondition' => 'Tilføj %s betingelse',
+	'SegmentEditor_ThisSegmentIsVisibleTo' => 'Segmentet er synligt for:',
+	'SegmentEditor_VisibleToMe' => 'mig',
+	'SegmentEditor_VisibleToAllUsers' => 'Alle brugere',
+	'SegmentEditor_SegmentIsDisplayedForWebsite' => 'og vises for',
+	'SegmentEditor_SegmentDisplayedThisWebsiteOnly' => 'kun dette websted',
+	'SegmentEditor_SegmentDisplayedAllWebsites' => 'alle websteder',
+	'SegmentEditor_SaveAndApply' => 'Gem og anvend',
+	'SegmentEditor_AreYouSureDeleteSegment' => 'Er du sikker på, at du vil slette dette segment?',
+	'SegmentEditor_ChooseASegment' => 'Vælg et segment',
+	'SegmentEditor_LoadingSegmentedDataMayTakeSomeTime' => 'Behandling af besøgendes segmenterede data kan tage et par minutter ...',
+	'SegmentEditor_AutoArchiveRealTime' => 'Segmenterede rapporter behandles tidstro',
+	'SegmentEditor_AutoArchivePreProcessed' => 'Segmenterede rapporter behandles på forhånd (er hurtigere, kræver archive.php cron)',
 
 	// FOR REVIEW
 	'EntryPage_Bounces' => 'Afvisninger',
diff --git a/lang/de.php b/lang/de.php
index 4c36b6d724..335dc11f19 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -42,6 +42,7 @@ $translations = array(
 	'General_Close' => 'Schließen',
 	'General_Cancel' => 'Abbrechen',
 	'General_OrCancel' => 'oder %s abbrechen %s',
+	'General_And' => 'und',
 	'General_Logout' => 'Abmelden',
 	'General_Username' => 'Benutzername',
 	'General_Description' => 'Beschreibung',
@@ -268,6 +269,10 @@ $translations = array(
 	'General_Daily' => 'Täglich',
 	'General_Weekly' => 'Wöchentlich',
 	'General_Monthly' => 'Monatlich',
+	'General_DailyReport' => 'täglich',
+	'General_WeeklyReport' => 'wöchentlich',
+	'General_MonthlyReport' => 'monatlich',
+	'General_YearlyReport' => 'jährlich',
 	'General_DailyReports' => 'Tägliche Berichte',
 	'General_WeeklyReports' => 'Wöchentliche Berichte',
 	'General_MonthlyReports' => 'Monatliche Berichte',
@@ -372,6 +377,18 @@ $translations = array(
 	'General_MoreDetails' => 'Mehr Details',
 	'General_Source' => 'Quelle',
 	'General_Options' => 'Optionen',
+	'General_Matches' => 'Treffer',
+	'General_OperationEquals' => 'Entspricht',
+	'General_OperationNotEquals' => 'Entspricht nicht',
+	'General_OperationAtMost' => 'Maximal',
+	'General_OperationAtLeast' => 'Mindestens',
+	'General_OperationLessThan' => 'Weniger als',
+	'General_OperationGreaterThan' => 'Mehr als',
+	'General_OperationContains' => 'Enthält',
+	'General_OperationDoesNotContain' => 'Enthält nicht',
+	'General_OperationIs' => 'Entspricht',
+	'General_OperationIsNot' => 'Entspricht nicht',
+	'General_SearchNoResults' => 'Keine Ergebnisse',
 	'General_ReadThisToLearnMore' => '%1$sErfahren Sie hier mehr darüber.%2$s',
 	'Actions_PluginDescription' => 'Zusammenfassung über die Anzahl der betrachteten Seiten, ausgehenden Verweise und Downloads. Ausgehende Verweise und Downloads werden automatisch getrackt.',
 	'Actions_Actions' => 'Aktionen',
@@ -2265,6 +2282,21 @@ $translations = array(
 	'UserLanguage_Language_zh' => 'Chinesisch',
 	'UserLanguage_Language_zu' => 'IsiZulu',
 	'UserSettings_BrowserLanguage' => 'Browsersprache',
+	'SegmentEditor_AddNewSegment' => 'Neues Segment hinzufügen',
+	'SegmentEditor_NewSegment' => 'Neues Segment',
+	'SegmentEditor_SelectSegmentOfVisitors' => 'Wählen Sie ein Segment an Besuchern aus:',
+	'SegmentEditor_OperatorAND' => 'UND',
+	'SegmentEditor_OperatorOR' => 'ODER',
+	'SegmentEditor_DefaultAllVisits' => 'Alle Besuche',
+	'SegmentEditor_ThisSegmentIsVisibleTo' => 'Dieses Segment ist sichtbar für:',
+	'SegmentEditor_VisibleToMe' => 'mich',
+	'SegmentEditor_VisibleToAllUsers' => 'alle Benutzer',
+	'SegmentEditor_SegmentIsDisplayedForWebsite' => 'und wird angezeigt für',
+	'SegmentEditor_SegmentDisplayedThisWebsiteOnly' => 'nur diese Webseite',
+	'SegmentEditor_SegmentDisplayedAllWebsites' => 'alle Webseiten',
+	'SegmentEditor_SaveAndApply' => 'Speichern & Übernehmen',
+	'SegmentEditor_AreYouSureDeleteSegment' => 'Möchten Sie dieses Segment wirklich löschen?',
+	'SegmentEditor_AutoArchiveRealTime' => 'Segmentierte Berichte werden in Echtzeit verarbeitet.',
 
 	// FOR REVIEW
 	'EntryPage_Bounces' => 'Absprünge',
diff --git a/lang/fa.php b/lang/fa.php
index 7d908214d6..7cfd6a980a 100644
--- a/lang/fa.php
+++ b/lang/fa.php
@@ -347,6 +347,7 @@ $translations = array(
 	'General_Donate' => 'کمک مالی',
 	'General_MoreDetails' => 'جزئیات بیشتر',
 	'General_Source' => 'منبع',
+	'General_Options' => 'اختیارات',
 	'Actions_PluginDescription' => 'گزارش در مورد صفحه نمایش، از لینک ها و دریافت هاخروجی ها ردیابی خودکار است.',
 	'Actions_Actions' => 'فعالیت ها',
 	'Actions_SubmenuPages' => 'صفحه ها',
@@ -386,6 +387,7 @@ $translations = array(
 	'Actions_ColumnSearchCategory' => 'دسته بندی جستجو',
 	'Actions_ColumnSearchResultsCount' => 'شمارگان نتایج جستجو',
 	'Actions_ColumnSearchKeyword' => 'کلمه کلیدی',
+	'Actions_SiteSearchKeyword' => '(کلمه (جستجوی سایت',
 	'Actions_ColumnClickedURL' => 'آدرس کلیک شده',
 	'Actions_ColumnDownloadURL' => 'آدرس دانلود شده',
 	'Actions_ColumnEntryPageURL' => 'آدرس صفحات ورودی',
@@ -446,8 +448,13 @@ $translations = array(
 	'CoreAdminHome_TrackingCode' => 'کد ردیابی',
 	'CoreAdminHome_ImageTracking' => 'ردیابی تصویر',
 	'CoreAdminHome_TrackAGoal' => 'به دنبال یک هدف',
+	'CoreAdminHome_WithOptionalRevenue' => 'با درآمد اختیاری',
 	'CoreAdminHome_ImageTrackingLink' => 'لینک ردیابی تصویر',
 	'CoreAdminHome_JavaScriptTracking' => 'ردیابی جاوااسکریپت',
+	'CoreAdminHome_LatestStableRelease' => 'آخرین نسخه نهایی',
+	'CoreAdminHome_LatestBetaRelease' => 'آخرین نسخه بتا',
+	'CoreAdminHome_ForBetaTestersOnly' => 'فقط برای استفاده کنندهای موقطی',
+	'CoreAdminHome_YouAreCurrentlyUsingPHP' => 'شما در حال حاضر استفاده میکنید  PHP %1$s',
 	'CoreHome_InjectedHostEmailSubject' => 'دسترسی به پیویک توسط یک میزبان ناشناخته انجام شده است: %s',
 	'CoreHome_InjectedHostEmailBody' => 'درود، من امروز برای دسترسی به پیویک تلاش کردم و هشدار نام هاست نامشخص را دریافت کردم.',
 	'CoreHome_CheckForUpdates' => 'بررسی برای بروزرسانی',
@@ -952,6 +959,7 @@ $translations = array(
 	'Live_GoalRevenue' => 'درآمد',
 	'Live_GoalDetails' => 'جزئیات',
 	'Live_VisitorsLastVisit' => 'بازدید گذشته ی این بازدیدکننده %s روز پیش بوده است.',
+	'Live_NbVisitor' => 'یک ویزیتور',
 	'Login_PluginDescription' => 'پلاگین انتقالها، خواندن اعتبارنامه از فایل پیکربندی / config.inc.php به کاربر فوق العاده، و از پایگاه داده را برای کاربران دیگر را وارد نمایید. می تواند به راحتی جایگزین را به شما معرفی مکانیزم احراز هویت جدید (ایجاد حساب کاربری، htaccess تغییر نام دهید، تایید سفارشی، و غیره).',
 	'Login_LoginPasswordNotCorrect' => 'نام کاربری و کلمه عبور درست نیست.',
 	'Login_Password' => 'رمزعبور',
@@ -1049,7 +1057,9 @@ $translations = array(
 	'Provider_ColumnProvider' => 'ارائه دهنده خدمات',
 	'Provider_SubmenuLocationsProvider' => 'محل و ارائه دهنده خدمات',
 	'Referers_PluginDescription' => 'گزارش داده ها معرف: موتورهای جستجو، کلمات کلیدی، وب سایت ها، ردیابی کمپین بین المللی حقوق بشر، ورود مستقیم.',
+	'Referers_Referrer' => 'معرف',
 	'Referers_Referers' => 'ارجاع دهنده ها',
+	'Referers_ReferrersOverview' => 'نمایش معرف ها',
 	'Referers_EvolutionDocumentation' => 'این یک مرور کلی از مراجعه کنندگان که منجر بازدید کنندگان وب سایت شما می باشد.',
 	'Referers_EvolutionDocumentationMoreInfo' => 'برای اطلاعات بیشتر درباره ی انواع ارجاه دهنده های مختلف , مستندات جدول %s را ببینید.',
 	'Referers_SearchEngines' => 'موتور های جستجو',
diff --git a/lang/id.php b/lang/id.php
index ccfbaefd3d..513056a86b 100644
--- a/lang/id.php
+++ b/lang/id.php
@@ -918,7 +918,7 @@ $translations = array(
 	'Goals_PageTitle' => 'Judul Halaman',
 	'Goals_Filename' => 'nama berkas',
 	'Goals_ExternalWebsiteUrl' => 'URL situs luar',
-	'Goals_Download' => 'Unuh berkas',
+	'Goals_Download' => 'Unduh berkas',
 	'Goals_VisitPageTitle' => 'Kunjungi Judul Halaman yang diberikan',
 	'Goals_ClickOutlink' => 'Klik Tautan ke situs luar',
 	'Goals_Optional' => '(pilihan)',
@@ -1652,7 +1652,7 @@ Dan terima kasih menggunakan Piwik!',
 	'UserCountry_country_ug' => 'Uganda',
 	'UserCountry_country_uk' => 'Britania Raya',
 	'UserCountry_country_um' => 'Kepulauan Terluar Kecil Amerika Serikat',
-	'UserCountry_country_us' => 'Amerika Serika',
+	'UserCountry_country_us' => 'Amerika Serikat',
 	'UserCountry_country_uy' => 'Uruguay',
 	'UserCountry_country_uz' => 'Uzbekistan',
 	'UserCountry_country_va' => 'Kota Vatican',
@@ -1988,7 +1988,7 @@ Dan terima kasih menggunakan Piwik!',
 	'PDFReports_DescriptionOnFirstPage' => 'Penjelasan laporan akan ditampilkan dalam halaman pertama laporan.',
 	'PDFReports_WeeklyScheduleHelp' => 'Laporan mingguan: laporan akan dikirim setiap hari Senin pertama tiap minggu.',
 	'PDFReports_MonthlyScheduleHelp' => 'Laporan bulanan: laporan akan dikirim satiap hari pertama tiap bulan.',
-	'PDFReports_ReportHour' => 'Kirim laporan pada',
+	'PDFReports_ReportHour' => 'Kirim laporan pada pukul',
 	'PDFReports_OClock' => '`',
 	'PDFReports_AlsoSendReportToTheseEmails' => 'Juga kirim laporan kepada surel berikut (satu surel tiap baris):',
 	'PDFReports_ReportsIncluded' => 'Sertakan Statistik',
diff --git a/lang/nb.php b/lang/nb.php
index eca803b7a1..0206ec1c5d 100644
--- a/lang/nb.php
+++ b/lang/nb.php
@@ -217,9 +217,13 @@ $translations = array(
 	'Actions_SubmenuPages' => 'Sider',
 	'Actions_SubmenuPagesEntry' => 'Innganssider',
 	'Actions_SubmenuPagesExit' => 'Utgangssider',
+	'Actions_WidgetExitPageTitles' => 'Utgangs Side Tittler',
 	'Actions_SubmenuPageTitles' => 'Sidetitler',
+	'Actions_WidgetPageTitles' => 'Side Tittler',
+	'Actions_WidgetPageTitlesFollowingSearch' => 'Side Tittel fulgt av ett sidesøk',
 	'Actions_SubmenuOutlinks' => 'Utlenker',
 	'Actions_SubmenuDownloads' => 'Nedlastinger',
+	'Actions_SubmenuSitesearch' => 'Sidesøk',
 	'Actions_ColumnClicks' => 'Klikk',
 	'Actions_ColumnClicksDocumentation' => 'Antall klikk på denne lenken',
 	'Actions_ColumnUniqueClicks' => 'Unike klikk',
@@ -230,6 +234,7 @@ $translations = array(
 	'Actions_ColumnPageName' => 'Sidenavn',
 	'Actions_ColumnPageURL' => 'URL for side',
 	'Actions_ColumnSearchCategory' => 'Søkekategori',
+	'Actions_ColumnSearchResultsCount' => 'Antall Søke Resultater',
 	'Actions_ColumnSearchKeyword' => 'Nøkkelord',
 	'Actions_ColumnClickedURL' => 'URL for klikk',
 	'Actions_ColumnDownloadURL' => 'URL for nedlasting',
@@ -240,6 +245,11 @@ $translations = array(
 	'Actions_ColumnNoResultKeyword' => 'Nøkkelord uten søkeresultat',
 	'Actions_ColumnSearches' => 'Søk',
 	'Actions_ColumnSiteSearchKeywords' => 'Unike nøkkelord',
+	'Actions_ColumnSearchesDocumentation' => 'Antall besøkende som søkte etter dette nøkkelordet i din søkemotor.',
+	'Actions_ColumnSearchExits' => '% Søk Eksisterer',
+	'Actions_ColumnSearchExitsDocumentation' => 'Antall besøkende som forlot webside etter og ha søkt etter dette nøkkelordet.',
+	'Actions_ColumnPagesPerSearch' => 'Søke Resultater',
+	'Actions_AvgGenerationTimeTooltip' => 'Gjennomsnitt basert på %s treff %s mellom %s og %s',
 	'API_LoadedAPIs' => 'Lastet %s API',
 	'CoreAdminHome_PluginDescription' => 'Administrasjonsområdet for Piwik.',
 	'CoreAdminHome_MenuGeneralSettings' => 'Generelle innstillinger',
@@ -253,6 +263,9 @@ $translations = array(
 	'CoreAdminHome_YouAreOptedOut' => 'Du deltar ikke i analysegrunnlaget',
 	'CoreAdminHome_ClickHereToOptOut' => 'Trykk her for å ikke delta.',
 	'CoreAdminHome_ClickHereToOptIn' => 'Trykk her for å delta.',
+	'CoreAdminHome_ImageTracking' => 'Bilde sporing',
+	'CoreAdminHome_ImageTrackingLink' => 'Sporings lenke for bilde',
+	'CoreAdminHome_ForBetaTestersOnly' => 'Kun for beta testere',
 	'CoreHome_PluginDescription' => 'Struktur for nettstatistikkrapporter.',
 	'CoreHome_WebAnalyticsReports' => 'Nettstatistikkrapporter',
 	'CoreHome_JavascriptDisabled' => 'JavaScript må være aktivert for at du skal kunne bruke Piwik i standardvisning.<br />Det ser ut til at JavaScript enten er deaktivert eller ikke støttet av din nettleser.<br />For å bruke standardvisning, må du aktivere JavaScript i nettleserinnstillingene og deretter %1$sprøve igjen%2$s.<br />',
diff --git a/lang/ro.php b/lang/ro.php
index f3f9938f57..789d662c2a 100644
--- a/lang/ro.php
+++ b/lang/ro.php
@@ -330,12 +330,17 @@ $translations = array(
 	'Actions_SubmenuPages' => 'Pagini',
 	'Actions_SubmenuPagesEntry' => 'Pagini de intrare',
 	'Actions_SubmenuPagesExit' => 'Pagini de ieşire',
+	'Actions_WidgetPagesExit' => 'Pagini de iesire',
 	'Actions_EntryPageTitles' => 'Titlurile paginilor de intrare',
 	'Actions_ExitPageTitles' => 'Titlurile paginilor de ieşire',
+	'Actions_WidgetExitPageTitles' => 'Titlurile paginii de iesire',
 	'Actions_SubmenuPageTitles' => 'Titluri pagini',
+	'Actions_WidgetSearchCategories' => 'Categorii de cautare',
+	'Actions_WidgetSearchNoResultKeywords' => 'Interogari de cautare fara rezultat',
 	'Actions_PageUrls' => 'URL-uri pagini',
 	'Actions_SubmenuOutlinks' => 'Linkuri externe',
 	'Actions_SubmenuDownloads' => 'Descarcari',
+	'Actions_SubmenuSitesearch' => 'Cautare pe site',
 	'Actions_PagesReportDocumentation' => 'Acest raport conţine informaţii despre URL-urile paginilor ce au fost vizitate. %s Acest tabel este organizat ierarhic,URL-urile sunt afişate într-o structură tip arbore.',
 	'Actions_PageTitlesReportDocumentation' => 'Acest raport conţine informaţii despre titlurile paginilor ce au fost vizitate. %s Titlul paginii este Tag-ul HTML %s afişat de cele mai multe browsere ca nume al ferestrei.',
 	'Actions_OutlinksReportDocumentation' => 'Acest raport arată o listă ierarhică al URL-urilor outlink-urilor ce au fost click-uite de vizitatorii tăi.',
@@ -352,6 +357,8 @@ $translations = array(
 	'Actions_ColumnPageName' => 'Numele Paginii',
 	'Actions_ColumnPageURL' => 'URL-ul Paginii',
 	'Actions_ColumnSearchCategory' => 'Categorie căutare',
+	'Actions_ColumnSearchKeyword' => 'Cuvant cheie',
+	'Actions_SiteSearchKeyword' => 'Intereogare (Cautare pe site)',
 	'Actions_ColumnClickedURL' => 'URL-uri Click-uite',
 	'Actions_ColumnDownloadURL' => 'URL Descărcare',
 	'Actions_ColumnEntryPageURL' => 'URL Paginii de Intrare',
@@ -360,6 +367,7 @@ $translations = array(
 	'Actions_ColumnExitPageTitle' => 'Titlul Paginii de Ieşire',
 	'Actions_ColumnNoResultKeyword' => 'Cuvânt cheie fără rezultate în căutări',
 	'Actions_ColumnSearches' => 'Căutări',
+	'Actions_ColumnSiteSearchKeywords' => 'Cuvinte cheie unice',
 	'Actions_ColumnSearchesDocumentation' => 'Numărul de vizite care au căutat după acest cuvânt cheie folosind motorul de căutare de pe site-ul dvs web.',
 	'Actions_ColumnPagesPerSearch' => 'Pagini cu rezultate căutări',
 	'Actions_ColumnPagesPerSearchDocumentation' => 'Vizitatorii vor căuta pe site-ul dvs web şi uneori vor apăsa "următorul" pentru a vizualiza mai multe rezultate. Acesta este numărul mediu de pagini cu rezultate ale căutării vizualizate pentru acest cuvânt cheie.',
@@ -368,7 +376,15 @@ $translations = array(
 	'Actions_ExitPagesReportDocumentation' => 'Acest raport conţine informaţii despre paginile de ieşire ce au fost folosite în timpul perioadei specificate. O pagină de ieşire este ultima pagină ce a fost văzută de un vizitator în timpul vizitei sale. %s URL-urile de ieşire sunt afişate ca o structură tip arbore.',
 	'Actions_ExitPageTitlesReportDocumentation' => 'Acest raport conţine informaţii despre titlurile paginilor de ieşire ce au fost folosite în timpul perioadei specificate.',
 	'AnonymizeIP_PluginDescription' => 'Ascunde ultimele cifre ale IP-ului vizitatorilor pentru a fi în conformitate cu legile privind protecţia datelor personale.',
+	'API_QuickDocumentationTitle' => 'Demonstrare rapida API',
+	'API_UserAuthentication' => 'Identificare utilizator',
 	'API_LoadedAPIs' => 'Incarcare de succes %s al API',
+	'CoreAdminHome_Administration' => 'Administrare',
+	'CoreAdminHome_EmailServerSettings' => 'Setarile serverului email',
+	'CoreAdminHome_JSTracking_CustomCampaignQueryParamDesc' => 'Nota: %1$sPiwik va detecta automat parametrii Google Analytics.%2$s',
+	'CoreAdminHome_ImageTracking' => 'Urmarire prin imagine',
+	'CoreAdminHome_ImageTrackingLink' => 'Legatura de urmarire prin imagine',
+	'CoreAdminHome_JavaScriptTracking' => 'Urmarire prin JavaScript',
 	'CoreHome_CategoryNoData' => 'Nici o data in aceasta categorie. Incearca "Include toata populatia".',
 	'CoreHome_ShowJSCode' => 'Arat codul  javascript ce trebuie folosit',
 	'CoreHome_PageOf_js' => '%1$s al %2$s',
@@ -953,6 +969,14 @@ $translations = array(
 	'VisitTime_WidgetServerTime' => 'Vizite dupa timpul serverului',
 	'VisitTime_SubmenuTimes' => 'Timp',
 	'VisitTime_NHour' => '%sh',
+	'Annotations_Annotations' => 'Note',
+	'Annotations_EnterAnnotationText' => 'Introdu nota...',
+	'Annotations_IconDesc_js' => 'Vezi notele pentru aceasta data de interval.',
+	'Annotations_ViewAndAddAnnotations_js' => 'Vezi si adauga nota pentru %s...',
+	'Annotations_ClickToDelete' => 'Click pentru a sterge acesta nota',
+	'Annotations_ClickToStarOrUnstar' => 'Click pentru a marca sau demarca aceasta nota.',
+	'Annotations_LoginToAnnotate' => 'Conecteaza-te pentru a crea o nota.',
+	'Annotations_AnnotationOnDate' => 'Comentariu in %1$s: %2$s',
 	'UserLanguage_Language_ab' => 'abhază',
 	'UserLanguage_Language_af' => 'afrikaans',
 	'UserLanguage_Language_am' => 'amharică',
diff --git a/lang/ru.php b/lang/ru.php
index 8169113e0f..e81484ee7e 100644
--- a/lang/ru.php
+++ b/lang/ru.php
@@ -356,6 +356,7 @@ $translations = array(
 	'General_InfoFor' => 'Информация для %s',
 	'General_Add' => 'Добавить',
 	'General_CannotUnzipFile' => 'Не могу распаковать файл %1$s: %2$s',
+	'General_GetStarted' => 'Начало работы',
 	'General_Continue' => 'Продолжить',
 	'General_Note' => 'Заметка',
 	'General_DownloadFail_FileExists' => 'Файл %s уже существует!',
@@ -1062,6 +1063,8 @@ $translations = array(
 	'Live_GoalRevenue' => 'Прибыль',
 	'Live_GoalDetails' => 'Детали',
 	'Live_VisitorsLastVisit' => 'Последнее посещение этого пользователя было %s дней назад.',
+	'Live_NbVisitors' => '%s посетителей',
+	'Live_NbVisitor' => '1 посетитель',
 	'Login_PluginDescription' => 'Плагин аутентификации логина читает учетные данные из файла config/config.inc.php для суперпользователя, и из базы данных для других пользователей. Может быть легко применен для введения новых механизмов аутентификации (OpenID, htaccess, custom Auth, etc.).',
 	'Login_LoginPasswordNotCorrect' => 'Логин или пароль неверны',
 	'Login_Password' => 'Пароль',
@@ -1111,6 +1114,7 @@ $translations = array(
 	'Mobile_ShowLess' => 'Показать меньше',
 	'Mobile_HttpTimeout' => 'HTTP Timeout',
 	'Mobile_VerifyAccount' => 'Верификация аккаунта',
+	'Mobile_VerifyLoginData' => 'Убедитесь, что вы ввели имя пользователя и пароль правильно.',
 	'Mobile_AnonymousAccess' => 'Анонимный доступ',
 	'Mobile_AccessUrlLabel' => 'URL для анонимного доступа',
 	'Mobile_EnableGraphsLabel' => 'Отображать графики',
@@ -1127,17 +1131,22 @@ $translations = array(
 	'Mobile_UseSearchBarHint' => 'Здесь отображаются только первые %s сайтов. Пожалуйста, используйте строку поиска, чтобы получить доступ к других вашим сайтам.',
 	'Mobile_YouAreOffline' => 'Извините, но вы сейчас офлайн',
 	'MobileMessaging_PluginDescription' => 'Позволяет создавать и загружать SMS-отчёты и отправлять их на мобильный телефон каждый день, неделю или месяц.',
+	'MobileMessaging_TopMenu' => 'Email и SMS отчёты',
 	'MobileMessaging_SettingsMenu' => 'СМС сообщения',
 	'MobileMessaging_Settings_SuperAdmin' => 'Настройки суперпользователя',
 	'MobileMessaging_Settings_LetUsersManageAPICredential' => 'Разрешить пользователям управлять своими полномочиями SMS API',
 	'MobileMessaging_Settings_SMSProvider' => 'SMS-гейт',
 	'MobileMessaging_Settings_SMSAPIAccount' => 'Управление API SMS аккаунтом',
 	'MobileMessaging_Settings_PhoneNumbers' => 'Номера телефонов',
+	'MobileMessaging_Settings_PhoneNumbers_Add' => 'Добавить новый номер телефона',
+	'MobileMessaging_Settings_PhoneActivated' => 'Номер телефона успешно проверен! Теперь вы можете получать SMS со статистикой.',
 	'MobileMessaging_Settings_CountryCode' => 'Код страны',
 	'MobileMessaging_Settings_PhoneNumber' => 'Номер телефона',
+	'MobileMessaging_Settings_ManagePhoneNumbers' => 'Управление номерами телефонов',
 	'MobileMessaging_Settings_PleaseSignUp' => 'Для создания SMS сообщений и получения коротких текстовых сообщений со статистикой ваших веб-сайтов, на свой мобильный телефон, пожалуйста, зарегистрируйтесь в SMS API и введите информацию ниже.',
 	'MobileMessaging_Settings_APIKey' => 'API ключ',
 	'MobileMessaging_Settings_AddPhoneNumber' => 'Добавить',
+	'MobileMessaging_Settings_ValidatePhoneNumber' => 'Проверить',
 	'MobileMessaging_Settings_RemovePhoneNumber' => 'Удалить',
 	'MobileMessaging_Settings_CredentialNotProvidedByAdmin' => 'Прежде чем вы сможете создавать и управлять номерами телефонов, пожалуйста, обратитесь к администратору для подключения Piwik к аккаунту SMS.',
 	'MobileMessaging_Settings_CredentialNotProvided' => 'Прежде чем вы сможете создавать и управлять номерами телефонов, подключите Piwik к своему ​​аккаунту SMS выше.',
@@ -1620,10 +1629,18 @@ $translations = array(
 	'UserCountryMap_toggleFullscreen' => 'Развернуть на весь экран',
 	'UserCountryMap_NoVisit' => 'Без посещений',
 	'UserCountryMap_RealTimeMap' => 'Карта в реальном времени',
+	'UserCountryMap_Seconds' => 'секунд',
 	'UserCountryMap_SecondsAgo' => '%s секунд назад',
+	'UserCountryMap_Minutes' => 'минуты',
+	'UserCountryMap_MinutesAgo' => '%s минут назад',
+	'UserCountryMap_Hours' => 'часов',
+	'UserCountryMap_HoursAgo' => '%s часов назад',
+	'UserCountryMap_DaysAgo' => '%s дней назад',
+	'UserCountryMap_Searches' => '%s поисковых запросов',
 	'UserCountryMap_GoalConversions' => '%s целей достигнуто',
 	'UserCountry_HttpServerModule' => 'HTTP Серверный модуль',
 	'UserCountry_GeoIPDatabases' => 'Базы данных GeoIP',
+	'UserCountry_IWantToDownloadFreeGeoIP' => 'Я хочу загрузить бесплатную GeoIP базу...',
 	'UserCountry_DefaultLocationProviderDesc1' => 'Местонахождение провайдера и посетителя определяется на основе языка, которым они пользуются в браузере и системе.',
 	'UserCountry_DefaultLocationProviderDesc2' => 'Это не очень точное определение, поэтому %1$sмы рекомендуем установить и использовать плагин %2$sGeoIp%3$s.%4$s',
 	'UserCountry_HowToInstallGeoIPDatabases' => 'Как мне получить базы данных GeoIP?',
@@ -1661,8 +1678,15 @@ $translations = array(
 	'UserCountry_NoDataForGeoIPReport2' => 'Для обеспечения точной геолокации, изменить параметры %1$sтут%2$s и используйте %3$sбазу данных городов%4$s.',
 	'UserCountry_ToGeolocateOldVisits' => 'Для того чтобы получить информацию о местоположении для предыдущих посетителей, воспользуйтесь скриптом, о котором написано %1$sтут%2$s.',
 	'UserCountry_GeoIPServerVarsFound' => 'Piwik нашёл следующие переменные GeoIP: %s',
+	'UserCountry_FoundApacheModules' => 'Piwik нашёл следующие модули Apache',
+	'UserCountry_LocationDatabase' => 'Базе местоположений',
+	'UserCountry_ISPDatabase' => 'База провайдеров',
+	'UserCountry_OrgDatabase' => 'База организаций',
 	'UserCountry_DownloadingDb' => 'Загрузка %s',
 	'UserCountry_CannotSetupGeoIPAutoUpdating' => 'Похоже на то, чтобы храните свои GeoIP базы за пределами папки Piwik. Piwik не может автоматически обновлять базы, которые находятся за пределами папки misc.',
+	'UserCountry_ThisUrlIsNotAValidGeoIPDB' => 'Загруженный файл не является корректной GeoIP базой. Пожалуйста, перепроверьте ссылку или загрузите файл вручную.',
+	'UserCountry_SetupAutomaticUpdatesOfGeoIP_js' => 'Настроить автоматическое обновление GeoIP баз',
+	'UserCountry_DownloadNewDatabasesEvery' => 'Обновлять базу каждые',
 	'UserCountry_GeoLiteCityLink' => 'Если вы используете базу данных GeoLite City, воспользуйтесь этой ссылкой: %1$s%2$s%3$s.',
 	'UserSettings_VisitorSettings' => 'Настройки пользователя',
 	'UserSettings_BrowserFamilies' => 'По семейству браузеров',
@@ -1938,6 +1962,7 @@ $translations = array(
 	'Transitions_NoDataForActionDetails' => 'Не было совершено таких действий %s или они неправильны.',
 	'Transitions_ErrorBack' => 'Верниться к предыдущему действию',
 	'Overlay_Overlay' => 'Глубина проникновения',
+	'Overlay_Location' => 'Местоположение',
 	'Overlay_MainMetrics' => 'Основные показатели',
 	'Overlay_NoData' => 'Нет данных по этой странице за выбранный период.',
 	'Overlay_OpenFullScreen' => 'Перейти к полному экрану',
@@ -2158,5 +2183,7 @@ $translations = array(
 	'Forecast_ReturnVisits' => 'вернувшиеся посетители',
 	'Forecast_Visitors' => 'Посетители',
 	'Forecast_Widget' => 'Прогноз на сегодня',
+	'UserLanguage_Language' => 'Языки',
+	'UserLanguage_SubmenuLanguage' => 'Языки',
 	'UserLanguage_WidgetLanguage' => 'Языки посетителей',
 );
diff --git a/lang/th.php b/lang/th.php
index b7159719c2..9b9dc0b097 100644
--- a/lang/th.php
+++ b/lang/th.php
@@ -338,6 +338,7 @@ $translations = array(
 	'Actions_SubmenuPages' => 'หน้า',
 	'Actions_SubmenuPagesEntry' => 'รายการเพจ',
 	'Actions_SubmenuPagesExit' => 'ออกจากหน้าเพจ',
+	'Actions_WidgetPagesExit' => 'ออกจากเพจ',
 	'Actions_EntryPageTitles' => 'ชื่อหน้ารายการ',
 	'Actions_ExitPageTitles' => 'ชื่อเว็บเพจที่ไปต่อ',
 	'Actions_SubmenuPageTitles' => 'ชื่อเพจ',
diff --git a/lang/zh-cn.php b/lang/zh-cn.php
index 6949eda5e3..979ab1ec19 100644
--- a/lang/zh-cn.php
+++ b/lang/zh-cn.php
@@ -1,7 +1,7 @@
 <?php
 $translations = array(
 	'General_Locale' => 'zh_CN.UTF-8',
-	'General_TranslatorName' => '<a href="http://www.piwik.cn/">Jack Huang</a>, Marine.Ming',
+	'General_TranslatorName' => '<a href="http://www.piwik.cn/">Jack Huang</a>, <a href="http://www.binaryoung.com/">Young</a>, Marine.Ming',
 	'General_TranslatorEmail' => 'admin@piwik.cn',
 	'General_EnglishLanguageName' => 'Simplified Chinese',
 	'General_OriginalLanguageName' => '简体中文',
@@ -14,7 +14,7 @@ $translations = array(
 	'General_AllWebsitesDashboard' => '所有网站报表',
 	'General_SingleWebsitesDashboard' => '单个网站报表',
 	'General_API' => 'API',
-	'General_Widgets' => '微件',
+	'General_Widgets' => '小工具',
 	'General_Settings' => '管理设置',
 	'General_GiveUsYourFeedback' => '意见反馈！',
 	'General_Unknown' => '未知',
@@ -85,6 +85,8 @@ $translations = array(
 	'General_NumberOfVisits' => '访问次数',
 	'General_VisitConvertedGoal' => '至少转化一个目标的访问次数',
 	'General_VisitConvertedGoalId' => '转化特定目标的访问次数',
+	'General_EcommerceVisitStatusDesc' => '访问结束时的电子商务状态',
+	'General_EcommerceVisitStatusEg' => '例如，要选择所有下订单的访问，API 请求要包含 %s',
 	'General_VisitConvertedNGoals' => '访问转化 %s 个目标',
 	'General_NewVisitor' => '新访客',
 	'General_NewVisits' => '新访问',
@@ -195,8 +197,8 @@ $translations = array(
 	'General_YouMustBeLoggedIn' => '您必须登录才能存取这个功能。',
 	'General_Website' => '网站',
 	'General_GeneralSettings' => '一般设置',
-	'General_AllowPiwikArchivingToTriggerBrowser' => '在浏览器中显示报表时，允许 Piwik 触发存档',
-	'General_ArchivingInlineHelp' => '对于中高流量的网站，建议停用Piwik浏览器触发存档。最好是设置定时任务(Cron job)，每小时处理一次Piwik报表。',
+	'General_AllowPiwikArchivingToTriggerBrowser' => '在浏览器中显示报表时，允许 Piwik 触发处理',
+	'General_ArchivingInlineHelp' => '对于中高流量的网站，建议禁用Piwik浏览器触发处理。最好是设置定时任务(Cron job)，每小时处理一次Piwik报表。',
 	'General_ArchivingTriggerDescription' => '适合大型的Piwik安装，需要%s设置定时任务(Cron job) %s来自动处理报表。',
 	'General_SeeTheOfficialDocumentationForMoreInformation' => '查看%s官方文件%s取得更多资讯',
 	'General_ReportsContainingTodayWillBeProcessedAtMostEvery' => '今天的报表(或包括今天的其它时间段)处理时间',
@@ -220,9 +222,9 @@ $translations = array(
 	'General_AboutPiwikX' => '关于 Piwik %s',
 	'General_PiwikXIsAvailablePleaseUpdateNow' => 'Piwik %1$s 已经发布。 %2$s 请立即更新！%3$s (查看 %4$s 与%5$s 的差异)。',
 	'General_PiwikXIsAvailablePleaseNotifyPiwikAdmin' => '%s 已经发布。请通知网站管理员。',
-	'General_NewReportsWillBeProcessedByCron' => '当 Piwik 存档无法由浏览器触发时，新的报表将通过 crontab 处理。',
+	'General_NewReportsWillBeProcessedByCron' => '当 Piwik 不是通过浏览器触发处理时，新的报表将通过 crontab 处理。',
 	'General_ReportsWillBeProcessedAtMostEveryHour' => '因此，报表最多每隔一小时处理一次。',
-	'General_IfArchivingIsFastYouCanSetupCronRunMoreOften' => '如果在您的设置下存档相当顺畅，您可以设置并让它的更频繁执行。',
+	'General_IfArchivingIsFastYouCanSetupCronRunMoreOften' => '如果在当前配置下处理速度很快，您可以设置让自动脚本更频繁执行。',
 	'General_BackToPiwik' => '返回 Piwik',
 	'General_ClickHere' => '点击查看更多信息',
 	'General_ShortMonth_1' => '1月',
@@ -292,7 +294,7 @@ $translations = array(
 	'General_ExceptionPrivilege' => '您无法存取这个资源，必须要一个 %s 权限。',
 	'General_ExceptionPrivilegeAtLeastOneWebsite' => '您无法存取这个资源，必须至少要一个网站的 %s 权限。',
 	'General_ExceptionPrivilegeAccessWebsite' => '您无法存取这个资源，必须拥有网站 ID = %d 的 %s 权限。',
-	'General_ExceptionInvalidArchiveTimeToLive' => '今日整理时间必须是一个大于 0 秒的数字',
+	'General_ExceptionInvalidArchiveTimeToLive' => '今日处理时间必须是一个大于 0 的秒数',
 	'General_ExceptionConfigurationFileNotFound' => '配置文件 {%s} 找不到。',
 	'General_ExceptionUnreadableFileDisabledMethod' => '配置文件 {%s} 无法读取。您的主机空间可能禁用 %s。',
 	'General_ExceptionInvalidToken' => '符号不正确。',
@@ -519,6 +521,7 @@ $translations = array(
 	'CoreAdminHome_DevelopmentProcess' => '虽然%s开发进程%s中已有成千上万次的自动测试，Beta版本测试员仍然是实现 Piwik "无错理念"的关键角色。',
 	'CoreAdminHome_StableReleases' => '如果 Piwik 对您的业务很重要，我们建议您使用最新的稳定版。如果使用最新测试版并发现问题或有建议，请 %s看这里%s。',
 	'CoreAdminHome_YouAreCurrentlyUsingPHP' => '你当前正在使用PHP %1$s。',
+	'CoreAdminHome_OldPHPVersionWarning_Part1' => 'Piwik 在不断改进中，为了能给您提供最先进的网站分析平台，我们很快会将 PHP 版本的最低要求增加到 PHP 5.3。%1$s请咨询您的服务器管理员或者主机商，更新 PHP 到最新版本，最好是 PHP 5.4.%2$s',
 	'CoreAdminHome_OldPHPVersionWarning_Part2' => '当你升级到PHP 5.3或者更高的php版本，这个提示信息就会自动消失，并且Piwik服务器会使用更少的内存来处理报表数据。%1$s升级PHP并且获取大部分Piwik！%2$s',
 	'CoreHome_InjectedHostWarningIntro' => '您现在是通过 %1$s 访问 Piwik，但 Piwik 设置的地址是: %2$s.',
 	'CoreHome_InjectedHostSuperUserWarning' => '可能 Piwik 配置有误 (例如，Piwik 刚移到新的服务器)。您可以 %1$s点这里添加 %2$s 为 Piwik 主机名 (如果您信任)%3$s, 或者 %4$s点这里转到 %5$s 安全访问 Piwik %6$s。',
@@ -570,7 +573,7 @@ $translations = array(
 	'PrivacyManager_DeleteReportsInfo' => '启用后，旧的报表将被删除。%s建议仅在数据库空间有限的情况下启用。%s',
 	'PrivacyManager_DeleteReportsInfo2' => '如果还没有启用 "%s", 访问旧的报表时将会自动重建。',
 	'PrivacyManager_DeleteReportsInfo3' => '如果已启用 "%s", 数据将被彻底删除。',
-	'PrivacyManager_DeleteReportsDetailedInfo' => 'dabase 数字存档表 (%s) 和 blob 存档表 (%s) 的数据将被删除。',
+	'PrivacyManager_DeleteReportsDetailedInfo' => '数据库 numeric 存档表 (%s) 和 blob 存档表 (%s) 的数据将被删除。',
 	'PrivacyManager_DeleteSchedulingSettings' => '定时设置',
 	'PrivacyManager_ReportsDataSavedEstimate' => '数据库大小',
 	'PrivacyManager_KeepBasicMetrics' => '保留基本的指标 (访客数, 访问次数, 跳出率, 目标转化, 订单转化等。)',
@@ -762,24 +765,24 @@ $translations = array(
 	'CustomVariables_ScopePage' => '访问页面',
 	'CustomVariables_TrackingHelp' => '帮助: %1$s在 Piwik 中跟踪自定义变量%2$s',
 	'CustomVariables_CustomVariablesReportDocumentation' => '本报表包含您的自定义变量的资料，点击变量名查看数据。%s 关于自定义变量的详情，请阅读 %spiwik.org 上的自定义变量文档%s',
-	'Dashboard_PluginDescription' => '您的网站分析面板。您可以定制报表面板: 增加新的微件、修改微件排序。每位用户都可以使用他们自定义的报表面板。',
+	'Dashboard_PluginDescription' => '您的网站分析面板。您可以定制报表面板: 增加新的小工具、修改小工具排序。每位用户都可以使用他们自定义的报表面板。',
 	'Dashboard_Dashboard' => '报表面板',
-	'Dashboard_AddAWidget' => '增加一个微件',
-	'Dashboard_DeleteWidgetConfirm' => '您确定要从报表面板中删除此这个微件吗？',
-	'Dashboard_SelectWidget' => '请选择要加入面板的微件',
-	'Dashboard_AddPreviewedWidget_js' => '添加微件到报表面板',
-	'Dashboard_WidgetPreview_js' => '微件预览',
+	'Dashboard_AddAWidget' => '增加一个小工具',
+	'Dashboard_DeleteWidgetConfirm' => '您确定要从报表面板中删除此这个小工具吗？',
+	'Dashboard_SelectWidget' => '请选择要加入面板的小工具',
+	'Dashboard_AddPreviewedWidget_js' => '添加小工具到报表面板',
+	'Dashboard_WidgetPreview_js' => '小工具预览',
 	'Dashboard_Close_js' => '关闭',
 	'Dashboard_Refresh_js' => '刷新',
 	'Dashboard_Maximise_js' => '最大化',
 	'Dashboard_Minimise_js' => '最小化',
-	'Dashboard_TitleWidgetInDashboard_js' => '面板中已有此微件',
+	'Dashboard_TitleWidgetInDashboard_js' => '面板中已有此小工具',
 	'Dashboard_TitleClickToAdd_js' => '添加到面板',
-	'Dashboard_LoadingWidget_js' => '微件加载中，请稍候 ...',
-	'Dashboard_WidgetNotFound_js' => '找不到微件',
+	'Dashboard_LoadingWidget_js' => '小工具加载中，请稍候 ...',
+	'Dashboard_WidgetNotFound_js' => '找不到小工具',
 	'Dashboard_ResetDashboard' => '重置面板',
-	'Dashboard_ResetDashboardConfirm' => '确认重置面板布局并且使用默认的微件？',
-	'Dashboard_WidgetsAndDashboard' => '微件和面板',
+	'Dashboard_ResetDashboardConfirm' => '确认重置面板布局并且使用默认的小工具？',
+	'Dashboard_WidgetsAndDashboard' => '小工具和面板',
 	'Dashboard_ChangeDashboardLayout' => '修改面板布局',
 	'Dashboard_SelectDashboardLayout' => '请选择新报表布局',
 	'Dashboard_DashboardOf' => '%s报表',
@@ -787,17 +790,17 @@ $translations = array(
 	'Dashboard_CreateNewDashboard' => '创建新的面板',
 	'Dashboard_RenameDashboard' => '重命名面板',
 	'Dashboard_DashboardName' => '面板名称:',
-	'Dashboard_EmptyDashboard' => '空白面板 - 请选择您要的微件',
-	'Dashboard_DefaultDashboard' => '默认面板 - 使用默认的微件和布局',
+	'Dashboard_EmptyDashboard' => '空白面板 - 请选择您要的小工具',
+	'Dashboard_DefaultDashboard' => '默认面板 - 使用默认的小工具和布局',
 	'Dashboard_RemoveDashboard' => '删除面板',
 	'Dashboard_CopyDashboardToUser' => '复制面板给用户',
 	'Dashboard_DashboardCopied_js' => '当前面板成功复制到所选用户。',
-	'Dashboard_SetAsDefaultWidgets' => '设置为默认微件',
-	'Dashboard_SetAsDefaultWidgetsConfirm' => '您确定要设置当前的微件和面板为默认的模板吗?',
-	'Dashboard_SetAsDefaultWidgetsConfirmHelp' => '用户创建新面板时，或者使用 "%s" 功能时，将使用这些微件和面板布局。',
+	'Dashboard_SetAsDefaultWidgets' => '设置为默认小工具',
+	'Dashboard_SetAsDefaultWidgetsConfirm' => '您确定要设置当前的小工具和面板为默认的模板吗?',
+	'Dashboard_SetAsDefaultWidgetsConfirmHelp' => '用户创建新面板时，或者使用 "%s" 功能时，将使用这些小工具和面板布局。',
 	'Dashboard_RemoveDashboardConfirm' => '确认要删除面板"%s"吗?',
 	'Dashboard_NotUndo' => '此操作不可撤消。',
-	'Dashboard_DashboardEmptyNotification' => '您的面板没有任何微件，请增加一些微件或重置为默认的微件选择。',
+	'Dashboard_DashboardEmptyNotification' => '您的面板没有任何小工具，请增加一些小工具或重置为默认的小工具选择。',
 	'Dashboard_TopLinkTooltip' => '查看%s的统计报表',
 	'DBStats_PluginDescription' => '这个插件能报告 Piwik 的数据表使用情况。',
 	'DBStats_DatabaseUsage' => '数据库使用状况',
@@ -848,7 +851,7 @@ $translations = array(
 	'Feedback_ExceptionNoUrls' => '信息不能包含网址，由此避免垃圾邮件。',
 	'Feedback_TopLinkTooltip' => '告诉我们您的想法，或者寻求专业技术支持。',
 	'Feedback_WantToThankConsiderDonating' => '您觉得 Piwik 很棒并要感谢我们吗? 请考虑捐助',
-	'Goals_Goals' => '目标',
+	'Goals_Goals' => '目标分析',
 	'Goals_EcommerceAndGoalsMenu' => '电子商务目标',
 	'Goals_Ecommerce' => '电子商务',
 	'Goals_EcommerceOverview' => '总表',
@@ -964,7 +967,7 @@ $translations = array(
 	'Installation_PleaseFixTheFollowingErrors' => '请修复以下错误',
 	'Installation_LargePiwikInstances' => 'Piwik 给予大型网站的协助',
 	'Installation_JsTag' => 'Javascript 跟踪代码',
-	'Installation_JsTagArchivingHelp1' => '对中高流量的网站，应该采取一些优化手段加速 Piwik (例如 %1$s设定自动存档%2$s)。',
+	'Installation_JsTagArchivingHelp1' => '对中高流量的网站，应该采取一些优化手段加速 Piwik (例如 %1$s设定自动处理%2$s)。',
 	'Installation_Congratulations' => '恭喜您',
 	'Installation_CongratulationsHelp' => '<p>恭喜您！ 您的 Piwik 安装已经完成！</p><p>请确认您的 Javascript 跟踪代码已插入至您的页面之中，并等候您的首位访客！</p>',
 	'Installation_ContinueToPiwik' => '继续',
@@ -1008,14 +1011,14 @@ $translations = array(
 	'Installation_SystemCheckWriteDirs' => '具写入权限的目录',
 	'Installation_SystemCheckWriteDirsHelp' => '要在您的 Linux 系统修正这个错误，尝试输入以下的命令',
 	'Installation_SystemCheckMemoryLimit' => '内存限制',
-	'Installation_SystemCheckMemoryLimitHelp' => '在一个高流量的网站，数据归档过程可能使用更多的内存，超出当前环境允许值！如果需要，请修改 php.ini文件中的 memory_limit 值！',
+	'Installation_SystemCheckMemoryLimitHelp' => '在一个高流量的网站，数据处理过程中使用的内存可能超出当前系统的允许值！如果需要，请修改 php.ini文件中的 memory_limit 值！',
 	'Installation_SystemCheckOpenURL' => '开启网址',
 	'Installation_SystemCheckOpenURLHelp' => '新闻订阅、更新通知及一键更新功能需要 "curl" 函数，allow_url_fopen=On, 或启用 fsockopen()。',
 	'Installation_SystemCheckGD' => 'GD > 2.x (图形库)',
-	'Installation_SystemCheckGDHelp' => 'Sparklines (小图) 将无法显示！',
+	'Installation_SystemCheckGDHelp' => '波形图 (小图) 将无法显示！',
 	'Installation_SystemCheckFunctions' => '必需的函数',
 	'Installation_SystemCheckOtherFunctions' => '其它函数',
-	'Installation_SystemCheckTimeLimitHelp' => '在一个高流量的网站，执行数据归档过程可能需要更多的时间，可能会超过目前环境所允许的时间！如果有必要，请修改 php.ini 文件中的 max_execution_time 值！',
+	'Installation_SystemCheckTimeLimitHelp' => '在一个高流量的网站，数据处理需要的时间可能会超过目前系统所允许的时间！如有必要，请修改 php.ini 文件中的 max_execution_time 值！',
 	'Installation_SystemCheckMailHelp' => '意见反馈及忘记密码信息若沒有 mail() 将无法寄送。',
 	'Installation_SystemCheckParseIniFileHelp' => '这个内置函数在您的主机上已停用。Piwik 将会尝试模拟这个功能，但可能会遇到其它的安全限制，也会影响跟踪性能。',
 	'Installation_SystemCheckGlobHelp' => '这个内置函数在您的主机上已停用。Piwik 会尝试模拟这个功能，但可能会遇到其它的安全限制，功能可能受到影响。',
@@ -1059,7 +1062,7 @@ $translations = array(
 	'Installation_SystemCheckSummaryNoProblems' => '太好了! 您的 Piwik 没有问题，放心使用吧。',
 	'Installation_SeeBelowForMoreInfo' => '更详细的信息请看下面',
 	'Installation_DatabaseAbilities' => '数据库能力',
-	'Installation_LoadDataInfileUnavailableHelp' => '使用 %1$s 会大大加速 Piwik 的存档速度。要让 Piwik 能用它，请更新 PHP 和 MySQL 软件，并且确认数据库用户有 %2$s 权限。',
+	'Installation_LoadDataInfileUnavailableHelp' => '使用 %1$s 会大大加速 Piwik 的处理速度。要让 Piwik 能用它，请更新 PHP 和 MySQL，并确认数据库用户有 %2$s 权限。',
 	'Installation_LoadDataInfileRecommended' => '如果您的 Piwik 服务器跟踪大流量的网站 (例如每月超过 100000 页), 建议修复这个问题。',
 	'Installation_Filesystem' => '文件系统',
 	'Installation_NfsFilesystemWarning' => '您的服务器使用NFS文件系统。',
@@ -1075,7 +1078,7 @@ $translations = array(
 	'Live_Action' => '个活动',
 	'Live_VisitorsInRealTime' => '实时访客',
 	'Live_VisitorLog' => '访客日志',
-	'Live_VisitorLogDocumentation' => '本表显示所选时间段内最新的访客资料，鼠标移到日期上可以查看上次访问时间，%s 如果时间段包含今天，您可以实时查看访客! %s 这里显示的数据总是实时的，无论是否使用定时任务存档。',
+	'Live_VisitorLogDocumentation' => '本表显示所选时间段内最新的访客资料，鼠标移到日期上可以查看上次访问时间，%s 如果时间段包含今天，您可以实时查看访客! %s 这里显示的数据总是实时的，无论是否使用定时处理任务。',
 	'Live_Time' => '时间',
 	'Live_Referrer_URL' => '来源网址',
 	'Live_LastMinutes' => '最后%s分钟',
@@ -1962,7 +1965,7 @@ $translations = array(
 	'VisitTime_DayOfWeek' => '星期几的',
 	'VisitTime_WidgetByDayOfWeekDocumentation' => '本图形显示一周内网站每天的访问次数。',
 	'Widgetize_PluginDescription' => '这个插件让您轻松导出任何 Piwik 模块到博客、网站或 iGoogle 及 Netvibes!',
-	'Widgetize_TopLinkTooltip' => '微件形式导出 Piwik 报表，将面板以 iframe 形式嵌入您的应用程序中。',
+	'Widgetize_TopLinkTooltip' => '小工具形式导出 Piwik 报表，将面板以 iframe 形式嵌入您的应用程序中。',
 	'PDFReports_PluginDescriptionReports' => '生成和下载您的自定义报表，可以选择日发送，周发送或者月发送。',
 	'PDFReports_ManageEmailReports' => '管理报表邮件',
 	'PDFReports_EmailReports' => '报表邮件',