diff options
48 files changed, 63 insertions, 117 deletions
diff --git a/lang/am.php b/lang/am.php index 7f4e84d92c..d35b26956d 100644 --- a/lang/am.php +++ b/lang/am.php @@ -110,8 +110,6 @@ $translations = array( 'API_LoadedAPIs' => 'ማስጋባት ተሳክቷል %s ኤፒአይዎች', 'CoreHome_CategoryNoData' => 'በዚህ ፈርጅ ምንም ውሂብ የለም. "ሁሉንም ምድብ" ለማጠቃለል ይሞክሩ።', 'CoreHome_ShowJSCode' => 'ለማስገባት የጃቫ ስክሪፕትን ኮድ አሳይ', - 'CoreHome_IncludeAllPopulation_js' => 'ሁሉንም ምድብ ያጠቃሉ', - 'CoreHome_ExcludeLowPopulation_js' => 'አነስተኛ ምድቦችን ይቀንሱ', 'CoreHome_PageOf_js' => '%1$s የ %2$s', 'CoreHome_PeriodDay' => 'ቀን', 'CoreHome_PeriodWeek' => 'ሳምንት', @@ -517,8 +515,8 @@ $translations = array( 'UserCountry_country_qa' => 'Qatar', 'UserCountry_country_re' => 'Reunion Island', 'UserCountry_country_ro' => 'Romania', - 'UserCountry_country_ru' => 'Russia', 'UserCountry_country_rs' => 'Serbia', + 'UserCountry_country_ru' => 'Russia', 'UserCountry_country_rw' => 'Rwanda', 'UserCountry_country_sa' => 'Saudi Arabia', 'UserCountry_country_sb' => 'Solomon Islands', diff --git a/lang/ar.php b/lang/ar.php index 511af9c9e5..a098ed7e46 100644 --- a/lang/ar.php +++ b/lang/ar.php @@ -289,8 +289,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'لا توجد بيانات لهذا التقرير.', 'CoreHome_CategoryNoData' => 'لا توجد بيانات في هذه الفئة. حاول أن "تضمن كافة الكثافات".', 'CoreHome_ShowJSCode' => 'عرض كود JaveScript الذي سيتم إدخاله.', - 'CoreHome_IncludeAllPopulation_js' => 'تضمين كافة الكثافات', - 'CoreHome_ExcludeLowPopulation_js' => 'استثناء الكثافات المنخفضة', 'CoreHome_PageOf_js' => '%1$s من %2$s', 'CoreHome_PeriodDay' => 'يوم', 'CoreHome_PeriodWeek' => 'أسبوع', @@ -998,8 +996,8 @@ $translations = array( 'UserCountry_country_qa' => 'قطر', 'UserCountry_country_re' => 'جزيرة ريونيون', 'UserCountry_country_ro' => 'رومانيا', - 'UserCountry_country_ru' => 'الاتحاد الروسي', 'UserCountry_country_rs' => 'الصرب', + 'UserCountry_country_ru' => 'الاتحاد الروسي', 'UserCountry_country_rw' => 'رواندا', 'UserCountry_country_sa' => 'المملكة العربية السعودية', 'UserCountry_country_sb' => 'جزر سليمان', diff --git a/lang/be.php b/lang/be.php index b28b493299..ef2b79e363 100644 --- a/lang/be.php +++ b/lang/be.php @@ -393,8 +393,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Няма дадзеных для гэтай справаздачы.', 'CoreHome_CategoryNoData' => 'Няма дадзеных у гэтай катэгорыі. Паспрабуйце "Ўключыць усе паказчыкі".', 'CoreHome_ShowJSCode' => 'Паказаць Java-код для ўстаўкі', - 'CoreHome_IncludeAllPopulation_js' => 'Уключыць усе паказчыкі', - 'CoreHome_ExcludeLowPopulation_js' => 'Выключыць нізкія паказчыкі', 'CoreHome_PageOf_js' => '%1$s з %2$s', 'CoreHome_PeriodDay' => 'Дзень', 'CoreHome_PeriodWeek' => 'Тыдзень', diff --git a/lang/bg.php b/lang/bg.php index a950cfb7a4..c239ee04c1 100644 --- a/lang/bg.php +++ b/lang/bg.php @@ -277,8 +277,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Няма данни за този доклад.', 'CoreHome_CategoryNoData' => 'Няма данни в тази категория. Опитайте "Включи всички данни".', 'CoreHome_ShowJSCode' => 'Покажи JavaScript кода за вмъкване в сайта', - 'CoreHome_IncludeAllPopulation_js' => 'Включи всички данни', - 'CoreHome_ExcludeLowPopulation_js' => 'Изключи данните с ниско равнище', 'CoreHome_PageOf_js' => '%1$s от %2$s', 'CoreHome_PeriodDay' => 'Ден', 'CoreHome_PeriodWeek' => 'Седмица', @@ -968,8 +966,8 @@ $translations = array( 'UserCountry_country_qa' => 'Катар', 'UserCountry_country_re' => 'Реюнион', 'UserCountry_country_ro' => 'Румъния', - 'UserCountry_country_ru' => 'Русия', 'UserCountry_country_rs' => 'Сърбия', + 'UserCountry_country_ru' => 'Русия', 'UserCountry_country_rw' => 'Руанда', 'UserCountry_country_sa' => 'Саудитска Арабия', 'UserCountry_country_sb' => 'Соломоновите острови', diff --git a/lang/ca.php b/lang/ca.php index 3ee1ac3b72..ef2b67eb8d 100644 --- a/lang/ca.php +++ b/lang/ca.php @@ -279,8 +279,6 @@ $translations = array( 'API_LoadedAPIs' => 'S\'ha carregat correctament un total de %s API', 'CoreHome_CategoryNoData' => 'No hi ha dades en aquesta categoria. Proveu d\'<em>incloure tota la població</em>.', 'CoreHome_ShowJSCode' => 'Mostra el codi JavaScript necessari', - 'CoreHome_IncludeAllPopulation_js' => 'Inclou tota la població', - 'CoreHome_ExcludeLowPopulation_js' => 'Exclou la població baixa', 'CoreHome_PageOf_js' => '%1$s de %2$s', 'CoreHome_PeriodDay' => 'Dia', 'CoreHome_PeriodWeek' => 'Setmana', diff --git a/lang/cs.php b/lang/cs.php index f0b5f9ef7a..4b507e57ca 100644 --- a/lang/cs.php +++ b/lang/cs.php @@ -267,8 +267,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Pro toto hlášení nejsou k dispozici žádná data', 'CoreHome_CategoryNoData' => 'V této kategorii nejsou k dispozici žádná data. Zkuste "Zobrazit všechny výsledky".', 'CoreHome_ShowJSCode' => 'Zobrazit JavaScriptový kód ke vložení', - 'CoreHome_IncludeAllPopulation_js' => 'Zobrazit všechny výsledky', - 'CoreHome_ExcludeLowPopulation_js' => 'Vynechat nízké výsledky', 'CoreHome_PageOf_js' => '%s z %s', 'CoreHome_PeriodDay' => 'Den', 'CoreHome_PeriodWeek' => 'Týden', @@ -946,8 +944,8 @@ Poznámka: tento klíč expiruje za 24 hodin.', 'UserCountry_country_qa' => 'Qatar', 'UserCountry_country_re' => 'Reunion Island', 'UserCountry_country_ro' => 'Romania', - 'UserCountry_country_ru' => 'Russia', 'UserCountry_country_rs' => 'Serbia', + 'UserCountry_country_ru' => 'Russia', 'UserCountry_country_rw' => 'Rwanda', 'UserCountry_country_sa' => 'Saudi Arabia', 'UserCountry_country_sb' => 'Solomon Islands', diff --git a/lang/da.php b/lang/da.php index c176c70f80..f756779202 100644 --- a/lang/da.php +++ b/lang/da.php @@ -373,8 +373,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Der er ingen data for denne rapport.', 'CoreHome_CategoryNoData' => 'Ingen data i kategorien. Prøv at \'Inkluder hele populationen\'.', 'CoreHome_ShowJSCode' => 'Vis JavaScript-koden til at indsætte.', - 'CoreHome_IncludeAllPopulation_js' => 'Medtag alle data', - 'CoreHome_ExcludeLowPopulation_js' => 'Udeluk data', 'CoreHome_PageOf_js' => '%1$s af %2$s', 'CoreHome_PeriodDay' => 'Dag', 'CoreHome_PeriodWeek' => 'Uge', diff --git a/lang/de.php b/lang/de.php index dfafcfdda6..cf00a05511 100644 --- a/lang/de.php +++ b/lang/de.php @@ -396,8 +396,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Es stehen keine Daten für diesen Bericht zur Verfügung.', 'CoreHome_CategoryNoData' => 'Keine Daten in dieser Kategorie. Probieren Sie "Gesamte Daten einbeziehen"', 'CoreHome_ShowJSCode' => 'Den einzufügenden JavaScript-Code anzeigen', - 'CoreHome_IncludeAllPopulation_js' => 'Gesamte Daten einbeziehen', - 'CoreHome_ExcludeLowPopulation_js' => 'Niedrige Werte ausschließen', 'CoreHome_PageOf_js' => '%1$s von %2$s', 'CoreHome_PeriodDay' => 'Tag', 'CoreHome_PeriodWeek' => 'Woche', diff --git a/lang/el.php b/lang/el.php index a0da39f989..d9ef35edbd 100644 --- a/lang/el.php +++ b/lang/el.php @@ -402,8 +402,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Δεν υπάρχουν δεδομένα για αυτή την αναφορά.', 'CoreHome_CategoryNoData' => 'Ανεπαρκή δεδομένα στη κατηγορία. Δοκιμάστε να συμπεριλάβετε όλο το πλήθος.', 'CoreHome_ShowJSCode' => 'Εμφάνιση του κώδικα της Javascript προς εισαγωγή', - 'CoreHome_IncludeAllPopulation_js' => 'Συμπερίληψη όλου του πλήθους', - 'CoreHome_ExcludeLowPopulation_js' => 'Εξαίρεση χαμηλού πλήθους', 'CoreHome_PageOf_js' => '%1$s από %2$s', 'CoreHome_DateFormat' => '%longDay% %day% %longMonth% %longYear%', 'CoreHome_ShortDateFormat' => '%shortDay% %day% %shortMonth%', diff --git a/lang/en.php b/lang/en.php index abc6a4a202..9e689c6d9c 100644 --- a/lang/en.php +++ b/lang/en.php @@ -436,12 +436,11 @@ $translations = array( 'CoreHome_CategoryNoData' => 'No data in this category. Try to "Include all population".', 'CoreHome_ShowJSCode' => 'Show the JavaScript code to insert', 'CoreHome_ConfigureView' => 'Configure view', - 'CoreHome_IncludeAllPopulation_js' => 'Include all population', - 'CoreHome_ExcludeLowPopulation_js' => 'Exclude low population', 'CoreHome_IncludeRowsWithLowPopulation_js' => 'Rows with low population are hidden %s Show all rows', 'CoreHome_ExcludeRowsWithLowPopulation_js' => 'All rows are shown %s Exclude low population', 'CoreHome_DataTableIncludeAggregateRows_js' => 'Aggregate rows are hidden %s Show them', 'CoreHome_DataTableExcludeAggregateRows_js' => 'Aggregate rows are shown %s Hide them', + 'CoreHome_Default_js' => 'default', 'CoreHome_PageOf_js' => '%1$s of %2$s', 'CoreHome_FlattenDataTable_js' => 'The report is hierarchical %s Make it flat', 'CoreHome_UnFlattenDataTable_js' => 'The report is flat %s Make it hierarchical', diff --git a/lang/es.php b/lang/es.php index f8894d03fc..4be08408e7 100644 --- a/lang/es.php +++ b/lang/es.php @@ -375,8 +375,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'No hay datos para este informe.', 'CoreHome_CategoryNoData' => 'No hay datos en esta categoría. Intenta "Incluir toda la población".', 'CoreHome_ShowJSCode' => 'Mostrar el código JavaScript para insertar', - 'CoreHome_IncludeAllPopulation_js' => 'Incluir toda la población', - 'CoreHome_ExcludeLowPopulation_js' => 'Excluir baja población', 'CoreHome_PageOf_js' => '%1$s de %2$s', 'CoreHome_PeriodDay' => 'Día', 'CoreHome_PeriodWeek' => 'Semana', diff --git a/lang/et.php b/lang/et.php index 62ba459537..245d839e6b 100644 --- a/lang/et.php +++ b/lang/et.php @@ -49,8 +49,6 @@ $translations = array( 'API_LoadedAPIs' => 'Edukalt laetud %s API-id', 'CoreHome_CategoryNoData' => 'Informatsioon puudub selles kategoorias. Proovi "Include all population".', 'CoreHome_ShowJSCode' => 'Näita sisestatavat javaacript koodi', - 'CoreHome_IncludeAllPopulation_js' => 'Include all population', - 'CoreHome_ExcludeLowPopulation_js' => 'Exclude low population', 'CoreHome_PageOf_js' => '%1$s - %2$s', 'CoreHome_PeriodDay' => 'Päev', 'CoreHome_PeriodWeek' => 'Nädal', @@ -422,8 +420,8 @@ $translations = array( 'UserCountry_country_qa' => 'Katar', 'UserCountry_country_re' => 'Reunion Saar', 'UserCountry_country_ro' => 'Romania', - 'UserCountry_country_ru' => 'Vene Föderatsioon', 'UserCountry_country_rs' => 'Venemaa', + 'UserCountry_country_ru' => 'Vene Föderatsioon', 'UserCountry_country_rw' => 'Rwanda', 'UserCountry_country_sa' => 'Saudi-Araabia', 'UserCountry_country_sb' => 'Solomoni Saared', diff --git a/lang/eu.php b/lang/eu.php index 78c88a0993..da4e5439fc 100644 --- a/lang/eu.php +++ b/lang/eu.php @@ -194,8 +194,6 @@ $translations = array( 'CoreHome_JavascriptDisabled' => 'JavaScript-ek gaituta egon behar du Piwik ikuspegi estandarrean erabiltzeko.<br />Badirudi ordea JavaScript desgaituta dagoela edo zure nabigatzaileak ez duela onartzen.<br />Ikuspegi estandarra erabiltzeako, gaitu JavaScript zure nabigatzailearen aukeretan eta ondoren %1$ssaiatu berriro%2$s.<br />', 'CoreHome_CategoryNoData' => 'Daturik ez kategoria honetan. Saiatu "Sartu populazio guztia" aukerarekin.', 'CoreHome_ShowJSCode' => 'Erakutsi txertatu beharreko JavaScript kodea', - 'CoreHome_IncludeAllPopulation_js' => 'Sartu populazio guztia', - 'CoreHome_ExcludeLowPopulation_js' => 'Baztertu populazio txikia', 'CoreHome_PageOf_js' => '%1$s / %2$s', 'CoreHome_PeriodDay' => 'Eguna', 'CoreHome_PeriodWeek' => 'Astea', @@ -740,8 +738,8 @@ Oharra: tokena 24 ordutan iraungiko da.', 'UserCountry_country_qa' => 'Qatar', 'UserCountry_country_re' => 'Reunion', 'UserCountry_country_ro' => 'Errumania', - 'UserCountry_country_ru' => 'Errusia', 'UserCountry_country_rs' => 'Serbia', + 'UserCountry_country_ru' => 'Errusia', 'UserCountry_country_rw' => 'Ruanda', 'UserCountry_country_sa' => 'Saudi Arabia', 'UserCountry_country_sb' => 'Solomon Uharteak', diff --git a/lang/fi.php b/lang/fi.php index 8d74caa477..c50e99f427 100644 --- a/lang/fi.php +++ b/lang/fi.php @@ -304,8 +304,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Tähän raporttiin ei ole tietoja.', 'CoreHome_CategoryNoData' => 'Tässä kategoriassa ei ole tietoja. Kokeile linkkiä "Kaikki esiintymät".', 'CoreHome_ShowJSCode' => 'Näytä lisättävä Javascript-koodi', - 'CoreHome_IncludeAllPopulation_js' => 'Kaikki esiintymät', - 'CoreHome_ExcludeLowPopulation_js' => 'Poista harvat esiintymät', 'CoreHome_PageOf_js' => '%1$s of %2$s', 'CoreHome_PeriodDay' => 'Päivä', 'CoreHome_PeriodWeek' => 'Viikko', @@ -982,8 +980,8 @@ $translations = array( 'UserCountry_country_qa' => 'Qatar', 'UserCountry_country_re' => 'Reunion Island', 'UserCountry_country_ro' => 'Romania', - 'UserCountry_country_ru' => 'Venäjä', 'UserCountry_country_rs' => 'Serbia', + 'UserCountry_country_ru' => 'Venäjä', 'UserCountry_country_rw' => 'Ruanda', 'UserCountry_country_sa' => 'Saudiarabia', 'UserCountry_country_sb' => 'Solomon Islands', diff --git a/lang/fr.php b/lang/fr.php index 716c842401..70b166d0b5 100644 --- a/lang/fr.php +++ b/lang/fr.php @@ -398,8 +398,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Il n\'y a pas de donnée pour ce rapport.', 'CoreHome_CategoryNoData' => 'Aucune donnée pour cette catégorie. Essayez "d\'inclure toute la population".', 'CoreHome_ShowJSCode' => 'Afficher le code JavaScript à insérer', - 'CoreHome_IncludeAllPopulation_js' => 'Inclure toute la population', - 'CoreHome_ExcludeLowPopulation_js' => 'Exclure les populations mineures', 'CoreHome_PageOf_js' => '%1$s de %2$s', 'CoreHome_DateFormat' => '%longDay% %day% %longMonth% %longYear%', 'CoreHome_ShortDateFormat' => '%shortDay% %day% %shortMonth%', diff --git a/lang/gl.php b/lang/gl.php index 2409beee3a..1a285b0275 100644 --- a/lang/gl.php +++ b/lang/gl.php @@ -167,8 +167,6 @@ $translations = array( 'API_LoadedAPIs' => '%s APIs foro cargadas con éxito', 'CoreHome_CategoryNoData' => 'Non hai datos nesta categoría. Intente "Incluir todos os datos".', 'CoreHome_ShowJSCode' => 'Ver o código javascript para insertar', - 'CoreHome_IncludeAllPopulation_js' => 'Incluir todos os datos', - 'CoreHome_ExcludeLowPopulation_js' => 'Excluir os datos menos relevantes', 'CoreHome_PageOf_js' => '%1$s de %2$s', 'CoreHome_PeriodDay' => 'Día', 'CoreHome_PeriodWeek' => 'Semana', diff --git a/lang/he.php b/lang/he.php index f3f2cba05d..01dd124cc9 100644 --- a/lang/he.php +++ b/lang/he.php @@ -273,8 +273,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'אין מידע להצגה עבור הדוח', 'CoreHome_CategoryNoData' => 'אין מידע בקטגוריה זו. נא לנסות "לכלול את כלל האוכלוסייה"', 'CoreHome_ShowJSCode' => 'הצגת הJavaScript להטמעה', - 'CoreHome_IncludeAllPopulation_js' => 'לכלול את כלל האוכלוסייה', - 'CoreHome_ExcludeLowPopulation_js' => 'למעט אוכלוסייה נמוכה', 'CoreHome_PageOf_js' => '%1$s מתוך %2$s', 'CoreHome_PeriodDay' => 'יום', 'CoreHome_PeriodWeek' => 'שבוע', diff --git a/lang/hu.php b/lang/hu.php index f76710cc22..804d53b164 100644 --- a/lang/hu.php +++ b/lang/hu.php @@ -325,8 +325,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Nincs adat ehhez a jelentéshez.', 'CoreHome_CategoryNoData' => 'Nincs adat ebben a kategóriában. Próbáld meg a "Tartalmazza a teljes populációt" opciót.', 'CoreHome_ShowJSCode' => 'Mutasd a JavaScript kódot a beillesztéshez', - 'CoreHome_IncludeAllPopulation_js' => 'Tartalmazza a teljes populációt', - 'CoreHome_ExcludeLowPopulation_js' => 'Kivéve alacsony populáció', 'CoreHome_PageOf_js' => '%1$s — %2$s', 'CoreHome_PeriodDay' => 'Nap', 'CoreHome_PeriodWeek' => 'Hét', @@ -1013,8 +1011,8 @@ $translations = array( 'UserCountry_country_qa' => 'Katar', 'UserCountry_country_re' => 'Réunion', 'UserCountry_country_ro' => 'Románia', - 'UserCountry_country_ru' => 'Oroszország', 'UserCountry_country_rs' => 'Szerbia', + 'UserCountry_country_ru' => 'Oroszország', 'UserCountry_country_rw' => 'Ruanda', 'UserCountry_country_sa' => 'Szaúd-Arábia', 'UserCountry_country_sb' => 'Salamon-szigetek', diff --git a/lang/id.php b/lang/id.php index d2315607a7..cd1043bfa2 100644 --- a/lang/id.php +++ b/lang/id.php @@ -372,8 +372,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Tidak ada data untuk laporan ini.', 'CoreHome_CategoryNoData' => 'Tak ada data untuk kategori ini. Coba untuk "Masukkan seluruh populasi".', 'CoreHome_ShowJSCode' => 'Tampilkan kode JavaScript untuk disisipkan', - 'CoreHome_IncludeAllPopulation_js' => 'Masukkan seluruh populasi', - 'CoreHome_ExcludeLowPopulation_js' => 'Kecualikan populasi kecil', 'CoreHome_PageOf_js' => '%1$s dari %2$s', 'CoreHome_PeriodDay' => 'Hari', 'CoreHome_PeriodWeek' => 'Minggu', diff --git a/lang/it.php b/lang/it.php index 56c8dc780a..5a16e281a2 100644 --- a/lang/it.php +++ b/lang/it.php @@ -374,8 +374,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Non c\'è nessun dato in questo report.', 'CoreHome_CategoryNoData' => 'Non ci sono dati in questa categoria. Prova ad includere tutte le categorie.', 'CoreHome_ShowJSCode' => 'Mostra il codice JavaScript da inserire', - 'CoreHome_IncludeAllPopulation_js' => 'Vedi tutti', - 'CoreHome_ExcludeLowPopulation_js' => 'Vedi i migliori', 'CoreHome_PageOf_js' => '%1$s di %2$s', 'CoreHome_PeriodDay' => 'Giorno', 'CoreHome_PeriodWeek' => 'Settimana', diff --git a/lang/ja.php b/lang/ja.php index 576bee4f7c..4abbc8dc66 100644 --- a/lang/ja.php +++ b/lang/ja.php @@ -257,8 +257,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'このリポートのデータがありません。', 'CoreHome_CategoryNoData' => 'このカテゴリにデータはありません。 "すべての母集団（統計の対象とする集団）を含める" を試してみてください。', 'CoreHome_ShowJSCode' => '挿入する javascript コードを表示', - 'CoreHome_IncludeAllPopulation_js' => 'すべての母集団（統計の対象とする集団）を含める', - 'CoreHome_ExcludeLowPopulation_js' => '低い母集団（統計の対象とする集団）を除外する', 'CoreHome_PageOf_js' => '%1$s / %2$s', 'CoreHome_PeriodDay' => '日', 'CoreHome_PeriodWeek' => '週', @@ -944,8 +942,8 @@ $translations = array( 'UserCountry_country_qa' => 'カタール', 'UserCountry_country_re' => 'レユニオン（フランス領）', 'UserCountry_country_ro' => 'ルーマニア', - 'UserCountry_country_ru' => 'ロシア連邦', 'UserCountry_country_rs' => 'セルビア', + 'UserCountry_country_ru' => 'ロシア連邦', 'UserCountry_country_rw' => 'ルワンダ', 'UserCountry_country_sa' => 'サウジアラビア', 'UserCountry_country_sb' => 'ソロモン諸島', diff --git a/lang/ka.php b/lang/ka.php index d8fd838c38..df9d71155d 100644 --- a/lang/ka.php +++ b/lang/ka.php @@ -256,8 +256,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'რეპორტისთვის მონაცემები არ არის.', 'CoreHome_CategoryNoData' => 'ამ კატეგორიაში მონაცემები არ არის. ცადეთ "ყველა მონაწილის ჩართვა"', 'CoreHome_ShowJSCode' => 'JavaScript კოდის ნახვა, რომელიც უნდა ჩაისვას ვებ გვერდზე', - 'CoreHome_IncludeAllPopulation_js' => 'ყველა მონაწილის ჩართვა', - 'CoreHome_ExcludeLowPopulation_js' => 'დაბალი მონაწილეების გამორიცხვა', 'CoreHome_PageOf_js' => '%1$s, სულ %2$s', 'CoreHome_PeriodDay' => 'დღე', 'CoreHome_PeriodWeek' => 'კვირა', @@ -933,8 +931,8 @@ $translations = array( 'UserCountry_country_qa' => 'კატარი', 'UserCountry_country_re' => 'შეერთების კუნძული', 'UserCountry_country_ro' => 'რუმინეთი', - 'UserCountry_country_ru' => 'რუსეთის ფედერაცია', 'UserCountry_country_rs' => 'სერბეთი', + 'UserCountry_country_ru' => 'რუსეთის ფედერაცია', 'UserCountry_country_rw' => 'რუანდა', 'UserCountry_country_sa' => 'საუდის არაბეთი', 'UserCountry_country_sb' => 'სოლომონის კუნძულები', diff --git a/lang/ko.php b/lang/ko.php index f192961254..731877a2f6 100644 --- a/lang/ko.php +++ b/lang/ko.php @@ -110,8 +110,6 @@ $translations = array( 'API_LoadedAPIs' => '성공적으로 %s API를 불러옴', 'CoreHome_CategoryNoData' => '이 카테고리 안에 데이터가 없습니다. "모든 집단 포함"을 시도해보세요.', 'CoreHome_ShowJSCode' => '삽입할 자바스크립트 코드 보기', - 'CoreHome_IncludeAllPopulation_js' => '모든 집단 포함', - 'CoreHome_ExcludeLowPopulation_js' => '낮은 집단 제외', 'CoreHome_PageOf_js' => '%1$s : %2$s', 'CoreHome_PeriodDay' => '일간', 'CoreHome_PeriodWeek' => '주간', @@ -553,8 +551,8 @@ $translations = array( 'UserCountry_country_qa' => '카타르', 'UserCountry_country_re' => '레위니옹 섬', 'UserCountry_country_ro' => '루마니아', - 'UserCountry_country_ru' => '러시아', 'UserCountry_country_rs' => '세르비아', + 'UserCountry_country_ru' => '러시아', 'UserCountry_country_rw' => '르완다', 'UserCountry_country_sa' => '사우디 아라비아', 'UserCountry_country_sb' => '솔로몬 아일랜드', diff --git a/lang/lt.php b/lang/lt.php index c53a1a51e8..d6f68f70e4 100644 --- a/lang/lt.php +++ b/lang/lt.php @@ -302,8 +302,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Nėra duomenų šiai ataskaitai.', 'CoreHome_CategoryNoData' => 'Šioje kategorijoje duomenų nėra. Pabandykite "Įtraukti visą populiaciją"', 'CoreHome_ShowJSCode' => 'Parodyti JavaScript kodą įvedimui', - 'CoreHome_IncludeAllPopulation_js' => 'Įtraukti visą populiaciją', - 'CoreHome_ExcludeLowPopulation_js' => 'Neįtraukti menkos populiacijos', 'CoreHome_PageOf_js' => '%1$s iš %2$s', 'CoreHome_PeriodDay' => 'Diena', 'CoreHome_PeriodWeek' => 'Savaitė', diff --git a/lang/lv.php b/lang/lv.php index aec3068a9d..d6ee00f819 100644 --- a/lang/lv.php +++ b/lang/lv.php @@ -348,8 +348,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Nav šajai atskaitei vajadzīgo datu.', 'CoreHome_CategoryNoData' => 'Nav datu šajā kategorijā. Mēģiniet izvēlēties "Iekļaut visu apmeklējumu".', 'CoreHome_ShowJSCode' => 'Rādīt ievietošanai paredzēto JavaScript kodu', - 'CoreHome_IncludeAllPopulation_js' => 'Iekļaut visu apmeklējumu', - 'CoreHome_ExcludeLowPopulation_js' => 'Izlaist zemu apmeklējumu', 'CoreHome_PageOf_js' => '%1$s no %2$s', 'CoreHome_PeriodDay' => 'Diena', 'CoreHome_PeriodWeek' => 'Nedēļa', diff --git a/lang/nb.php b/lang/nb.php index e9bb6dc277..710e8b14b1 100644 --- a/lang/nb.php +++ b/lang/nb.php @@ -245,8 +245,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Det fins ingen data for denne rapporten.', 'CoreHome_CategoryNoData' => 'Ingen data i denne kategorien. Prøv å velge "Inkluder hele populasjon".', 'CoreHome_ShowJSCode' => 'Vis JavaScript-koden til å sette inn på din nettside.', - 'CoreHome_IncludeAllPopulation_js' => 'Inkluder hele populasjon', - 'CoreHome_ExcludeLowPopulation_js' => 'Eksluder lav populasjon', 'CoreHome_PageOf_js' => '%1$s av %2$s', 'CoreHome_PeriodDay' => 'Dag', 'CoreHome_PeriodWeek' => 'Uke', @@ -816,8 +814,8 @@ $translations = array( 'UserCountry_country_qa' => 'Qatar', 'UserCountry_country_re' => 'Reunion Island', 'UserCountry_country_ro' => 'Romania', - 'UserCountry_country_ru' => 'Russland', 'UserCountry_country_rs' => 'Serbia', + 'UserCountry_country_ru' => 'Russland', 'UserCountry_country_rw' => 'Rwanda', 'UserCountry_country_sa' => 'Saudi Arabia', 'UserCountry_country_sb' => 'Salomonøyene', diff --git a/lang/nl.php b/lang/nl.php index 351830fddb..e486a47819 100644 --- a/lang/nl.php +++ b/lang/nl.php @@ -332,8 +332,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Er is geen data voor dit rapport.', 'CoreHome_CategoryNoData' => 'Geen data in deze catagorie. Probeer "Toon alle data".', 'CoreHome_ShowJSCode' => 'toon de javascript code', - 'CoreHome_IncludeAllPopulation_js' => 'Toon alle data', - 'CoreHome_ExcludeLowPopulation_js' => 'Verberg te verwaarlozen data', 'CoreHome_PageOf_js' => '%1$s van %2$s', 'CoreHome_PeriodDay' => 'Dag', 'CoreHome_PeriodWeek' => 'Week', @@ -1012,8 +1010,8 @@ $translations = array( 'UserCountry_country_qa' => 'Qatar', 'UserCountry_country_re' => 'Réunion', 'UserCountry_country_ro' => 'Roemenië', - 'UserCountry_country_ru' => 'Rusland', 'UserCountry_country_rs' => 'Servië', + 'UserCountry_country_ru' => 'Rusland', 'UserCountry_country_rw' => 'Rwanda', 'UserCountry_country_sa' => 'Saoedi-Arabië', 'UserCountry_country_sb' => 'Salomons Eilanden', diff --git a/lang/nn.php b/lang/nn.php index ba4a2d9564..6822c56cb7 100644 --- a/lang/nn.php +++ b/lang/nn.php @@ -182,8 +182,6 @@ $translations = array( 'CoreAdminHome_Administration' => 'Administrasjon', 'CoreHome_CategoryNoData' => 'Inga data i denne kategorien. Prøv \'Inkluder heile datasettet\'', 'CoreHome_ShowJSCode' => 'Vis JavaScriptkoden for å setja inn.', - 'CoreHome_IncludeAllPopulation_js' => 'Inkluder heile populasjonen', - 'CoreHome_ExcludeLowPopulation_js' => 'Ekskluder låg populasjon', 'CoreHome_PageOf_js' => '%1$s av %2$s', 'CoreHome_PeriodDay' => 'Dag', 'CoreHome_PeriodWeek' => 'Veke', @@ -706,8 +704,8 @@ $translations = array( 'UserCountry_country_qa' => 'Qatar', 'UserCountry_country_re' => 'Reunion Island', 'UserCountry_country_ro' => 'Romania', - 'UserCountry_country_ru' => 'Russland', 'UserCountry_country_rs' => 'Serbia', + 'UserCountry_country_ru' => 'Russland', 'UserCountry_country_rw' => 'Rwanda', 'UserCountry_country_sa' => 'Saudi Arabia', 'UserCountry_country_sb' => 'Salomonøyane', diff --git a/lang/pl.php b/lang/pl.php index 3cf28fdeee..c8918a00f5 100644 --- a/lang/pl.php +++ b/lang/pl.php @@ -312,8 +312,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Brak danych dla tego raportu.', 'CoreHome_CategoryNoData' => 'Brak danych w tej kategorii. Spróbuj opcji "Uwzględnij całą populację".', 'CoreHome_ShowJSCode' => 'Pokaż kod JavaScript do umieszczenia', - 'CoreHome_IncludeAllPopulation_js' => 'Uwzględnij całą populację', - 'CoreHome_ExcludeLowPopulation_js' => 'Wyklucz niewielkie populacje', 'CoreHome_PageOf_js' => '%1$s z %2$s', 'CoreHome_PeriodDay' => 'dzień', 'CoreHome_PeriodWeek' => 'tydzień', diff --git a/lang/pt-br.php b/lang/pt-br.php index 0892729009..2e046f01da 100644 --- a/lang/pt-br.php +++ b/lang/pt-br.php @@ -238,8 +238,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Não existem dados para esse relatório.', 'CoreHome_CategoryNoData' => 'Sem dados nesta categoria. Tente o "Incluir toda a população".', 'CoreHome_ShowJSCode' => 'Mostra o código JavaScript a inserir', - 'CoreHome_IncludeAllPopulation_js' => 'Incluir toda a população', - 'CoreHome_ExcludeLowPopulation_js' => 'Excluir a baixa população', 'CoreHome_PageOf_js' => '%1$s de %2$s', 'CoreHome_PeriodDay' => 'Dia', 'CoreHome_PeriodWeek' => 'Semana', @@ -904,8 +902,8 @@ $translations = array( 'UserCountry_country_qa' => 'Qatar', 'UserCountry_country_re' => 'Ilhas Reunião', 'UserCountry_country_ro' => 'Romênia', - 'UserCountry_country_ru' => 'Rússia', 'UserCountry_country_rs' => 'Sérvia', + 'UserCountry_country_ru' => 'Rússia', 'UserCountry_country_rw' => 'Ruanda', 'UserCountry_country_sa' => 'Arábia Saudita', 'UserCountry_country_sb' => 'Ilhas Salomão', diff --git a/lang/pt.php b/lang/pt.php index c5e8373942..e96fd93a96 100644 --- a/lang/pt.php +++ b/lang/pt.php @@ -391,8 +391,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Não há dados para este relatório.', 'CoreHome_CategoryNoData' => 'Sem dados nesta categoria. Tente o "Incluir toda a população".', 'CoreHome_ShowJSCode' => 'Mostrar o código JavaScript para inserir', - 'CoreHome_IncludeAllPopulation_js' => 'Incluir toda a população', - 'CoreHome_ExcludeLowPopulation_js' => 'Excluir a baixa população', 'CoreHome_PageOf_js' => '%1$s de %2$s', 'CoreHome_PeriodDay' => 'Dia', 'CoreHome_PeriodWeek' => 'Semana', diff --git a/lang/ro.php b/lang/ro.php index 809e62ac22..dab781269a 100644 --- a/lang/ro.php +++ b/lang/ro.php @@ -316,8 +316,6 @@ $translations = array( 'API_LoadedAPIs' => 'Incarcare de succes %s al API', 'CoreHome_CategoryNoData' => 'Nici o data in aceasta categorie. Incearca "Include toata populatia".', 'CoreHome_ShowJSCode' => 'Arat codul javascript ce trebuie folosit', - 'CoreHome_IncludeAllPopulation_js' => 'Include toata populatia', - 'CoreHome_ExcludeLowPopulation_js' => 'Exclude populatia putina', 'CoreHome_PageOf_js' => '%1$s al %2$s', 'CoreHome_PeriodDay' => 'Zi', 'CoreHome_PeriodWeek' => 'Saptamana', @@ -720,8 +718,8 @@ $translations = array( 'UserCountry_country_qa' => 'Qatar', 'UserCountry_country_re' => 'Reunion Island', 'UserCountry_country_ro' => 'Romania', - 'UserCountry_country_ru' => 'Russia', 'UserCountry_country_rs' => 'Serbia', + 'UserCountry_country_ru' => 'Russia', 'UserCountry_country_rw' => 'Rwanda', 'UserCountry_country_sa' => 'Saudi Arabia', 'UserCountry_country_sb' => 'Solomon Islands', diff --git a/lang/ru.php b/lang/ru.php index 990d72d309..3318a7252e 100644 --- a/lang/ru.php +++ b/lang/ru.php @@ -372,8 +372,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Не существует данных для составления отчета.', 'CoreHome_CategoryNoData' => 'Нет данных в этой категории. Попробуйте "Включить все показатели".', 'CoreHome_ShowJSCode' => 'Показать Java-код для вставки', - 'CoreHome_IncludeAllPopulation_js' => 'Включить все показатели...', - 'CoreHome_ExcludeLowPopulation_js' => 'Исключить низкие показатели...', 'CoreHome_PageOf_js' => '%1$s из %2$s', 'CoreHome_PeriodDay' => 'День', 'CoreHome_PeriodWeek' => 'Неделя', diff --git a/lang/sk.php b/lang/sk.php index 0ad2e4c3bc..9757f09c04 100644 --- a/lang/sk.php +++ b/lang/sk.php @@ -337,8 +337,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Neexistujú žiadne dáta pre túto správu.', 'CoreHome_CategoryNoData' => 'Pre túto kategóriu nie sú dáta. Skúste použiť „Vrátane celej populácie“.', 'CoreHome_ShowJSCode' => 'Zobraziť javascript kód pre vloženie', - 'CoreHome_IncludeAllPopulation_js' => 'Vrátane celej populácie', - 'CoreHome_ExcludeLowPopulation_js' => 'Bez nízkej populácie', 'CoreHome_PageOf_js' => '%1$s z %2$s', 'CoreHome_PeriodDay' => 'Deň', 'CoreHome_PeriodWeek' => 'Týždeň', @@ -851,8 +849,8 @@ $translations = array( 'UserCountry_country_qa' => 'Katar', 'UserCountry_country_re' => 'Réunion', 'UserCountry_country_ro' => 'Rumunsko', - 'UserCountry_country_ru' => 'Rusko', 'UserCountry_country_rs' => 'Srbsko', + 'UserCountry_country_ru' => 'Rusko', 'UserCountry_country_rw' => 'Rwanda', 'UserCountry_country_sa' => 'Saudská Arábia', 'UserCountry_country_sb' => 'Šalamúnove ostrovy', diff --git a/lang/sl.php b/lang/sl.php index 60ed580cb4..b18323ca72 100644 --- a/lang/sl.php +++ b/lang/sl.php @@ -295,7 +295,6 @@ $translations = array( 'CoreAdminHome_LogoUpload' => 'Izberite Logo za nalaganje', 'PrivacyManager_TeaserHeadline' => 'Nastavitve zasebnosti', 'CoreHome_ShowJSCode' => 'Prikaži JavaScript kodo za vstavljanje', - 'CoreHome_IncludeAllPopulation_js' => 'Vključi vso populacijo', 'CoreHome_PeriodDay' => 'Dan', 'CoreHome_PeriodWeek' => 'Teden', 'CoreHome_PeriodMonth' => 'Mesec', diff --git a/lang/sq.php b/lang/sq.php index 6c56f9bee9..588eb31ddf 100644 --- a/lang/sq.php +++ b/lang/sq.php @@ -403,8 +403,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Nuk ka të dhëna për këtë raport.', 'CoreHome_CategoryNoData' => 'Pa të dhëna për këtë kategori. Provoni të "Përfshini tërë popullatën".', 'CoreHome_ShowJSCode' => 'Shfaqe kodin JavaScript që duhet futur', - 'CoreHome_IncludeAllPopulation_js' => 'Përfshi krejt popullatën', - 'CoreHome_ExcludeLowPopulation_js' => 'Përjashto popullatën e ulët', 'CoreHome_PageOf_js' => '%1$s nga %2$s', 'CoreHome_DateFormat' => '%longDay% %day% %longMonth% %longYear%', 'CoreHome_ShortDateFormat' => '%shortDay% %day% %shortMonth%', diff --git a/lang/sr.php b/lang/sr.php index 6f0df2059f..6f4bdf448a 100644 --- a/lang/sr.php +++ b/lang/sr.php @@ -329,8 +329,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Nema podataka za ovaj izveštaj.', 'CoreHome_CategoryNoData' => 'Nema podataka u ovoj kategoriji. Probajte sa "Uključi celu populaciju".', 'CoreHome_ShowJSCode' => 'Prikaži JavaScript kod', - 'CoreHome_IncludeAllPopulation_js' => 'Uključi celu populaciju', - 'CoreHome_ExcludeLowPopulation_js' => 'Isključi celu populaciju', 'CoreHome_PageOf_js' => '%1$s od %2$s', 'CoreHome_PeriodDay' => 'Dan', 'CoreHome_PeriodWeek' => 'Nedelja', @@ -1021,8 +1019,8 @@ $translations = array( 'UserCountry_country_qa' => 'Katar', 'UserCountry_country_re' => 'Reunion Ostrva', 'UserCountry_country_ro' => 'Rumunija', - 'UserCountry_country_ru' => 'Rusija', 'UserCountry_country_rs' => 'Srbija', + 'UserCountry_country_ru' => 'Rusija', 'UserCountry_country_rw' => 'Ruanda', 'UserCountry_country_sa' => 'Saudijska Arabija', 'UserCountry_country_sb' => 'Solomonova Ostrva', diff --git a/lang/sv.php b/lang/sv.php index 4a6d4467fe..c40dc14c64 100644 --- a/lang/sv.php +++ b/lang/sv.php @@ -390,8 +390,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Det finns ingen data för denna rapport.', 'CoreHome_CategoryNoData' => 'Det finns ingen data i denna kategori. Försök att "Inkludera alla träffar".', 'CoreHome_ShowJSCode' => 'Visa JavaScript-koden för att inkludera.', - 'CoreHome_IncludeAllPopulation_js' => 'Inkludera alla träffar', - 'CoreHome_ExcludeLowPopulation_js' => 'Exkludera få träffar', 'CoreHome_PageOf_js' => '%1$s av %2$s', 'CoreHome_PeriodDay' => 'Dag', 'CoreHome_PeriodWeek' => 'Vecka', diff --git a/lang/th.php b/lang/th.php index fb90f6f251..628c6cba6a 100644 --- a/lang/th.php +++ b/lang/th.php @@ -348,8 +348,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'ไม่มีข้อมูลสำหรับรายงานนี้', 'CoreHome_CategoryNoData' => 'ไม่มีข้อมูลในประเภทนี้ พยายาม "รวมประชากรทั้งหมด"', 'CoreHome_ShowJSCode' => 'แสดงรหัส JavaScript เมื่อต้องการแทรก', - 'CoreHome_IncludeAllPopulation_js' => 'ใช้งานสถิติทั้งหมด', - 'CoreHome_ExcludeLowPopulation_js' => 'ใช้งานสถิติขั้นต่ำ', 'CoreHome_PageOf_js' => '%1$s ของ %2$s', 'CoreHome_PeriodDay' => 'วัน', 'CoreHome_PeriodWeek' => 'สัปดาห์', @@ -1040,8 +1038,8 @@ $translations = array( 'UserCountry_country_qa' => 'กาตาร์', 'UserCountry_country_re' => 'เกาะเรอูนียง', 'UserCountry_country_ro' => 'โรมาเนีย', - 'UserCountry_country_ru' => 'รัสเซีย', 'UserCountry_country_rs' => 'เซอร์เบีย', + 'UserCountry_country_ru' => 'รัสเซีย', 'UserCountry_country_rw' => 'รวันดา', 'UserCountry_country_sa' => 'ซาอุดีอาระเบีย', 'UserCountry_country_sb' => 'หมู่เกาะโซโลมอน', diff --git a/lang/tr.php b/lang/tr.php index 4de79d0277..afc629604e 100644 --- a/lang/tr.php +++ b/lang/tr.php @@ -296,8 +296,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Bu rapor için veri yok.', 'CoreHome_CategoryNoData' => 'Bu kategoride veri yok. "Eklenmiş tüm populasyon" deneyiniz.', 'CoreHome_ShowJSCode' => 'Eklenecek JavaScript kodu göster', - 'CoreHome_IncludeAllPopulation_js' => 'Tüm popülasyonu içerir', - 'CoreHome_ExcludeLowPopulation_js' => 'Hariç tutulan düşük populasyon', 'CoreHome_PageOf_js' => '%1$s nin %2$s', 'CoreHome_PeriodDay' => 'Gün', 'CoreHome_PeriodWeek' => 'Hafta', @@ -761,8 +759,8 @@ $translations = array( 'UserCountry_country_py' => 'Paraguay', 'UserCountry_country_qa' => 'Katar', 'UserCountry_country_ro' => 'Romanya', - 'UserCountry_country_ru' => 'Rusya', 'UserCountry_country_rs' => 'Sırbistan', + 'UserCountry_country_ru' => 'Rusya', 'UserCountry_country_sa' => 'Suudi Arabistan', 'UserCountry_country_sd' => 'Sudan', 'UserCountry_country_se' => 'İsveç', diff --git a/lang/uk.php b/lang/uk.php index 74d3a10e6b..d34e9a89c0 100644 --- a/lang/uk.php +++ b/lang/uk.php @@ -257,8 +257,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => 'Відсутні дані для даного звіту', 'CoreHome_CategoryNoData' => 'В цій категорії немає даних. Спробуйте "Виключити всі групи людей"', 'CoreHome_ShowJSCode' => 'Показати код вставки javascript', - 'CoreHome_IncludeAllPopulation_js' => 'Включити всі групи людей', - 'CoreHome_ExcludeLowPopulation_js' => 'Виключити малочисельні групи людей', 'CoreHome_PageOf_js' => '%1$s із %2$s', 'CoreHome_PeriodDay' => 'День', 'CoreHome_PeriodWeek' => 'Тиждень', @@ -935,8 +933,8 @@ $translations = array( 'UserCountry_country_qa' => 'Катар', 'UserCountry_country_re' => 'Реюньйон', 'UserCountry_country_ro' => 'Румунія', - 'UserCountry_country_ru' => 'Росія', 'UserCountry_country_rs' => 'Сербія', + 'UserCountry_country_ru' => 'Росія', 'UserCountry_country_rw' => 'Руанда', 'UserCountry_country_sa' => 'Саудівська Аравія', 'UserCountry_country_sb' => 'Соломонові Острови', diff --git a/lang/zh-cn.php b/lang/zh-cn.php index 705a9708c1..d15ecc42b2 100644 --- a/lang/zh-cn.php +++ b/lang/zh-cn.php @@ -247,8 +247,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => '此报表沒有资料。', 'CoreHome_CategoryNoData' => '类别无数据！ 尝试使用 "包含所有个体"！', 'CoreHome_ShowJSCode' => '显示 Javascript 统计代码', - 'CoreHome_IncludeAllPopulation_js' => '包含所有个体', - 'CoreHome_ExcludeLowPopulation_js' => '排除非主要个体', 'CoreHome_PageOf_js' => '%s of %s', 'CoreHome_PeriodDay' => '日统计', 'CoreHome_PeriodWeek' => '周统计', @@ -904,8 +902,8 @@ $translations = array( 'UserCountry_country_qa' => '卡达', 'UserCountry_country_re' => '法属留尼旺岛', 'UserCountry_country_ro' => '罗马尼亚', - 'UserCountry_country_ru' => '俄罗斯联邦', 'UserCountry_country_rs' => '俄罗斯', + 'UserCountry_country_ru' => '俄罗斯联邦', 'UserCountry_country_rw' => '卢安达', 'UserCountry_country_sa' => '沙特阿拉伯', 'UserCountry_country_sb' => '索罗门群岛', diff --git a/lang/zh-tw.php b/lang/zh-tw.php index 52c719c58f..132c78e0fb 100644 --- a/lang/zh-tw.php +++ b/lang/zh-tw.php @@ -243,8 +243,6 @@ $translations = array( 'CoreHome_ThereIsNoDataForThisReport' => '此報告項目無資料！', 'CoreHome_CategoryNoData' => '無資料在此類別！ 嘗試使用 "包含所有個體"！', 'CoreHome_ShowJSCode' => '顯示 JavaScript 追蹤碼以供插入', - 'CoreHome_IncludeAllPopulation_js' => '包含所有個體', - 'CoreHome_ExcludeLowPopulation_js' => '排除非主要個體', 'CoreHome_PageOf_js' => '%1$s 之於 %2$s', 'CoreHome_PeriodDay' => '日統計', 'CoreHome_PeriodWeek' => '週統計', @@ -909,8 +907,8 @@ $translations = array( 'UserCountry_country_qa' => '卡達', 'UserCountry_country_re' => '法屬留尼旺島', 'UserCountry_country_ro' => '羅馬尼亞', - 'UserCountry_country_ru' => '俄羅斯', 'UserCountry_country_rs' => '塞爾維亞', + 'UserCountry_country_ru' => '俄羅斯', 'UserCountry_country_rw' => '盧安達', 'UserCountry_country_sa' => '沙烏地阿拉伯', 'UserCountry_country_sb' => '索羅門群島', diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css index ae7d11c090..90dacad55d 100644 --- a/plugins/CoreHome/templates/datatable.css +++ b/plugins/CoreHome/templates/datatable.css @@ -660,18 +660,34 @@ table.dataTable .dataTableRowActions a img { margin-left: 5px; min-height: 20px; min-width: 25px; - text-align: right; } -a.tableConfigurationIcon img { - margin: 2px 6px 0 0; +a.tableConfigurationIcon { + display: block; + width: 30px; + height: 22px; + background: url(../../../themes/default/images/configure.png) no-repeat center 2px; + position: absolute; + z-index: 9; + right: 0; +} + +a.tableConfigurationIcon.highlighted { + display: block; + width: 30px; + height: 22px; + background-image: url(../../../themes/default/images/configure-highlight.png); + position: absolute; + z-index: 9; + right: 0; } .tableConfiguration ul { - margin-top: 18px; overflow: visible; background-color: #fff; display: none; + position: relative; + z-index: 8; } .tableConfiguration ul.open { @@ -697,7 +713,7 @@ a.tableConfigurationIcon img { -webkit-border-radius: 0 0 4px 4px; height: 25px; cursor: default; - margin-top: -40px; + margin-top: -4px; } .tableConfiguration ul li.first { diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js index 6afb67e0c2..94b73862f8 100644 --- a/plugins/CoreHome/templates/datatable.js +++ b/plugins/CoreHome/templates/datatable.js @@ -715,6 +715,10 @@ dataTable.prototype = return; } + var icon = $('a.tableConfigurationIcon', domElem); + icon.click(function() { return false; }); + var iconHighlighted = false; + ul.find('li:first').addClass('first'); ul.find('li:last').addClass('last'); ul.prepend('<li class="firstDummy"></li>'); @@ -723,9 +727,11 @@ dataTable.prototype = var open = function() { self.exportToFormatHide(domElem, true); ul.addClass('open'); + icon.css('opacity', 1); }; var close = function() { ul.removeClass('open'); + icon.css('opacity', icon.hasClass('highlighted') ? .85 : .6); }; $('div.tableConfiguration', domElem).hover(open, close); @@ -741,12 +747,13 @@ dataTable.prototype = }; }; - var getText = function(text) + var getText = function(text, addDefault) { text = _pk_translate(text); if (text.indexOf('%s') > 0) { text = text.replace('%s', '<br /><span class="action">» '); + if (addDefault) text += ' (' + _pk_translate('CoreHome_Default_js') + ')'; text += '</span>'; } return text; @@ -756,7 +763,8 @@ dataTable.prototype = { if (typeof self.param[paramName] != 'undefined' && self.param[paramName] == 1) { - $(el).html(getText(textA)); + $(el).html(getText(textA, true)); + iconHighlighted = true; } else { @@ -776,8 +784,9 @@ dataTable.prototype = } if(Number(self.param.enable_filter_excludelowpop) != 0) { - string = getText('CoreHome_IncludeRowsWithLowPopulation_js'); + string = getText('CoreHome_IncludeRowsWithLowPopulation_js', true); self.param.enable_filter_excludelowpop = 1; + iconHighlighted = true; } else { @@ -808,6 +817,11 @@ dataTable.prototype = self.param.filter_sort_column = ''; } })); + + if (iconHighlighted) { + icon.addClass('highlighted'); + } + close(); }, //footer arrow position handler diff --git a/plugins/CoreHome/templates/datatable_footer.tpl b/plugins/CoreHome/templates/datatable_footer.tpl index ef4e564ab9..6f24a25078 100644 --- a/plugins/CoreHome/templates/datatable_footer.tpl +++ b/plugins/CoreHome/templates/datatable_footer.tpl @@ -84,7 +84,7 @@ </div> <div class="limitSelection {if !$properties.show_pagination_control} hidden{/if}" title="{'General_RowsToDisplay'|translate:escape:'html'}"></div> <div class="tableConfiguration"> - <a class="tableConfigurationIcon"><img width="16" height="16" src="themes/default/images/configure.png" title="{'CoreHome_ConfigureView'|translate}" /></a> + <a class="tableConfigurationIcon" href="#"></a> <ul> {if isset($javascriptVariablesToSet.flat) && $javascriptVariablesToSet.flat == 1} <li><div class="configItem dataTableIncludeAggregateRows"></div></li> diff --git a/themes/default/images/configure-highlight.png b/themes/default/images/configure-highlight.png Binary files differnew file mode 100755 index 0000000000..3b04a7db10 --- /dev/null +++ b/themes/default/images/configure-highlight.png diff --git a/themes/default/images/configure.png b/themes/default/images/configure.png Binary files differindex 819eedec5a..d1a71216d5 100644..100755 --- a/themes/default/images/configure.png +++ b/themes/default/images/configure.png |
