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

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authormattpiwik <matthieu.aubry@gmail.com>2010-07-21 12:00:17 +0400
committermattpiwik <matthieu.aubry@gmail.com>2010-07-21 12:00:17 +0400
commit9ae233a5ddbd707606224edafe0c48298afe8623 (patch)
treefbcf7926cc1ac1c0b53677b27100774e3cad9b07 /lang
parentd2f47cf3b52cec8743992e3ace5fcee48691b49f (diff)
Fixes #1481
Admin UI pages were requiring period,date throwing an exception when not set properly as was the case after plugin disable. Made these screens not set date/period as calendar is never shown. Refs #1490 * Fixing loading... message for feedback form * Fixing style of inline help and yellow boxes in admin screens * Adding API to plugins not to display/disable git-svn-id: http://dev.piwik.org/svn/trunk@2604 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'lang')
-rw-r--r--lang/am.php2
-rw-r--r--lang/be.php2
-rw-r--r--lang/bg.php2
-rw-r--r--lang/ca.php2
-rw-r--r--lang/cs.php2
-rw-r--r--lang/da.php2
-rw-r--r--lang/de.php2
-rw-r--r--lang/el.php2
-rw-r--r--lang/en.php3
-rw-r--r--lang/es.php2
-rw-r--r--lang/eu.php2
-rw-r--r--lang/fi.php2
-rw-r--r--lang/fr.php2
-rw-r--r--lang/hu.php2
-rw-r--r--lang/it.php2
-rw-r--r--lang/ko.php2
-rw-r--r--lang/lt.php2
-rw-r--r--lang/nb.php2
-rw-r--r--lang/nl.php2
-rw-r--r--lang/pl.php2
-rw-r--r--lang/pt-br.php2
-rw-r--r--lang/ru.php2
-rw-r--r--lang/sk.php2
-rw-r--r--lang/sq.php2
-rw-r--r--lang/sr.php2
-rw-r--r--lang/sv.php2
-rw-r--r--lang/th.php2
-rw-r--r--lang/zh-cn.php2
-rw-r--r--lang/zh-tw.php2
29 files changed, 29 insertions, 30 deletions
diff --git a/lang/am.php b/lang/am.php
index f5496b3474..2eb2a9e660 100644
--- a/lang/am.php
+++ b/lang/am.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'ውጣ',
'General_Done' => 'አልቋል',
'General_LoadingData' => 'ውሂብ በማስገባት ላይ...',
- 'General_Loading' => 'በማስገባት ላይ...',
+ 'General_Loading_js' => 'በማስገባት ላይ...',
'General_ErrorRequest' => 'Oops&hellip; problem during the request, please try again.',
'General_Next' => 'ቀጥል',
'General_Previous' => 'ቀደም ያለ',
diff --git a/lang/be.php b/lang/be.php
index 84618b5c43..480090d8f9 100644
--- a/lang/be.php
+++ b/lang/be.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Выйсці',
'General_Done' => 'Завершана',
'General_LoadingData' => 'Загрузка дадзеных...',
- 'General_Loading' => 'Загрузка...',
+ 'General_Loading_js' => 'Загрузка...',
'General_ErrorRequest' => 'Oops&hellip; праблема выканання запыту, калі ласка, паспрабуйце зноў.',
'General_Next' => 'Далей',
'General_Previous' => 'Папярэдняе',
diff --git a/lang/bg.php b/lang/bg.php
index 9582db3f0a..b410785cbb 100644
--- a/lang/bg.php
+++ b/lang/bg.php
@@ -30,7 +30,7 @@ Virosss@abv.bg, www.coffebreak.info',
'General_Logout' => 'Излез',
'General_Done' => 'Готово',
'General_LoadingData' => 'Зарежда данни...',
- 'General_Loading' => 'Зарежда...',
+ 'General_Loading_js' => 'Зарежда...',
'General_ErrorRequest' => 'Ооопс&hellip; възникна грешка! Опитайте отново.',
'General_Next' => 'Напред',
'General_Previous' => 'Назад',
diff --git a/lang/ca.php b/lang/ca.php
index 731dc30218..8e1809ad61 100644
--- a/lang/ca.php
+++ b/lang/ca.php
@@ -56,7 +56,7 @@ $translations = array(
'General_DisplayMoreData' => 'Mostra més dades',
'General_PiwikXIsAvailablePleaseUpdateNow' => 'Hi ha una nova versió del Piwik, %s, disponible! %s Si us plau, actualitzeu ara!%s (%s Mostra els canvis%s)',
'General_BackToPiwik' => 'Torna al Piwik',
- 'General_Loading' => 'Carregant&hellip;',
+ 'General_Loading_js' => 'Carregant&hellip;',
'General_ExportAsImage' => 'Exporta com una imatge',
'General_SaveImageOnYourComputer' => 'Per a desar la imatge al vostre ordinador, piqueu-hi amb el botó dret del ratolí i seleccioneu "Anomena i desa la imatge..."',
'General_ColumnNbActions' => 'Accions',
diff --git a/lang/cs.php b/lang/cs.php
index fb889e72d6..da1e36accf 100644
--- a/lang/cs.php
+++ b/lang/cs.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Odhlásit se',
'General_Done' => 'Hotovo',
'General_LoadingData' => 'Načítám data...',
- 'General_Loading' => 'Načítám...',
+ 'General_Loading_js' => 'Načítám...',
'General_ErrorRequest' => 'Oops&hellip; behěm požadavku se vyskytla chyba, prosím vyzkoušejte jej znovu',
'General_Next' => 'Další',
'General_Previous' => 'Předchozí',
diff --git a/lang/da.php b/lang/da.php
index 3b14e25e20..93f9d7f0fc 100644
--- a/lang/da.php
+++ b/lang/da.php
@@ -33,7 +33,7 @@ $translations = array(
'General_Details' => 'Detaljer',
'General_Default' => 'Standard',
'General_LoadingData' => 'Indlæser data...',
- 'General_Loading' => 'Indlæser...',
+ 'General_Loading_js' => 'Indlæser...',
'General_YourChangesHaveBeenSaved' => 'Ændringer er gemt.',
'General_ErrorRequest' => 'Ups... problemer, prøv igen.',
'General_Next' => 'Næste',
diff --git a/lang/de.php b/lang/de.php
index f72e2a8d29..9e283d3894 100644
--- a/lang/de.php
+++ b/lang/de.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Abmelden',
'General_Done' => 'Erledigt',
'General_LoadingData' => 'Lade Daten...',
- 'General_Loading' => 'Laden...',
+ 'General_Loading_js' => 'Laden...',
'General_ErrorRequest' => 'Einen Moment bitte. Wir laden die erforderlichen Daten. Bitte neu laden, falls längere Zeit keine Aktion ausgeführt wird.',
'General_Next' => 'nächste',
'General_Previous' => 'vorherige',
diff --git a/lang/el.php b/lang/el.php
index 70705cbda6..40016f0789 100644
--- a/lang/el.php
+++ b/lang/el.php
@@ -33,7 +33,7 @@ $translations = array(
'General_Details' => 'Λεπτομέρειες',
'General_Default' => 'Προεπιλογή',
'General_LoadingData' => 'Φόρτωση δεδομένων...',
- 'General_Loading' => 'Φόρτωση...',
+ 'General_Loading_js' => 'Φόρτωση...',
'General_YourChangesHaveBeenSaved' => 'Οι αλλαγές σας αποθηκεύτηκαν.',
'General_ErrorRequest' => 'Ούπς&hellip;, πιθανό πρόβλημα με τη σύνδεση. Ξαναπροσπαθήστε.',
'General_Next' => 'Επόμενο',
diff --git a/lang/en.php b/lang/en.php
index a166d54f3f..9edde535da 100644
--- a/lang/en.php
+++ b/lang/en.php
@@ -44,7 +44,7 @@ $translations = array(
'General_CurrentYear' => 'Current Year',
'General_DateRange' => 'Date range:',
'General_LoadingData' => 'Loading data...',
- 'General_Loading' => 'Loading...',
+ 'General_Loading_js' => 'Loading...',
'General_GoTo' => 'Go to %s',
'General_Next' => 'Next',
'General_Previous' => 'Previous',
@@ -224,7 +224,6 @@ $translations = array(
'CoreHome_IncludeAllPopulation_js' => 'Include all population',
'CoreHome_ExcludeLowPopulation_js' => 'Exclude low population',
'CoreHome_PageOf_js' => '%1$s of %2$s',
- 'CoreHome_Loading_js' => 'Loading...',
'CoreHome_DayFormat' => '%longDay% %day% %longMonth% %longYear%',
'CoreHome_PeriodDay' => 'Day',
'CoreHome_PeriodWeek' => 'Week',
diff --git a/lang/es.php b/lang/es.php
index 899ef85b2b..eb1ecf8012 100644
--- a/lang/es.php
+++ b/lang/es.php
@@ -31,7 +31,7 @@ ddiods@hotmail.com',
'General_Logout' => 'Desconectarse',
'General_Done' => '¡Hecho',
'General_LoadingData' => 'Cargando datos...',
- 'General_Loading' => 'Cargando...',
+ 'General_Loading_js' => 'Cargando...',
'General_ErrorRequest' => 'Oops&hellip; problema durante la petición, por favor inténtelo de nuevo.',
'General_Next' => 'Siguiente',
'General_Previous' => 'Anterior',
diff --git a/lang/eu.php b/lang/eu.php
index 55c71e3aa5..9aa52c0d72 100644
--- a/lang/eu.php
+++ b/lang/eu.php
@@ -27,7 +27,7 @@ $translations = array(
'General_Logout' => 'Amaitu saioa',
'General_Done' => 'Eginda',
'General_LoadingData' => 'Datuak kargatzen...',
- 'General_Loading' => 'Kargatzen...',
+ 'General_Loading_js' => 'Kargatzen...',
'General_ErrorRequest' => 'Kontxo&hellip; arazoa egon da eskaeran, saiatu berriro mesedez.',
'General_Next' => 'Hurrengoa',
'General_Previous' => 'Aurrekoa',
diff --git a/lang/fi.php b/lang/fi.php
index 3f7a826ff8..2fb46bbaf7 100644
--- a/lang/fi.php
+++ b/lang/fi.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Kirjaudu ulos',
'General_Done' => 'Valmis',
'General_LoadingData' => 'Ladataan tietoja...',
- 'General_Loading' => 'Ladataan...',
+ 'General_Loading_js' => 'Ladataan...',
'General_ErrorRequest' => 'Oops&hellip; virhe pyynnön käsittelyssä, yritä uudelleen.',
'General_Next' => 'Seuraava',
'General_Previous' => 'Edellinen',
diff --git a/lang/fr.php b/lang/fr.php
index 42bc2f0281..661aec9d11 100644
--- a/lang/fr.php
+++ b/lang/fr.php
@@ -33,7 +33,7 @@ $translations = array(
'General_Details' => 'Détails',
'General_Default' => 'Par défaut',
'General_LoadingData' => 'Chargement des données...',
- 'General_Loading' => 'Chargement...',
+ 'General_Loading_js' => 'Chargement...',
'General_YourChangesHaveBeenSaved' => 'Vos modifications ont été enregistrées.',
'General_ErrorRequest' => 'Oups ! Problème rencontré durant la requête, veuillez réessayer.',
'General_Next' => 'Suivant',
diff --git a/lang/hu.php b/lang/hu.php
index 4c331a4123..0fc4ce6a55 100644
--- a/lang/hu.php
+++ b/lang/hu.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Kilépés',
'General_Done' => 'Kész',
'General_LoadingData' => 'Adatok betöltése folyamatban...',
- 'General_Loading' => 'Betöltés...',
+ 'General_Loading_js' => 'Betöltés...',
'General_ErrorRequest' => 'Hoppá-hoppá!; probléma a kérés közben, kérlek próbáld újra.',
'General_Next' => 'Következő',
'General_Previous' => 'Előző',
diff --git a/lang/it.php b/lang/it.php
index c0262588b8..5d0590075e 100644
--- a/lang/it.php
+++ b/lang/it.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Esci',
'General_Done' => 'Fatto',
'General_LoadingData' => 'Sto caricando i dati...',
- 'General_Loading' => 'Caricamento...',
+ 'General_Loading_js' => 'Caricamento...',
'General_ErrorRequest' => 'Oops&hellip; si &egrave verificato un errore durante la richiesta, per favore riprova.',
'General_Next' => 'Successivo',
'General_Previous' => 'Precedente',
diff --git a/lang/ko.php b/lang/ko.php
index 19345561b5..bc18637c6f 100644
--- a/lang/ko.php
+++ b/lang/ko.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => '로그아웃',
'General_Done' => '끝',
'General_LoadingData' => '데이터 로딩중...',
- 'General_Loading' => '로딩중...',
+ 'General_Loading_js' => '로딩중...',
'General_ErrorRequest' => '요청중에 문제가 발생했습니다. 다시 시도해보세요.',
'General_Next' => '다음',
'General_Previous' => '이전',
diff --git a/lang/lt.php b/lang/lt.php
index 95a349e90b..f80e62d834 100644
--- a/lang/lt.php
+++ b/lang/lt.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Atsijungti',
'General_Done' => 'Atlikta',
'General_LoadingData' => 'Įkeliami duomenys...',
- 'General_Loading' => 'Įkeliama...',
+ 'General_Loading_js' => 'Įkeliama...',
'General_ErrorRequest' => 'Oops&hellip; atsirado nesklandumų vykdant užklausą. Prašome pabandyti dar kartą.',
'General_Next' => 'Pirmyn',
'General_Previous' => 'Atgal',
diff --git a/lang/nb.php b/lang/nb.php
index 2ab6830837..1acbf385fe 100644
--- a/lang/nb.php
+++ b/lang/nb.php
@@ -601,7 +601,7 @@ $translations = array(
'VisitsSummary_WidgetLastVisitors' => 'Grafikk over siste unike besøkende',
'VisitsSummary_WidgetOverviewGraph' => 'Oversikt med grafikk',
'VisitsSummary_SubmenuOverview' => 'Oversikt',
- 'General_Loading' => 'Laster ...',
+ 'General_Loading_js' => 'Laster ...',
'General_ExportAsImage' => 'Eksporter som bilde',
'General_SaveImageOnYourComputer' => 'For å lagre bildet på din datamaskin, høyreklikk på bildet og velg "Lagre bilde som ..."',
'General_ColumnNbActions' => 'Handlinger',
diff --git a/lang/nl.php b/lang/nl.php
index c7bbc41738..bf0edfb5a0 100644
--- a/lang/nl.php
+++ b/lang/nl.php
@@ -54,7 +54,7 @@ $translations = array(
'General_DisplayNormalTable' => 'Geef een normale tabel weer',
'General_DisplayMoreData' => 'Geef meer data weer',
'General_YouAreCurrentlyViewingDemoOfPiwik' => 'Je kijkt op dit moment naar een demo van %s; %sdownload%s de volledige versie! Kijk naar %s',
- 'General_Loading' => 'Laden...',
+ 'General_Loading_js' => 'Laden...',
'General_ExportAsImage' => 'Exporteer als afbeelding',
'General_SaveImageOnYourComputer' => 'Om de afbeelding op te slaan op uw computer, klik rechts op de afbeelding en selecteer "Sla afbeelding op als..."',
'General_ColumnNbActions' => 'Acties',
diff --git a/lang/pl.php b/lang/pl.php
index ea478e32d0..279db00a26 100644
--- a/lang/pl.php
+++ b/lang/pl.php
@@ -28,7 +28,7 @@ $translations = array(
'General_Done' => 'Gotowe',
'General_Details' => 'Szczegóły',
'General_LoadingData' => 'Wczytywanie danych...',
- 'General_Loading' => 'Wczytywanie...',
+ 'General_Loading_js' => 'Wczytywanie...',
'General_ErrorRequest' => 'Oops&hellip; problem podczas żądania, spróbuj ponownie.',
'General_Next' => 'Dalej',
'General_Previous' => 'Wstecz',
diff --git a/lang/pt-br.php b/lang/pt-br.php
index 70346c1d96..9335481c3b 100644
--- a/lang/pt-br.php
+++ b/lang/pt-br.php
@@ -44,7 +44,7 @@ $translations = array(
'General_Widgets' => 'Widgets',
'General_Settings' => 'Configurações',
'General_GiveUsYourFeedback' => 'Dê o seu feedback!',
- 'General_Loading' => 'Carregando...',
+ 'General_Loading_js' => 'Carregando...',
'General_Export' => 'Exportar',
'General_ExportAsImage' => 'Exportar como imagem',
'General_SaveImageOnYourComputer' => 'Para salvar a imagem no seu computador, dê um clique com o botão direito na imagem e selecione "Salvar Imagem Como..."',
diff --git a/lang/ru.php b/lang/ru.php
index 2c9feae105..f32581a458 100644
--- a/lang/ru.php
+++ b/lang/ru.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Выйти',
'General_Done' => 'Завершено',
'General_LoadingData' => 'Загрузка данных...',
- 'General_Loading' => 'Загрузка...',
+ 'General_Loading_js' => 'Загрузка...',
'General_ErrorRequest' => 'Oops&hellip; проблема выполнения запроса, пожалуйста, попробуйте снова.',
'General_Next' => 'Далее',
'General_Previous' => 'Предыдущее',
diff --git a/lang/sk.php b/lang/sk.php
index 8b80ee4efb..dfa95cb3fd 100644
--- a/lang/sk.php
+++ b/lang/sk.php
@@ -659,7 +659,7 @@ $translations = array(
'UserCountry_country_sf' => 'Fínsko',
'UserCountry_country_ta' => 'Tristan da Cunha',
'UserCountry_country_tl' => 'Východný Timor',
- 'General_Loading' => 'Načítavanie…',
+ 'General_Loading_js' => 'Načítavanie…',
'General_ExportAsImage' => 'Exportovať ako obrázok',
'General_SaveImageOnYourComputer' => 'Pre uloženie obrázku na vašom počítači kliknite pravým tlačidlom na obrázok a vyberte „Uložiť obrázok ako…“',
'General_ColumnNbActions' => 'Akcie',
diff --git a/lang/sq.php b/lang/sq.php
index 4a37b35c30..086400559c 100644
--- a/lang/sq.php
+++ b/lang/sq.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Dilni',
'General_Done' => 'U bë',
'General_LoadingData' => 'Po ngarkohen të dhënat...',
- 'General_Loading' => 'Po ngarkohet...',
+ 'General_Loading_js' => 'Po ngarkohet...',
'General_ErrorRequest' => 'Oops&hellip; problem gjatë kërkesës, ju lutem riprovoni.',
'General_Next' => 'Pasuesja',
'General_Previous' => 'E mëparshmja',
diff --git a/lang/sr.php b/lang/sr.php
index 98429e8841..4beb416732 100644
--- a/lang/sr.php
+++ b/lang/sr.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Odjava',
'General_Done' => 'Izvršeno',
'General_LoadingData' => 'Prikazivanje podataka...',
- 'General_Loading' => 'Prikazivanje...',
+ 'General_Loading_js' => 'Prikazivanje...',
'General_ErrorRequest' => 'Ups&hellip; problem s zahtevom, pokušajte ponovo',
'General_Next' => 'Sledeće',
'General_Previous' => 'Prethodno',
diff --git a/lang/sv.php b/lang/sv.php
index 185702b7dc..d88ea6ecf2 100644
--- a/lang/sv.php
+++ b/lang/sv.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => 'Logga ut',
'General_Done' => 'Klar',
'General_LoadingData' => 'Laddar data...',
- 'General_Loading' => 'Laddar...',
+ 'General_Loading_js' => 'Laddar...',
'General_ErrorRequest' => 'Oops&hellip; ett problem p&aring;tr&auml;ffades under f&ouml;rfr&aring;gningen, var v&auml;nlig f&ouml;rs&ouml;k igen.',
'General_Next' => 'N&auml;sta',
'General_Previous' => 'F&ouml;reg&aring;ende',
diff --git a/lang/th.php b/lang/th.php
index bc31fc3088..63f1262fd8 100644
--- a/lang/th.php
+++ b/lang/th.php
@@ -56,7 +56,7 @@ $translations = array(
'General_YouAreCurrentlyViewingDemoOfPiwik' => 'คุณกำลังดูตัวอย่างของ %s; %sดาวโหลด%s เวอร์ชั่นเต็ม! หรือไม่ %s',
'General_PiwikXIsAvailablePleaseUpdateNow' => 'Piwik %s ออกแล้ว %s กรุณาอัพเดทเดี๋ยวนี้ %s (ดู %s การเปลี่ยนแปลง %s)',
'General_BackToPiwik' => 'กลับไปยัง Piwik',
- 'General_Loading' => 'กำลังโหลด...',
+ 'General_Loading_js' => 'กำลังโหลด...',
'General_ExportAsImage' => 'ส่งออกเป็นภาพ',
'General_SaveImageOnYourComputer' => 'เพื่อบันทึกภาพลงบนคอมพิวเตอร์ของคุณ คลิกขวาที่ภาพแล้วเลือก " Save Image As..."',
'General_ColumnNbActions' => 'การดำเนินการ',
diff --git a/lang/zh-cn.php b/lang/zh-cn.php
index 81e299f95f..ac598c8dc9 100644
--- a/lang/zh-cn.php
+++ b/lang/zh-cn.php
@@ -616,7 +616,7 @@ $translations = array(
'TranslationsAdmin_Import' => '汇入语系',
'General_Details' => '详情',
'General_Default' => '默认',
- 'General_Loading' => '载入中...',
+ 'General_Loading_js' => '载入中...',
'General_Today' => '今日',
'General_Yesterday' => '昨天',
'General_ShortMonth_1' => '一月',
diff --git a/lang/zh-tw.php b/lang/zh-tw.php
index 4e469ef64f..ecc198a5fa 100644
--- a/lang/zh-tw.php
+++ b/lang/zh-tw.php
@@ -26,7 +26,7 @@ $translations = array(
'General_Logout' => '登出',
'General_Done' => '完成',
'General_LoadingData' => '載入資料中...',
- 'General_Loading' => '載入中...',
+ 'General_Loading_js' => '載入中...',
'General_ErrorRequest' => '意外狀況!於請求期間發生問題,請再次嘗試!',
'General_Next' => '下一頁',
'General_Previous' => '上一頁',