diff --git a/CHANGELOG.md b/CHANGELOG.md index 5cc5a8224..db7b1f687 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ * Added `Medium::attribute()` to pass arbitrary attributes [#3065](https://github.com/getgrav/grav/pull/3065) * Added `Plugins::getPlugins()` and `Plugins::getPlugin($name)` to make it easier to access plugin instances [#2277](https://github.com/getgrav/grav/pull/2277) * Added `regex_match` and `regex_split` twig functions [#2788](https://github.com/getgrav/grav/pull/2788) + * Updated all languages from [Crowdin](https://crowdin.com/project/grav-core) - Please update any translations here 1. [](#improved) * Added abstract `FlexObject`, `FlexCollection` and `FlexIndex` classes to `\Grav\Common\Flex` namespace (extend those instead of Framework or Generic classes) * Updated bundled `composer.phar` binary to latest version `2.0.9` @@ -14,6 +15,7 @@ * Added `$grav->getVersion()` or `grav.version` in twig to get the current Grav version [#3142](https://github.com/getgrav/grav/issues/3142) * Added second parameter to `$blueprint->flattenData()` to include every field, including those which have no data * Added support for setting session domain [#2040](https://github.com/getgrav/grav/pull/2040) + * Better support inheriting languages when using child themes [#3226](https://github.com/getgrav/grav/pull/3226) * Added option for `FlexForm` constructor to reset the form 1. [](#bugfix) * Fixed issue with `content-security-policy` not being properly supported with `http-equiv` + support single quotes diff --git a/composer.lock b/composer.lock index b604ef8cc..eafebfcee 100644 --- a/composer.lock +++ b/composer.lock @@ -2584,7 +2584,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -2643,7 +2643,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.1" }, "funding": [ { @@ -2663,16 +2663,16 @@ }, { "name": "symfony/polyfill-iconv", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-iconv.git", - "reference": "b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6" + "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6", - "reference": "b34bfb8c4c22650ac080d2662ae3502e5f2f4ae6", + "url": "https://api.github.com/repos/symfony/polyfill-iconv/zipball/06fb361659649bcfd6a208a0f1fcaf4e827ad342", + "reference": "06fb361659649bcfd6a208a0f1fcaf4e827ad342", "shasum": "" }, "require": { @@ -2723,7 +2723,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-iconv/tree/v1.22.1" }, "funding": [ { @@ -2739,20 +2739,20 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13" + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", - "reference": "f377a3dd1fde44d37b9831d68dc8dea3ffd28e13", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/5232de97ee3b75b0360528dae24e73db49566ab1", + "reference": "5232de97ee3b75b0360528dae24e73db49566ab1", "shasum": "" }, "require": { @@ -2803,7 +2803,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.22.1" }, "funding": [ { @@ -2819,11 +2819,11 @@ "type": "tidelift" } ], - "time": "2021-01-07T16:49:33+00:00" + "time": "2021-01-22T09:19:47+00:00" }, { "name": "symfony/polyfill-php74", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php74.git", @@ -2883,7 +2883,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php74/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-php74/tree/v1.22.1" }, "funding": [ { @@ -2903,7 +2903,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "v1.22.0", + "version": "v1.22.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", @@ -2966,7 +2966,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.0" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.22.1" }, "funding": [ { @@ -4492,16 +4492,16 @@ }, { "name": "phpstan/phpstan", - "version": "0.12.74", + "version": "0.12.76", "source": { "type": "git", "url": "https://github.com/phpstan/phpstan.git", - "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2" + "reference": "7aaaf9a759a29795e8f46d48041af1c1f1b23d38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpstan/phpstan/zipball/bc5f9483c8f461c86653dcbd040cf0d2778c91a2", - "reference": "bc5f9483c8f461c86653dcbd040cf0d2778c91a2", + "url": "https://api.github.com/repos/phpstan/phpstan/zipball/7aaaf9a759a29795e8f46d48041af1c1f1b23d38", + "reference": "7aaaf9a759a29795e8f46d48041af1c1f1b23d38", "shasum": "" }, "require": { @@ -4532,7 +4532,7 @@ "description": "PHPStan - PHP Static Analysis Tool", "support": { "issues": "https://github.com/phpstan/phpstan/issues", - "source": "https://github.com/phpstan/phpstan/tree/0.12.74" + "source": "https://github.com/phpstan/phpstan/tree/0.12.76" }, "funding": [ { @@ -4548,7 +4548,7 @@ "type": "tidelift" } ], - "time": "2021-02-08T15:00:25+00:00" + "time": "2021-02-13T11:47:44+00:00" }, { "name": "phpstan/phpstan-deprecation-rules", diff --git a/system/languages/ar.yaml b/system/languages/ar.yaml index 04e63f976..960540588 100644 --- a/system/languages/ar.yaml +++ b/system/languages/ar.yaml @@ -1,6 +1,17 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---\nالعنوان: %1$s\n---\n# خطأ: مادة أمامية غير صحيحة\n\nمسار: '%2$s'\n\n**%3$s**\n\n, , ,\n\n%4$s\n, , ," + INFLECTOR_UNCOUNTABLE: + - 'معدّات' + - 'معلومات' + - 'أرز' + - 'مال' + - 'نوع' + - 'سلسلة' + - 'سمك' + - 'خروف' + INFLECTOR_IRREGULAR: + 'person': 'أشخاص' NICETIME: NO_DATE_PROVIDED: لم يتم تقديم التاريخ BAD_DATE: تاريخ خاطئ @@ -37,8 +48,8 @@ GRAV: YR_PLURAL: سنوات DEC_PLURAL: عقود FORM: - VALIDATION_FAIL: فشل التحقق من صحة: - INVALID_INPUT: إدخال غير صحيح في + VALIDATION_FAIL: 'فشل التحقق من صحة:' + INVALID_INPUT: 'إدخال غير صحيح في' MISSING_REQUIRED_FIELD: 'حقل مطلوب مفقود:' MONTHS_OF_THE_YEAR: - 'كانون الثاني' @@ -61,3 +72,11 @@ GRAV: - 'الجمعة' - 'السبت' - 'الأحد' + CRON: + EVERY: كل + EVERY_HOUR: كل ساعة + EVERY_MINUTE: كل دقيقة + EVERY_DAY_OF_WEEK: كل يوم في الأسبوع + EVERY_DAY_OF_MONTH: كل يوم في الشهر + EVERY_MONTH: ' كل شهر' + TEXT_PERIOD: كل diff --git a/system/languages/bg.yaml b/system/languages/bg.yaml index 48daceb16..174b3a45d 100644 --- a/system/languages/bg.yaml +++ b/system/languages/bg.yaml @@ -36,8 +36,8 @@ GRAV: YR_PLURAL: г DEC_PLURAL: дстлт FORM: - VALIDATION_FAIL: Неуспешна проверка: - INVALID_INPUT: Невалидно въвеждане в + VALIDATION_FAIL: 'Неуспешна проверка:' + INVALID_INPUT: 'Невалидно въвеждане в' MISSING_REQUIRED_FIELD: 'Липсва задължително поле:' MONTHS_OF_THE_YEAR: - 'януари' diff --git a/system/languages/ca.yaml b/system/languages/ca.yaml index bd04474c0..7795aef8b 100644 --- a/system/languages/ca.yaml +++ b/system/languages/ca.yaml @@ -1,6 +1,15 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# S'ha produït un error: Frontmatter invàlid\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_UNCOUNTABLE: + - 'equipment' + - 'informació' + - 'rice' + - 'money' + - 'species' + - 'series' + - 'fish' + - 'sheep' NICETIME: NO_DATE_PROVIDED: No s'ha proporcionat data BAD_DATE: Data invàlida @@ -36,8 +45,8 @@ GRAV: YR_PLURAL: anys DEC_PLURAL: dèc. FORM: - VALIDATION_FAIL: Ha fallat la validació: - INVALID_INPUT: Entrada no vàlida a + VALIDATION_FAIL: 'Ha fallat la validació:' + INVALID_INPUT: 'Entrada no vàlida a' MISSING_REQUIRED_FIELD: 'Falta camp obligatori:' MONTHS_OF_THE_YEAR: - 'Gener' diff --git a/system/languages/cs.yaml b/system/languages/cs.yaml index 80844c997..bfad42364 100644 --- a/system/languages/cs.yaml +++ b/system/languages/cs.yaml @@ -101,9 +101,10 @@ GRAV: YR_PLURAL: r DEC_PLURAL: dek FORM: - VALIDATION_FAIL: Ověření se nezdařilo: - INVALID_INPUT: Neplatný vstup v + VALIDATION_FAIL: 'Ověření se nezdařilo:' + INVALID_INPUT: 'Neplatný vstup v' MISSING_REQUIRED_FIELD: 'Chybí požadované pole:' + XSS_ISSUES: "Byly zjištěny možné problémy XSS v poli '%s'" MONTHS_OF_THE_YEAR: - 'leden' - 'únor' @@ -125,6 +126,8 @@ GRAV: - 'pátek' - 'sobota' - 'neděle' + YES: "Ano" + NO: "Ne" CRON: EVERY: každý EVERY_HOUR: každou hodinu diff --git a/system/languages/da.yaml b/system/languages/da.yaml index 17ce683ba..f23477c53 100644 --- a/system/languages/da.yaml +++ b/system/languages/da.yaml @@ -1,11 +1,27 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---\nTitel: %1$s\n---\n\n# Fejl: Ugyldigt frontmatter\n\nSti: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_UNCOUNTABLE: + - 'udstyr' + - 'information' + - 'ris' + - 'penge' + - 'arter' + - 'Serier' + - 'fisk' + - 'får' + INFLECTOR_IRREGULAR: + 'person': 'personer' + 'man': 'mænd' + 'child': 'børn' + 'sex': 'køn' + 'move': 'flyt' NICETIME: NO_DATE_PROVIDED: Ingen dato angivet BAD_DATE: Ugyldig dato AGO: siden FROM_NOW: fra nu + JUST_NOW: lige nu SECOND: sekund MINUTE: minut HOUR: time @@ -15,6 +31,7 @@ GRAV: YEAR: år DECADE: årti SEC: sek + MIN: min. HR: t WK: u MO: md @@ -36,8 +53,8 @@ GRAV: YR_PLURAL: år DEC_PLURAL: årtier FORM: - VALIDATION_FAIL: Validering mislykkedes: - INVALID_INPUT: Ugyldigt input i + VALIDATION_FAIL: 'Validering mislykkedes:' + INVALID_INPUT: 'Ugyldigt input i' MISSING_REQUIRED_FIELD: 'Mangler obligatorisk felt:' MONTHS_OF_THE_YEAR: - 'januar' @@ -60,3 +77,14 @@ GRAV: - 'fredag' - 'lørdag' - 'søndag' + CRON: + EVERY: hver + EVERY_HOUR: hver time + EVERY_MINUTE: hvert minut + EVERY_DAY_OF_WEEK: alle ugens dage + EVERY_DAY_OF_MONTH: alle dage i måneden + EVERY_MONTH: hver måned + TEXT_PERIOD: Hver + TEXT_MINS: ' ved minut(ter) over timen' + ERROR1: Tagget %s understøttes ikke! + ERROR2: Ugyldigt antal elementer diff --git a/system/languages/de.yaml b/system/languages/de.yaml index 533cf89c3..45c24e79c 100644 --- a/system/languages/de.yaml +++ b/system/languages/de.yaml @@ -101,9 +101,10 @@ GRAV: YR_PLURAL: Jahre DEC_PLURAL: Jahrzehnten FORM: - VALIDATION_FAIL: Überprüfung fehlgeschlagen: - INVALID_INPUT: Ungültige Eingabe in + VALIDATION_FAIL: 'Überprüfung fehlgeschlagen:' + INVALID_INPUT: 'Ungültige Eingabe in' MISSING_REQUIRED_FIELD: 'Erforderliches Feld fehlt:' + XSS_ISSUES: "Potenzielle XSS-Probleme im Feld '%s' erkannt" MONTHS_OF_THE_YEAR: - 'Januar' - 'Februar' @@ -125,8 +126,8 @@ GRAV: - 'Freitag' - 'Samstag' - 'Sonntag' - YES: 'Ja' - NO: 'Nein' + YES: "Ja" + NO: "Nein" CRON: EVERY: jede EVERY_HOUR: jede Stunde diff --git a/system/languages/el.yaml b/system/languages/el.yaml index 1faa8dd87..28619f809 100644 --- a/system/languages/el.yaml +++ b/system/languages/el.yaml @@ -1,11 +1,75 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---\nΤίτλος: %1$s\n---\n\n# Σφάλμα: Μη έγκυρη διαδρομή Frontmatter\n\nΔιαδρομή: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1zes' + '/^(ox)$/i': '\1en' + '/([m|l])ouse$/i': '\1ice' + '/(matr|vert|ind)ix|ex$/i': '\1ices' + '/(x|ch|ss|sh)$/i': '\1es' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([^aeiouy]|qu)y$/i': '\1ies' + '/(hive)$/i': '\1s' + '/(?:([^f])fe|([lr])f)$/i': '\1\2ves' + '/sis$/i': 'ses' + '/([ti])um$/i': '\1a' + '/(buffal|tomat)o$/i': '\1oes' + '/(bu)s$/i': '\1ses' + '/(alias|status)/i': '\1es' + '/(octop|vir)us$/i': '\1i' + '/(ax|test)is$/i': '\1es' + '/s$/i': 's' + '/$/': 's' + INFLECTOR_SINGULAR: + '/(quiz)zes$/i': '\1' + '/(matr)ices$/i': '\1ix' + '/(vert|ind)ices$/i': '\1ex' + '/^(ox)en/i': '\1' + '/(alias|status)es$/i': '\1' + '/([octop|vir])i$/i': '\1us' + '/(cris|ax|test)es$/i': '\1is' + '/(shoe)s$/i': '\1' + '/(o)es$/i': '\1' + '/(bus)es$/i': '\1' + '/([m|l])ice$/i': '\1ouse' + '/(x|ch|ss|sh)es$/i': '\1' + '/(m)ovies$/i': '\1ovie' + '/(s)eries$/i': '\1eries' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([lr])ves$/i': '\1f' + '/(tive)s$/i': '\1' + '/(hive)s$/i': '\1' + '/([^f])ves$/i': '\1fe' + '/(^analy)ses$/i': '\1sis' + '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis' + '/([ti])a$/i': '\1um' + '/(n)ews$/i': '\1ews' + INFLECTOR_UNCOUNTABLE: + - 'εξοπλισμός' + - 'πληροφοριες' + - 'rice' + - 'χρήματα' + - 'είδη' + - 'σειρές' + - 'ψάρι' + - 'πρόβατο' + INFLECTOR_IRREGULAR: + 'person': 'άνθρωποι' + 'man': 'άνδρες' + 'child': 'παιδιά' + 'sex': 'φύλο' + 'move': 'κινήσεις' + INFLECTOR_ORDINALS: + 'default': 'th' + 'first': 'st' + 'second': 'nd' + 'third': 'rd' NICETIME: NO_DATE_PROVIDED: Δεν δόθηκε καμία ημερομηνία BAD_DATE: Εσφαλμένη ημερομηνία AGO: πρίν FROM_NOW: από τώρα + JUST_NOW: μόλις τώρα SECOND: δευτερόλεπτο MINUTE: λεπτό HOUR: ώρα @@ -37,8 +101,8 @@ GRAV: YR_PLURAL: έτη DEC_PLURAL: δεκαετίες FORM: - VALIDATION_FAIL: Η επικύρωση απέτυχε: - INVALID_INPUT: Μη έγκυρα δεδομένα σε + VALIDATION_FAIL: 'Η επικύρωση απέτυχε:' + INVALID_INPUT: 'Μη έγκυρα δεδομένα σε' MISSING_REQUIRED_FIELD: 'Λείπει το απαιτούμενο πεδίο:' MONTHS_OF_THE_YEAR: - 'Ιανουάριος' @@ -61,3 +125,20 @@ GRAV: - 'Παρασκευή' - 'Σάββατο' - 'Κυριακή' + CRON: + EVERY: κάθε + EVERY_HOUR: κάθε ώρα + EVERY_MINUTE: κάθε λεπτό + EVERY_DAY_OF_WEEK: κάθε μέρα της εβδομάδος + EVERY_DAY_OF_MONTH: κάθε μέρα του μήνα + EVERY_MONTH: κάθε μήνα + TEXT_PERIOD: Κάθε + TEXT_MINS: ' κατά λεπτό(ά) μετά την ώρα' + TEXT_TIME: ' στο :' + TEXT_DOW: ' στις ' + TEXT_MONTH: ' από ' + TEXT_DOM: ' στις ' + ERROR1: Η ετικέτα %s δεν υποστηρίζεται! + ERROR2: Μη έγκυρος αριθμός στοιχείων + ERROR3: Το jquery_element θα έπρεπε να οριστεί στις ρυθμίσεις του jqCron + ERROR4: Μη αναγνωρισμένη έκφραση diff --git a/system/languages/es.yaml b/system/languages/es.yaml index 7bacfeb98..95827ee2b 100644 --- a/system/languages/es.yaml +++ b/system/languages/es.yaml @@ -1,19 +1,25 @@ --- GRAV: - FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Error: Frontmatter no válido\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Error: Prefacio no válido\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1ios' + '/s$/i': 's' + '/$/': 's' INFLECTOR_UNCOUNTABLE: - - 'equipo' + - 'equipamiento' - 'información' - - 'rice' + - 'arroz' - 'dinero' - - 'species' + - 'especies' - 'series' - 'pescado' - 'oveja' INFLECTOR_IRREGULAR: + 'person': 'personas' 'man': 'hombres' 'child': 'niños' 'sex': 'sexos' + 'move': 'movido' INFLECTOR_ORDINALS: 'first': 'ro' 'second': 'do' @@ -33,10 +39,12 @@ GRAV: YEAR: año DECADE: década SEC: seg + MIN: min HR: h WK: sem MO: mes YR: año + DEC: dic SECOND_PLURAL: segundos MINUTE_PLURAL: minutos HOUR_PLURAL: horas @@ -46,6 +54,7 @@ GRAV: YEAR_PLURAL: años DECADE_PLURAL: décadas SEC_PLURAL: segs + MIN_PLURAL: mins HR_PLURAL: hs WK_PLURAL: sem MO_PLURAL: mes @@ -55,6 +64,7 @@ GRAV: VALIDATION_FAIL: 'Falló la validación: ' INVALID_INPUT: 'Dato inválido en: ' MISSING_REQUIRED_FIELD: 'Falta el campo requerido: ' + XSS_ISSUES: "Se detectaron problemas XSS potenciales en el campo '%s'" MONTHS_OF_THE_YEAR: - 'Enero' - 'Febrero' @@ -76,6 +86,8 @@ GRAV: - 'Viernes' - 'Sábado' - 'Domingo' + YES: "Si" + NO: "No" CRON: EVERY: cada EVERY_HOUR: cada hora diff --git a/system/languages/et.yaml b/system/languages/et.yaml index 619aa1a73..e5659d333 100644 --- a/system/languages/et.yaml +++ b/system/languages/et.yaml @@ -1,11 +1,22 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---\npealkiri: %1$s\n---\n\n# Viga: vigane Frontmatter'i\n\nasukoht: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(octop|vir)us$/i': '\1i' + INFLECTOR_SINGULAR: + '/^(ox)en/i': '\1' + '/(alias|status)es$/i': '\1' + '/(shoe)s$/i': '\1' + '/(o)es$/i': '\1' + '/(bus)es$/i': '\1' + '/(x|ch|ss|sh)es$/i': '\1' + '/(tive)s$/i': '\1' + '/(hive)s$/i': '\1' INFLECTOR_UNCOUNTABLE: - 'equipment' - 'informatsioon' - - 'rice' - - 'money' + - 'riis' + - 'raha' - 'species' - 'series' - 'kala' @@ -34,6 +45,7 @@ GRAV: YEAR: aasta DECADE: 10 aastat SEC: sek + MIN: min HR: t WK: näd MO: k. @@ -55,7 +67,7 @@ GRAV: YR_PLURAL: aastat DEC_PLURAL: dek. FORM: - VALIDATION_FAIL: Kinnitamine nurjus: + VALIDATION_FAIL: 'Kinnitamine nurjus:' INVALID_INPUT: 'Vigane sisend:' MISSING_REQUIRED_FIELD: 'Nõutud väli puudub:' MONTHS_OF_THE_YEAR: @@ -81,5 +93,12 @@ GRAV: - 'pühapäev' CRON: EVERY: iga + EVERY_HOUR: iga tund + EVERY_MINUTE: iga minut + EVERY_DAY_OF_WEEK: iga nädala päev EVERY_MONTH: iga kuu TEXT_PERIOD: Iga + ERROR1: Silt %s pole toetatud! + ERROR2: Vale elementide arv + ERROR3: jqCron seadetes peaks olema määratud jquery_element + ERROR4: Tundmatu väljend diff --git a/system/languages/eu.yaml b/system/languages/eu.yaml index 4a9a58e9e..91c3c8e2c 100644 --- a/system/languages/eu.yaml +++ b/system/languages/eu.yaml @@ -36,8 +36,8 @@ GRAV: YR_PLURAL: urt DEC_PLURAL: ham FORM: - VALIDATION_FAIL: Balidazioak huts egin du - INVALID_INPUT: Baliogabeko sarrera + VALIDATION_FAIL: 'Balidazioak huts egin du' + INVALID_INPUT: 'Baliogabeko sarrera' MISSING_REQUIRED_FIELD: 'Derrigorrezko eremua bete gabe:' MONTHS_OF_THE_YEAR: - 'Urtarrila' diff --git a/system/languages/fa.yaml b/system/languages/fa.yaml index 186f79d79..96b96dc04 100644 --- a/system/languages/fa.yaml +++ b/system/languages/fa.yaml @@ -36,8 +36,8 @@ GRAV: YR_PLURAL: سال DEC_PLURAL: دهه FORM: - VALIDATION_FAIL: سنجش اعتبار ناموفق بود - INVALID_INPUT: ورودی نامعتبر در + VALIDATION_FAIL: 'سنجش اعتبار ناموفق بود' + INVALID_INPUT: 'ورودی نامعتبر در' MISSING_REQUIRED_FIELD: 'قسمت ضروری جا افتاده:' MONTHS_OF_THE_YEAR: - 'ژانویه' diff --git a/system/languages/fi.yaml b/system/languages/fi.yaml index e84c19f66..4cb547c68 100644 --- a/system/languages/fi.yaml +++ b/system/languages/fi.yaml @@ -100,8 +100,8 @@ GRAV: YR_PLURAL: v DEC_PLURAL: vuosikymmentä FORM: - VALIDATION_FAIL: Vahvistus epäonnistui: - INVALID_INPUT: Syöte ei kelpaa + VALIDATION_FAIL: 'Vahvistus epäonnistui:' + INVALID_INPUT: 'Syöte ei kelpaa' MISSING_REQUIRED_FIELD: 'Puuttuva pakollinen kenttä:' MONTHS_OF_THE_YEAR: - 'Tammikuu' diff --git a/system/languages/fr.yaml b/system/languages/fr.yaml index 9284f7e6d..d9fa177ea 100644 --- a/system/languages/fr.yaml +++ b/system/languages/fr.yaml @@ -16,6 +16,7 @@ GRAV: '/(buffal|tomat)o$/i': '\1es' '/(bu)s$/i': 'Bus' '/(alias|status)/i': 'alias|status' + '/(octop|vir)us$/i': 'virus' '/(ax|test)is$/i': '\1s' '/s$/i': 's' '/$/': 's' @@ -80,30 +81,30 @@ GRAV: YR_PLURAL: a DEC_PLURAL: décs FORM: - VALIDATION_FAIL: La validation a échoué : - INVALID_INPUT: Saisie non valide + VALIDATION_FAIL: 'La validation a échoué :' + INVALID_INPUT: 'Saisie non valide' MISSING_REQUIRED_FIELD: 'Champ obligatoire manquant :' MONTHS_OF_THE_YEAR: - - 'Janvier' - - 'Février' - - 'Mars' - - 'Avril' - - 'Mai' - - 'Juin' - - 'Juillet' - - 'Août' - - 'Septembre' - - 'Octobre' - - 'Novembre' - - 'Décembre' + - 'janvier' + - 'février' + - 'mars' + - 'avril' + - 'mai' + - 'juin' + - 'juillet' + - 'août' + - 'septembre' + - 'octobre' + - 'novembre' + - 'décembre' DAYS_OF_THE_WEEK: - - 'Lundi' - - 'Mardi' - - 'Mercredi' - - 'Jeudi' - - 'Vendredi' - - 'Samedi' - - 'Dimanche' + - 'lundi' + - 'mardi' + - 'mercredi' + - 'jeudi' + - 'vendredi' + - 'samedi' + - 'dimanche' CRON: EVERY: chaque EVERY_HOUR: toutes les heures diff --git a/system/languages/gl.yaml b/system/languages/gl.yaml new file mode 100644 index 000000000..b016c59c3 --- /dev/null +++ b/system/languages/gl.yaml @@ -0,0 +1,144 @@ +--- +GRAV: + FRONTMATTER_ERROR_PAGE: "---\ntítulo: %1$s\n---\n\n# Erro: Limiar incorrecto\n\nRuta: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1zes' + '/^(ox)$/i': '\1en' + '/([m|l])ouse$/i': '\1ice' + '/(matr|vert|ind)ix|ex$/i': '\1ices' + '/(x|ch|ss|sh)$/i': '\1es' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([^aeiouy]|qu)y$/i': '\1ies' + '/(hive)$/i': '\1s' + '/(?:([^f])fe|([lr])f)$/i': '\1\2ves' + '/sis$/i': 'ses' + '/([ti])um$/i': '\1a' + '/(buffal|tomat)o$/i': '\1oes' + '/(bu)s$/i': '\1ses' + '/(alias|status)/i': '\1' + '/(octop|vir)us$/i': '\1' + '/(ax|test)is$/i': '\1es' + '/s$/i': 's' + '/$/': 's' + INFLECTOR_SINGULAR: + '/(quiz)zes$/i': '\1ces' + '/(matr)ices$/i': '\1ix' + '/(vert|ind)ices$/i': '\1ex' + '/^(ox)en/i': '\1' + '/(alias|status)es$/i': '\1' + '/([octop|vir])i$/i': '\1' + '/(cris|ax|test)es$/i': '\1es' + '/(shoe)s$/i': '\1' + '/(o)es$/i': '\1' + '/(bus)es$/i': '\1' + '/([m|l])ice$/i': '\1ouse' + '/(x|ch|ss|sh)es$/i': '\1' + '/(m)ovies$/i': '\1ovie' + '/(s)eries$/i': '\1eries' + '/([^aeiouy]|qu)ies$/i': '\1' + '/([lr])ves$/i': '\1f' + '/(tive)s$/i': '\1' + '/(hive)s$/i': '\1' + '/([^f])ves$/i': '\1fe' + '/(^analy)ses$/i': '\1se' + '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2se' + '/([ti])a$/i': '\1um' + '/(n)ews$/i': '\1ews' + INFLECTOR_UNCOUNTABLE: + - 'equipo' + - 'información' + - 'arroz' + - 'diñeiro' + - 'especies' + - 'series' + - 'peixe' + - 'ovella' + INFLECTOR_IRREGULAR: + 'person': 'xente' + 'man': 'home' + 'child': 'neno' + 'sex': 'sexos' + 'move': 'move' + INFLECTOR_ORDINALS: + 'default': 'º' + 'first': 'º' + 'second': 'º' + 'third': 'º' + NICETIME: + NO_DATE_PROVIDED: Non fornece unha data + BAD_DATE: Data errada + AGO: hai + FROM_NOW: dende agora + JUST_NOW: xusto agora + SECOND: segundo + MINUTE: minuto + HOUR: hora + DAY: día + WEEK: semana + MONTH: mes + YEAR: ano + DECADE: década + SEC: seg + MIN: min + HR: hr + WK: Sem + MO: m + YR: a + DEC: dec + SECOND_PLURAL: segundos + MINUTE_PLURAL: minutos + HOUR_PLURAL: horas + DAY_PLURAL: días + WEEK_PLURAL: semanas + MONTH_PLURAL: meses + YEAR_PLURAL: anos + DECADE_PLURAL: décadas + SEC_PLURAL: segs + MIN_PLURAL: mins + HR_PLURAL: hrs + WK_PLURAL: sem + MO_PLURAL: mes + YR_PLURAL: a + DEC_PLURAL: deca + FORM: + VALIDATION_FAIL: 'Fallou a validación:' + INVALID_INPUT: 'Entrada incorrecta en' + MISSING_REQUIRED_FIELD: 'Falta un campo requirido:' + MONTHS_OF_THE_YEAR: + - 'xaneiro' + - 'febreiro' + - 'marzo' + - 'abril' + - 'maio' + - 'xuño' + - 'xullo' + - 'agosto' + - 'setembro' + - 'outubro' + - 'novembro' + - 'decembro' + DAYS_OF_THE_WEEK: + - 'luns' + - 'martes' + - 'mércores' + - 'xoves' + - 'venres' + - 'sábado' + - 'domingo' + CRON: + EVERY: cada + EVERY_HOUR: Cada hora + EVERY_MINUTE: Cada minuto + EVERY_DAY_OF_WEEK: cada día da semana + EVERY_DAY_OF_MONTH: cada día do mes + EVERY_MONTH: cada mes + TEXT_PERIOD: Cada + TEXT_MINS: ' dentro de minuto(s) despois da hora' + TEXT_TIME: ' dentro :' + TEXT_DOW: ' o ' + TEXT_MONTH: ' de ' + TEXT_DOM: ' o ' + ERROR1: A etiqueta %s non é compatíbel! + ERROR2: Mal número de elementos + ERROR3: O jquery_element debería estar determinado na configuración de jqCron + ERROR4: Expresión non recoñecida diff --git a/system/languages/he.yaml b/system/languages/he.yaml index afb63d7f8..d7f43186e 100644 --- a/system/languages/he.yaml +++ b/system/languages/he.yaml @@ -37,8 +37,8 @@ GRAV: YR_PLURAL: שני' DEC_PLURAL: עש' FORM: - VALIDATION_FAIL: האימות נכשל: - INVALID_INPUT: קלט לא חוקי + VALIDATION_FAIL: 'האימות נכשל:' + INVALID_INPUT: 'קלט לא חוקי' MISSING_REQUIRED_FIELD: 'שדות חובה חסרים:' MONTHS_OF_THE_YEAR: - 'ינואר' diff --git a/system/languages/hr.yaml b/system/languages/hr.yaml index 1b530b5c2..4827d3eec 100644 --- a/system/languages/hr.yaml +++ b/system/languages/hr.yaml @@ -50,8 +50,8 @@ GRAV: YR_PLURAL: g DEC_PLURAL: des FORM: - VALIDATION_FAIL: Validacija nije uspjela: - INVALID_INPUT: Pogrešan unos u + VALIDATION_FAIL: 'Validacija nije uspjela:' + INVALID_INPUT: 'Pogrešan unos u' MISSING_REQUIRED_FIELD: 'Nedostaje obavezno polje:' MONTHS_OF_THE_YEAR: - 'Siječanj' diff --git a/system/languages/hu.yaml b/system/languages/hu.yaml index a834c45c3..2624cf938 100644 --- a/system/languages/hu.yaml +++ b/system/languages/hu.yaml @@ -58,7 +58,7 @@ GRAV: YR_PLURAL: év DEC_PLURAL: évt FORM: - VALIDATION_FAIL: Érvényesítés nem sikerült: + VALIDATION_FAIL: 'Érvényesítés nem sikerült:' INVALID_INPUT: 'A megadott érték érvénytelen:' MISSING_REQUIRED_FIELD: 'Ez a kötelező mező nincs kitöltve:' MONTHS_OF_THE_YEAR: diff --git a/system/languages/id.yaml b/system/languages/id.yaml index 41431f13e..690959d85 100644 --- a/system/languages/id.yaml +++ b/system/languages/id.yaml @@ -1,6 +1,8 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Frontmatter tidak valid\n\nLokasi: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1zes' INFLECTOR_UNCOUNTABLE: - 'peralatan' - 'informasi' @@ -53,8 +55,8 @@ GRAV: YR_PLURAL: thn DEC_PLURAL: dekade FORM: - VALIDATION_FAIL: Validasi gagal: - INVALID_INPUT: Input tidak valid di + VALIDATION_FAIL: 'Validasi gagal:' + INVALID_INPUT: 'Input tidak valid di' MISSING_REQUIRED_FIELD: 'Data yang diperlukan belum terisi:' MONTHS_OF_THE_YEAR: - 'Januari' diff --git a/system/languages/is.yaml b/system/languages/is.yaml index 6f9761ca1..00d42eefa 100644 --- a/system/languages/is.yaml +++ b/system/languages/is.yaml @@ -46,8 +46,8 @@ GRAV: YR_PLURAL: árum DEC_PLURAL: árat FORM: - VALIDATION_FAIL: Sannvottun mistókst: - INVALID_INPUT: Ógilt inntak í + VALIDATION_FAIL: 'Sannvottun mistókst:' + INVALID_INPUT: 'Ógilt inntak í' MISSING_REQUIRED_FIELD: 'Vantar nauðsynlegan reit:' MONTHS_OF_THE_YEAR: - 'janúar' diff --git a/system/languages/it.yaml b/system/languages/it.yaml index 741f72189..f366eb665 100644 --- a/system/languages/it.yaml +++ b/system/languages/it.yaml @@ -1,6 +1,49 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---Titolo: %1$s---# Errore: Frontmatter non valido: '%2$s' * *%3$s * * ' '%4$s ' '" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1' + '/^(ox)$/i': '\1en' + '/([m|l])ouse$/i': '\1ice' + '/(matr|vert|ind)ix|ex$/i': '\1ices' + '/(x|ch|ss|sh)$/i': '\1es' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([^aeiouy]|qu)y$/i': '\1ies' + '/(hive)$/i': '\1s' + '/(?:([^f])fe|([lr])f)$/i': '\1\2ves' + '/sis$/i': 'ses' + '/([ti])um$/i': '\1a' + '/(buffal|tomat)o$/i': '\1oes' + '/(bu)s$/i': '\1ses' + '/(alias|status)/i': '\1es' + '/(octop|vir)us$/i': '\1i' + '/(ax|test)is$/i': '\1es' + '/s$/i': 's' + '/$/': 's' + INFLECTOR_SINGULAR: + '/(quiz)zes$/i': '\1' + '/(matr)ices$/i': '\1ix' + '/(vert|ind)ices$/i': '\1ex' + '/^(ox)en/i': '\1' + '/(alias|status)es$/i': '\1' + '/([octop|vir])i$/i': '\1us' + '/(cris|ax|test)es$/i': '\1is' + '/(shoe)s$/i': '\1' + '/(o)es$/i': '\1' + '/(bus)es$/i': '\1' + '/([m|l])ice$/i': '\1ouse' + '/(x|ch|ss|sh)es$/i': '\1' + '/(m)ovies$/i': '\1ovie' + '/(s)eries$/i': '\1eries' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([lr])ves$/i': '\1f' + '/(tive)s$/i': '\1' + '/(hive)s$/i': '\1' + '/([^f])ves$/i': '\1fe' + '/(^analy)ses$/i': '\1sis' + '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis' + '/([ti])a$/i': '\1um' + '/(n)ews$/i': '\1ews' INFLECTOR_UNCOUNTABLE: - 'dotazione' - 'informazione' @@ -58,9 +101,10 @@ GRAV: YR_PLURAL: anni DEC_PLURAL: decenni FORM: - VALIDATION_FAIL: Validazione fallita: - INVALID_INPUT: Input non valido in + VALIDATION_FAIL: 'Validazione fallita:' + INVALID_INPUT: 'Input non valido in' MISSING_REQUIRED_FIELD: 'Campo richiesto mancante:' + XSS_ISSUES: "Rilevati potenziali problemi di XSS nel campo '%s'" MONTHS_OF_THE_YEAR: - 'Gennaio' - 'Febbraio' @@ -82,6 +126,8 @@ GRAV: - 'Venerdì' - 'Sabato' - 'Domenica' + YES: "Sì" + NO: "No" CRON: EVERY: ogni EVERY_HOUR: ogni ora diff --git a/system/languages/ja.yaml b/system/languages/ja.yaml index 0e3fa16af..701d8e7ac 100644 --- a/system/languages/ja.yaml +++ b/system/languages/ja.yaml @@ -1,11 +1,22 @@ --- GRAV: + INFLECTOR_UNCOUNTABLE: + - 'equipment' + - '情報' + - 'rice' + - 'お金' + - 'species' + - 'series' + - '魚' + - 'ヒツジ' INFLECTOR_IRREGULAR: 'person': 'みんな' 'man': '人' 'child': '子供' 'sex': '性別' 'move': '移動' + INFLECTOR_ORDINALS: + 'first': '番目' NICETIME: NO_DATE_PROVIDED: 日付が設定されていません BAD_DATE: 不正な日付 @@ -40,8 +51,8 @@ GRAV: YR_PLURAL: 年 DEC_PLURAL: 10年 FORM: - VALIDATION_FAIL: バリデーション失敗 : - INVALID_INPUT: 不正な入力: + VALIDATION_FAIL: 'バリデーション失敗 :' + INVALID_INPUT: '不正な入力:' MISSING_REQUIRED_FIELD: '必須項目が入力されていません:' MONTHS_OF_THE_YEAR: - '1月' @@ -64,3 +75,7 @@ GRAV: - '金' - '土' - '日' + CRON: + EVERY: 毎 + EVERY_MONTH: 毎月 + ERROR1: 共有タイプ %s はサポートされていません diff --git a/system/languages/ko.yaml b/system/languages/ko.yaml index 6676a6d25..15aee8ea2 100644 --- a/system/languages/ko.yaml +++ b/system/languages/ko.yaml @@ -37,8 +37,8 @@ GRAV: YR_PLURAL: 년 DEC_PLURAL: 년간 FORM: - VALIDATION_FAIL: 유효성 검사 실패: - INVALID_INPUT: 잘못된 입력 + VALIDATION_FAIL: '유효성 검사 실패:' + INVALID_INPUT: '잘못된 입력' MISSING_REQUIRED_FIELD: '누락 된 필수 필드:' MONTHS_OF_THE_YEAR: - '일월' diff --git a/system/languages/lt.yaml b/system/languages/lt.yaml index aca0fc37f..d894b969e 100644 --- a/system/languages/lt.yaml +++ b/system/languages/lt.yaml @@ -52,8 +52,8 @@ GRAV: YR_PLURAL: m. DEC_PLURAL: dešimtmečiai FORM: - VALIDATION_FAIL: Patvirtinimas nepavyko: - INVALID_INPUT: Neteisingai įvesta į + VALIDATION_FAIL: 'Patvirtinimas nepavyko:' + INVALID_INPUT: 'Neteisingai įvesta į' MISSING_REQUIRED_FIELD: 'Būtina užpildyti laukelį:' MONTHS_OF_THE_YEAR: - 'Sausis' diff --git a/system/languages/nl.yaml b/system/languages/nl.yaml index 9706d03e5..bd0aed915 100644 --- a/system/languages/nl.yaml +++ b/system/languages/nl.yaml @@ -101,8 +101,8 @@ GRAV: YR_PLURAL: jaren DEC_PLURAL: decennia FORM: - VALIDATION_FAIL: Validatie mislukt: - INVALID_INPUT: Ongeldige invoer in + VALIDATION_FAIL: 'Validatie mislukt:' + INVALID_INPUT: 'Ongeldige invoer in' MISSING_REQUIRED_FIELD: 'Ontbrekend verplicht veld:' MONTHS_OF_THE_YEAR: - 'Januari' diff --git a/system/languages/no.yaml b/system/languages/no.yaml index 5b57938e3..2a93e6efa 100644 --- a/system/languages/no.yaml +++ b/system/languages/no.yaml @@ -21,6 +21,7 @@ GRAV: BAD_DATE: Ugyldig dato AGO: siden FROM_NOW: fra nå + JUST_NOW: akkurat nå SECOND: sekund MINUTE: minutt HOUR: time @@ -51,8 +52,8 @@ GRAV: YR_PLURAL: år DEC_PLURAL: årtier FORM: - VALIDATION_FAIL: Godkjenning mislyktes: - INVALID_INPUT: Ugyldig innhold i + VALIDATION_FAIL: 'Godkjenning mislyktes:' + INVALID_INPUT: 'Ugyldig innhold i' MISSING_REQUIRED_FIELD: 'Mangler påkrevd felt:' MONTHS_OF_THE_YEAR: - 'januar' @@ -75,3 +76,7 @@ GRAV: - 'fredag' - 'lørdag' - 'søndag' + CRON: + EVERY: hver + EVERY_HOUR: hver time + EVERY_MINUTE: hvert minutt diff --git a/system/languages/pl.yaml b/system/languages/pl.yaml index bf6fe3712..6da24e5a6 100644 --- a/system/languages/pl.yaml +++ b/system/languages/pl.yaml @@ -1,11 +1,32 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Error: Nieprawidłowy Frontmatter\n\nPath: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_SINGULAR: + '/(alias|status)es$/i': '\1' + INFLECTOR_UNCOUNTABLE: + - 'wyposażenie' + - 'informacja' + - 'rice' + - 'pieniądze' + - 'species' + - 'series' + - 'ryba' + - 'owca' + INFLECTOR_IRREGULAR: + 'person': 'człowiek' + 'man': 'mężczyźni' + 'child': 'dzieci' + 'sex': 'płci' + INFLECTOR_ORDINALS: + 'first': 'pierwszy' + 'second': 'drugi' + 'third': 'trzeci' NICETIME: NO_DATE_PROVIDED: Nie podano daty BAD_DATE: Zła data AGO: temu FROM_NOW: od teraz + JUST_NOW: właśnie teraz SECOND: sekunda MINUTE: minuta HOUR: godzina @@ -15,6 +36,7 @@ GRAV: YEAR: rok DECADE: dekada SEC: sek + MIN: minuta HR: godz WK: tydz MO: m-c @@ -36,9 +58,10 @@ GRAV: YR_PLURAL: lat DEC_PLURAL: dekad FORM: - VALIDATION_FAIL: Weryfikacja nie powiodła się: - INVALID_INPUT: Nieprawidłowe dane wejściowe + VALIDATION_FAIL: 'Weryfikacja nie powiodła się:' + INVALID_INPUT: 'Nieprawidłowe dane wejściowe' MISSING_REQUIRED_FIELD: 'Opuszczono wymagane pole:' + XSS_ISSUES: "Potencjalne problemy XSS wykryte w polu '%s'" MONTHS_OF_THE_YEAR: - 'Styczeń' - 'Luty' @@ -60,3 +83,18 @@ GRAV: - 'Piątek' - 'Sobota' - 'Niedziela' + YES: "Tak" + NO: "Nie" + CRON: + EVERY: każdy + EVERY_HOUR: każdą godzinę + EVERY_MINUTE: każdą minutę + EVERY_DAY_OF_WEEK: każdego dnia tygodnia + EVERY_DAY_OF_MONTH: każdego dnia miesiące + EVERY_MONTH: każdego miesiąca + TEXT_PERIOD: Każdego + TEXT_MINS: 'o minut po godzinie' + TEXT_TIME: 'o :' + ERROR1: Znacznik %s nie jest wspierany! + ERROR2: Nieprawidłowa liczba elementów + ERROR4: Wyrażenie nierozpoznane diff --git a/system/languages/pt.yaml b/system/languages/pt.yaml index 590b5e581..2da6944d1 100644 --- a/system/languages/pt.yaml +++ b/system/languages/pt.yaml @@ -1,8 +1,75 @@ --- GRAV: + FRONTMATTER_ERROR_PAGE: "---\ntitle: %1$s\n---\n\n# Erro: Frontmatter Inválido\n\nLocalização: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1zes' + '/^(ox)$/i': '\1en' + '/([m|l])ouse$/i': '\1ice' + '/(matr|vert|ind)ix|ex$/i': '\1ices' + '/(x|ch|ss|sh)$/i': '\1es' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([^aeiouy]|qu)y$/i': '\1ies' + '/(hive)$/i': '\1s' + '/(?:([^f])fe|([lr])f)$/i': '\1\2ves' + '/sis$/i': 'ses' + '/([ti])um$/i': '\1a' + '/(buffal|tomat)o$/i': '\1oes' + '/(bu)s$/i': '\1ses' + '/(alias|status)/i': '\1es' + '/(octop|vir)us$/i': '\1i' + '/(ax|test)is$/i': '\1es' + '/s$/i': 's' + '/$/': 's' + INFLECTOR_SINGULAR: + '/(quiz)zes$/i': '\1' + '/(matr)ices$/i': '\1ix' + '/(vert|ind)ices$/i': '\1ex' + '/^(ox)en/i': '\1' + '/(alias|status)es$/i': '\1' + '/([octop|vir])i$/i': '\1us' + '/(cris|ax|test)es$/i': '\1is' + '/(shoe)s$/i': '\1' + '/(o)es$/i': '\1' + '/(bus)es$/i': '\1' + '/([m|l])ice$/i': '\1ouse' + '/(x|ch|ss|sh)es$/i': '\1' + '/(m)ovies$/i': '\1ovie' + '/(s)eries$/i': '\1eries' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([lr])ves$/i': '\1f' + '/(tive)s$/i': '\1' + '/(hive)s$/i': '\1' + '/([^f])ves$/i': '\1fe' + '/(^analy)ses$/i': '\1sis' + '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis' + '/([ti])a$/i': '\1um' + '/(n)ews$/i': '\1ews' + INFLECTOR_UNCOUNTABLE: + - 'equipamento' + - 'informação' + - 'arroz' + - 'dinheiro' + - 'espécie' + - 'série' + - 'peixe' + - 'ovelha' + INFLECTOR_IRREGULAR: + 'person': 'pessoas' + 'man': 'homens' + 'child': 'crianças' + 'sex': 'sexos' + 'move': 'movimentos' + INFLECTOR_ORDINALS: + 'default': 'º' + 'first': 'º' + 'second': 'º' + 'third': 'º' NICETIME: NO_DATE_PROVIDED: Nenhuma data fornecida + BAD_DATE: Data inválida AGO: atrás + FROM_NOW: a partir de agora + JUST_NOW: mesmo agora SECOND: segundo MINUTE: minuto HOUR: hora @@ -11,17 +78,32 @@ GRAV: MONTH: mês YEAR: ano DECADE: década - SEC: segundos - MIN: minutos + SEC: seg + MIN: min + HR: hora + WK: semana + MO: mês + YR: ano + DEC: década + SECOND_PLURAL: segundos MINUTE_PLURAL: minutos + HOUR_PLURAL: horas DAY_PLURAL: dias WEEK_PLURAL: semanas MONTH_PLURAL: meses YEAR_PLURAL: anos - DECADE_PLURAL: decadas + DECADE_PLURAL: décadas + SEC_PLURAL: segs + MIN_PLURAL: mins + HR_PLURAL: hrs + WK_PLURAL: sems + MO_PLURAL: meses + YR_PLURAL: anos + DEC_PLURAL: décadas FORM: - VALIDATION_FAIL: Falha na validação! - MISSING_REQUIRED_FIELD: 'Campo obrigatório requerido:' + VALIDATION_FAIL: 'Falha na validação:' + INVALID_INPUT: 'Dados inseridos são inválidos em' + MISSING_REQUIRED_FIELD: 'Campo obrigatório em falta:' MONTHS_OF_THE_YEAR: - 'Janeiro' - 'Fevereiro' @@ -35,12 +117,28 @@ GRAV: - 'Outubro' - 'Novembro' - 'Dezembro' - INFLECTOR_UNCOUNTABLE: - - 'equipment' - - 'information' - - 'arroz' - - 'money' - - 'species' - - 'series' - - 'fish' - - 'sheep' + DAYS_OF_THE_WEEK: + - 'Segunda-feira' + - 'Terça-feira' + - 'Quarta-feira' + - 'Quinta-feira' + - 'Sexta-feira' + - 'Sábado' + - 'Domingo' + CRON: + EVERY: cada + EVERY_HOUR: cada hora + EVERY_MINUTE: cada minuto + EVERY_DAY_OF_WEEK: todos os dias da semana + EVERY_DAY_OF_MONTH: todos os dias do mês + EVERY_MONTH: todos os meses + TEXT_PERIOD: Cada + TEXT_MINS: ' em minuto(s) após a hora' + TEXT_TIME: ' em :' + TEXT_DOW: ' em ' + TEXT_MONTH: ' de ' + TEXT_DOM: ' em ' + ERROR1: A tag %s não é suportada! + ERROR2: Número de elementos inválido + ERROR3: O jquery_element deve ser definido nas configurações do jqCron + ERROR4: Expressão não reconhecida diff --git a/system/languages/ro.yaml b/system/languages/ro.yaml index 5bee578c9..dc22b206f 100644 --- a/system/languages/ro.yaml +++ b/system/languages/ro.yaml @@ -53,8 +53,8 @@ GRAV: YR_PLURAL: ani DEC_PLURAL: decenii FORM: - VALIDATION_FAIL: Validare nereușită - INVALID_INPUT: Date incorecte în + VALIDATION_FAIL: 'Validare nereușită' + INVALID_INPUT: 'Date incorecte în' MISSING_REQUIRED_FIELD: 'Câmp obligatoriu lipsă:' MONTHS_OF_THE_YEAR: - 'Ianuarie' diff --git a/system/languages/ru.yaml b/system/languages/ru.yaml index 78c596340..2097ada48 100644 --- a/system/languages/ru.yaml +++ b/system/languages/ru.yaml @@ -13,7 +13,7 @@ GRAV: INFLECTOR_IRREGULAR: 'person': 'люди' 'man': 'человек' - 'child': 'ребенок' + 'child': 'дети' 'sex': 'пол' 'move': 'движется' INFLECTOR_ORDINALS: @@ -58,9 +58,10 @@ GRAV: YR_PLURAL: г DEC_PLURAL: дстлт FORM: - VALIDATION_FAIL: Проверка не удалась: - INVALID_INPUT: Неверный ввод в + VALIDATION_FAIL: 'Проверка не удалась:' + INVALID_INPUT: 'Неверный ввод в' MISSING_REQUIRED_FIELD: 'Отсутствует необходимое поле:' + XSS_ISSUES: "Обнаружены потенциальные XSS проблемы в поле '%s'" MONTHS_OF_THE_YEAR: - 'январь' - 'февраль' @@ -68,12 +69,12 @@ GRAV: - 'апрель' - 'май' - 'июнь' - - 'Июль' - - 'Август' - - 'Сентябрь' - - 'Октябрь' - - 'Ноябрь' - - 'Декабрь' + - 'июль' + - 'август' + - 'сентябрь' + - 'октябрь' + - 'ноябрь' + - 'декабрь' DAYS_OF_THE_WEEK: - 'понедельник' - 'вторник' @@ -82,6 +83,8 @@ GRAV: - 'пятница' - 'суббота' - 'воскресенье' + YES: "Да" + NO: "Нет" CRON: EVERY: раз в EVERY_HOUR: раз в час diff --git a/system/languages/sk.yaml b/system/languages/sk.yaml index 89a7f563e..9543239a6 100644 --- a/system/languages/sk.yaml +++ b/system/languages/sk.yaml @@ -101,8 +101,8 @@ GRAV: YR_PLURAL: rokov DEC_PLURAL: dekád FORM: - VALIDATION_FAIL: Overenie zlyhalo: - INVALID_INPUT: Neplatný vstup v + VALIDATION_FAIL: 'Overenie zlyhalo:' + INVALID_INPUT: 'Neplatný vstup v' MISSING_REQUIRED_FIELD: 'Chýba vyžadované pole:' MONTHS_OF_THE_YEAR: - 'Január' diff --git a/system/languages/sl.yaml b/system/languages/sl.yaml index ae6032cf7..879fe1bae 100644 --- a/system/languages/sl.yaml +++ b/system/languages/sl.yaml @@ -36,8 +36,8 @@ GRAV: YR_PLURAL: l DEC_PLURAL: des FORM: - VALIDATION_FAIL: Preverjanje veljavnosti ni uspelo: - INVALID_INPUT: Neveljaven vnos v + VALIDATION_FAIL: 'Preverjanje veljavnosti ni uspelo:' + INVALID_INPUT: 'Neveljaven vnos v' MISSING_REQUIRED_FIELD: 'Manjka obvezno polje:' MONTHS_OF_THE_YEAR: - 'Januar' diff --git a/system/languages/sr.yaml b/system/languages/sr.yaml new file mode 100644 index 000000000..3368bdfb6 --- /dev/null +++ b/system/languages/sr.yaml @@ -0,0 +1,144 @@ +--- +GRAV: + FRONTMATTER_ERROR_PAGE: "---\nнаслов: %1$s\n---\n\n# Грешка: неисправан Frontmatter\n\nПутања: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1zes' + '/^(ox)$/i': '\1en' + '/([m|l])ouse$/i': '\1ice' + '/(matr|vert|ind)ix|ex$/i': '\1ices' + '/(x|ch|ss|sh)$/i': '\1es' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([^aeiouy]|qu)y$/i': '\1ies' + '/(hive)$/i': '\1s' + '/(?:([^f])fe|([lr])f)$/i': '\1\2ves' + '/sis$/i': 'ses' + '/([ti])um$/i': '\1a' + '/(buffal|tomat)o$/i': '\1oes' + '/(bu)s$/i': '\1ses' + '/(alias|status)/i': '\1es' + '/(octop|vir)us$/i': '\1i' + '/(ax|test)is$/i': '\1es' + '/s$/i': 's' + '/$/': 's' + INFLECTOR_SINGULAR: + '/(quiz)zes$/i': '\1' + '/(matr)ices$/i': '\1ix' + '/(vert|ind)ices$/i': '\1ex' + '/^(ox)en/i': '\1' + '/(alias|status)es$/i': '\1' + '/([octop|vir])i$/i': '\1us' + '/(cris|ax|test)es$/i': '\1is' + '/(shoe)s$/i': '\1' + '/(o)es$/i': '\1' + '/(bus)es$/i': '\1' + '/([m|l])ice$/i': '\1ouse' + '/(x|ch|ss|sh)es$/i': '\1' + '/(m)ovies$/i': '\1ovie' + '/(s)eries$/i': '\1eries' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([lr])ves$/i': '\1f' + '/(tive)s$/i': '\1' + '/(hive)s$/i': '\1' + '/([^f])ves$/i': '\1fe' + '/(^analy)ses$/i': '\1sis' + '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis' + '/([ti])a$/i': '\1um' + '/(n)ews$/i': '\1ews' + INFLECTOR_UNCOUNTABLE: + - 'опрема' + - 'информација' + - 'пиринач' + - 'новац' + - 'врсте' + - 'серије' + - 'риба' + - 'овца' + INFLECTOR_IRREGULAR: + 'person': 'особе' + 'man': 'људи' + 'child': 'деца' + 'sex': 'полови' + 'move': 'помери' + INFLECTOR_ORDINALS: + 'default': 'ти' + 'first': 'први' + 'second': 'други' + 'third': 'трећи' + NICETIME: + NO_DATE_PROVIDED: Нема датума + BAD_DATE: Погрешан датум + AGO: од пре + FROM_NOW: од сада + JUST_NOW: управо сада + SECOND: секунда + MINUTE: минута + HOUR: сат + DAY: дан + WEEK: недеља + MONTH: месец + YEAR: година + DECADE: декада + SEC: сек + MIN: мин + HR: сат + WK: нед + MO: мес + YR: год + DEC: дек + SECOND_PLURAL: секунди + MINUTE_PLURAL: минута + HOUR_PLURAL: сати + DAY_PLURAL: дана + WEEK_PLURAL: недеља + MONTH_PLURAL: месеци + YEAR_PLURAL: године(а) + DECADE_PLURAL: декаде(а) + SEC_PLURAL: сек + MIN_PLURAL: мин + HR_PLURAL: сати + WK_PLURAL: недеља + MO_PLURAL: месеци + YR_PLURAL: година + DEC_PLURAL: декада + FORM: + VALIDATION_FAIL: 'Провера неуспела:' + INVALID_INPUT: 'Неисправан унос у' + MISSING_REQUIRED_FIELD: 'Недостаје обавезн поље:' + MONTHS_OF_THE_YEAR: + - 'Јануар' + - 'Фебруар' + - 'Март' + - 'Април' + - 'Мај' + - 'Јуни' + - 'Јули' + - 'Август' + - 'Септембар' + - 'Октобар' + - 'Новембар' + - 'Децембар' + DAYS_OF_THE_WEEK: + - 'Понедељак' + - 'Уторак' + - 'Среда' + - 'Четвртак' + - 'Петак' + - 'Субота' + - 'Недеља' + CRON: + EVERY: сваки + EVERY_HOUR: сваки сат + EVERY_MINUTE: сваки минут + EVERY_DAY_OF_WEEK: сваки дан у недељи + EVERY_DAY_OF_MONTH: сваки дан у месецу + EVERY_MONTH: сваки месец + TEXT_PERIOD: Сваки + TEXT_MINS: ' у минути(а) прошлог сата' + TEXT_TIME: ' у :' + TEXT_DOW: ' на ' + TEXT_MONTH: ' од ' + TEXT_DOM: ' на ' + ERROR1: Таг %s није подржан! + ERROR2: Погрешан број елемената + ERROR3: јquery_element би требао да буде постављен у jqCron подешавању + ERROR4: Непрепознат израз diff --git a/system/languages/sv.yaml b/system/languages/sv.yaml index 16afa1650..bf76beff5 100644 --- a/system/languages/sv.yaml +++ b/system/languages/sv.yaml @@ -12,11 +12,21 @@ GRAV: - 'får' INFLECTOR_IRREGULAR: 'person': 'personer' + 'man': 'män' + 'child': 'barn' + 'sex': 'kön' + 'move': 'flytta' + INFLECTOR_ORDINALS: + 'default': ':e' + 'first': ':a' + 'second': ':a' + 'third': ':e' NICETIME: NO_DATE_PROVIDED: Inget datum har angivits BAD_DATE: Ogiltigt datum AGO: sedan FROM_NOW: fr.o.m nu + JUST_NOW: just nu SECOND: sekund MINUTE: minut HOUR: timme @@ -26,10 +36,12 @@ GRAV: YEAR: år DECADE: årtionde SEC: sek + MIN: min HR: t WK: v MO: m YR: år + DEC: dec SECOND_PLURAL: sekunder MINUTE_PLURAL: minuter HOUR_PLURAL: timmar @@ -46,8 +58,8 @@ GRAV: YR_PLURAL: år DEC_PLURAL: dec FORM: - VALIDATION_FAIL: Kontrollen misslyckades: - INVALID_INPUT: Ogiltig indata i + VALIDATION_FAIL: 'Kontrollen misslyckades:' + INVALID_INPUT: 'Ogiltig indata i' MISSING_REQUIRED_FIELD: 'Obligatoriskt fält måste fyllas i:' MONTHS_OF_THE_YEAR: - 'Januari' @@ -70,3 +82,19 @@ GRAV: - 'Fredag' - 'Lördag' - 'Söndag' + CRON: + EVERY: varje + EVERY_HOUR: varje timme + EVERY_MINUTE: varje minut + EVERY_DAY_OF_WEEK: varje veckodag + EVERY_DAY_OF_MONTH: alla månadens dagar + EVERY_MONTH: varje månad + TEXT_PERIOD: Varje + TEXT_MINS: ' timmens :e minut' + TEXT_TIME: ' kl :' + TEXT_DOW: ' ' + TEXT_MONTH: ' ' + TEXT_DOM: ' ' + ERROR1: Taggen %s stöds inte! + ERROR2: Ogiltigt antal element + ERROR4: Uttrycket känns inte igen diff --git a/system/languages/th.yaml b/system/languages/th.yaml index e6ccfaba5..f71b0371b 100644 --- a/system/languages/th.yaml +++ b/system/languages/th.yaml @@ -31,7 +31,7 @@ GRAV: YR_PLURAL: ปี FORM: VALIDATION_FAIL: 'ตรวจสอบล้มเหลว: ' - INVALID_INPUT: ป้อนข้อมูลไม่ถูกต้องใน + INVALID_INPUT: 'ป้อนข้อมูลไม่ถูกต้องใน' MISSING_REQUIRED_FIELD: 'ขาดข้อมูลที่จำเป็น:' MONTHS_OF_THE_YEAR: - 'มกราคม' diff --git a/system/languages/tr.yaml b/system/languages/tr.yaml index 2143f319c..783674d58 100644 --- a/system/languages/tr.yaml +++ b/system/languages/tr.yaml @@ -1,11 +1,32 @@ --- GRAV: FRONTMATTER_ERROR_PAGE: "---\nBaşlık: %1$s\n---\n\n# Hata: Geçersiz Önbölüm\n\nYol: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_UNCOUNTABLE: + - 'ekipman' + - 'bilgi' + - 'pirinç' + - 'para' + - 'türler' + - 'seriler' + - 'balık' + - 'koyun' + INFLECTOR_IRREGULAR: + 'person': 'kişi' + 'man': 'erkek' + 'child': 'çocuklar' + 'sex': 'cinsiyet' + 'move': 'taşınmış' + INFLECTOR_ORDINALS: + 'default': '#F' + 'first': ' 1.' + 'second': ' 2.' + 'third': ' 3.' NICETIME: NO_DATE_PROVIDED: Sağlanan tarih yok BAD_DATE: Yanlış tarih AGO: önce FROM_NOW: şu andan itibaren + JUST_NOW: şimdi SECOND: saniye MINUTE: dakika HOUR: saat @@ -37,8 +58,8 @@ GRAV: YR_PLURAL: yıl DEC_PLURAL: onyl FORM: - VALIDATION_FAIL: Doğrulama başarısız: - INVALID_INPUT: Geçersiz bilgi girişi + VALIDATION_FAIL: 'Doğrulama başarısız:' + INVALID_INPUT: 'Geçersiz bilgi girişi' MISSING_REQUIRED_FIELD: 'Gerekli alan eksik:' MONTHS_OF_THE_YEAR: - 'Ocak' @@ -61,3 +82,17 @@ GRAV: - 'Cuma' - 'Cumartesi' - 'Pazar' + CRON: + EVERY: her + EVERY_HOUR: saatte bir + EVERY_MINUTE: dakikada bir + EVERY_DAY_OF_WEEK: haftanın her günü + EVERY_DAY_OF_MONTH: ayın her günü + EVERY_MONTH: her ay + TEXT_PERIOD: Her + TEXT_MINS: ' saatin dakikasında' + TEXT_TIME: ' da' + ERROR1: Etiket %s desteklenmiyor! + ERROR2: Kötü eleman sayısı + ERROR3: jquery_element jqCron ayarları içinde tanımlanmalı + ERROR4: Tanınmayan ifade diff --git a/system/languages/uk.yaml b/system/languages/uk.yaml index d264fbada..8a138a483 100644 --- a/system/languages/uk.yaml +++ b/system/languages/uk.yaml @@ -37,8 +37,8 @@ GRAV: YR_PLURAL: рр. DEC_PLURAL: рр. FORM: - VALIDATION_FAIL: Перевірка не вдалася: - INVALID_INPUT: Невірне введення в + VALIDATION_FAIL: 'Перевірка не вдалася:' + INVALID_INPUT: 'Невірне введення в' MISSING_REQUIRED_FIELD: 'Відсутнє обов''язкове поле:' MONTHS_OF_THE_YEAR: - 'Січень' diff --git a/system/languages/vi.yaml b/system/languages/vi.yaml index 0dc7e929f..9e3a0f46b 100644 --- a/system/languages/vi.yaml +++ b/system/languages/vi.yaml @@ -37,8 +37,8 @@ GRAV: YR_PLURAL: năm DEC_PLURAL: thập kỷ FORM: - VALIDATION_FAIL: Xác nhận thất bại: - INVALID_INPUT: Dữ liệu nhập không hợp lệ cho + VALIDATION_FAIL: 'Xác nhận thất bại:' + INVALID_INPUT: 'Dữ liệu nhập không hợp lệ cho' MISSING_REQUIRED_FIELD: 'Thiếu trường bắt buộc:' MONTHS_OF_THE_YEAR: - 'Tháng 1' diff --git a/system/languages/zh-cn.yaml b/system/languages/zh-cn.yaml new file mode 100644 index 000000000..334b0b41c --- /dev/null +++ b/system/languages/zh-cn.yaml @@ -0,0 +1,144 @@ +--- +GRAV: + FRONTMATTER_ERROR_PAGE: "---\n标题: %1$s\n---\n\n# 错误:无效参数\n\n位置: `%2$s`\n\n**%3$s**\n\n```\n%4$s\n```" + INFLECTOR_PLURALS: + '/(quiz)$/i': '\1zes' + '/^(ox)$/i': '\1en' + '/([m|l])ouse$/i': '\1ice' + '/(matr|vert|ind)ix|ex$/i': '\1ices' + '/(x|ch|ss|sh)$/i': '\1es' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([^aeiouy]|qu)y$/i': '\1ies' + '/(hive)$/i': '\1s' + '/(?:([^f])fe|([lr])f)$/i': '\1\2ves' + '/sis$/i': 'ses' + '/([ti])um$/i': '\1a' + '/(buffal|tomat)o$/i': '\1oes' + '/(bu)s$/i': '\1ses' + '/(alias|status)/i': '\1es' + '/(octop|vir)us$/i': '\1i' + '/(ax|test)is$/i': '\1es' + '/s$/i': 's' + '/$/': 's' + INFLECTOR_SINGULAR: + '/(quiz)zes$/i': '\1' + '/(matr)ices$/i': '\1ix' + '/(vert|ind)ices$/i': '\1ex' + '/^(ox)en/i': '\1' + '/(alias|status)es$/i': '\1' + '/([octop|vir])i$/i': '\1us' + '/(cris|ax|test)es$/i': '\1is' + '/(shoe)s$/i': '\1' + '/(o)es$/i': '\1' + '/(bus)es$/i': '\1' + '/([m|l])ice$/i': '\1ouse' + '/(x|ch|ss|sh)es$/i': '\1' + '/(m)ovies$/i': '\1ovie' + '/(s)eries$/i': '\1eries' + '/([^aeiouy]|qu)ies$/i': '\1y' + '/([lr])ves$/i': '\1f' + '/(tive)s$/i': '\1' + '/(hive)s$/i': '\1' + '/([^f])ves$/i': '\1fe' + '/(^analy)ses$/i': '\1sis' + '/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i': '\1\2sis' + '/([ti])a$/i': '\1um' + '/(n)ews$/i': '\1ews' + INFLECTOR_UNCOUNTABLE: + - '装备' + - '信息' + - '大米' + - '钱' + - '物种' + - '系列' + - '鱼' + - '羊' + INFLECTOR_IRREGULAR: + 'person': '人员' + 'man': '男人' + 'child': '儿童' + 'sex': '性别' + 'move': '移动' + INFLECTOR_ORDINALS: + 'default': 'th' + 'first': 'st' + 'second': 'md' + 'third': 'rd' + NICETIME: + NO_DATE_PROVIDED: 无日期信息 + BAD_DATE: 无效日期 + AGO: 前 + FROM_NOW: 距今 + JUST_NOW: 刚刚 + SECOND: 秒 + MINUTE: 分钟 + HOUR: 小时 + DAY: 天 + WEEK: 周 + MONTH: 月 + YEAR: 年 + DECADE: 十年 + SEC: 秒 + MIN: 分钟 + HR: 小时 + WK: 周 + MO: 月 + YR: 年 + DEC: 年代 + SECOND_PLURAL: 秒 + MINUTE_PLURAL: 分 + HOUR_PLURAL: 小时 + DAY_PLURAL: 天 + WEEK_PLURAL: 周 + MONTH_PLURAL: 月 + YEAR_PLURAL: 年 + DECADE_PLURAL: 十年 + SEC_PLURAL: 秒 + MIN_PLURAL: 分 + HR_PLURAL: 时 + WK_PLURAL: 周 + MO_PLURAL: 月 + YR_PLURAL: 年 + DEC_PLURAL: 年代 + FORM: + VALIDATION_FAIL: '验证失败:' + INVALID_INPUT: '无效输入' + MISSING_REQUIRED_FIELD: '必填字段缺失:' + MONTHS_OF_THE_YEAR: + - '1月' + - '2月' + - '3月' + - '4月' + - '5月' + - '6月' + - '7月' + - '8月' + - '9月' + - '10月' + - '11月' + - '12月' + DAYS_OF_THE_WEEK: + - '星期一' + - '星期二' + - '星期三' + - '星期四' + - '星期五' + - '星期六' + - '星期日' + CRON: + EVERY: 每隔 + EVERY_HOUR: 每小时 + EVERY_MINUTE: 每分钟 + EVERY_DAY_OF_WEEK: 一周中的每一天 + EVERY_DAY_OF_MONTH: 月份中的每一天 + EVERY_MONTH: 每月 + TEXT_PERIOD: 所有 + TEXT_MINS: ' 在 小时过后的分钟' + TEXT_TIME: ' 在 :' + TEXT_DOW: ' on ' + TEXT_MONTH: ' of ' + TEXT_DOM: ' on ' + ERROR1: 不支持分享类型 %s + ERROR2: 无效数字 + ERROR3: 请在 jqCron 设置中设定 jquery_element + ERROR4: 无法识别表达式 diff --git a/system/languages/zh.yaml b/system/languages/zh.yaml index 4912aa9ed..334b0b41c 100644 --- a/system/languages/zh.yaml +++ b/system/languages/zh.yaml @@ -101,9 +101,9 @@ GRAV: YR_PLURAL: 年 DEC_PLURAL: 年代 FORM: - VALIDATION_FAIL: 验证失败: - INVALID_INPUT: 无效输入 - MISSING_REQUIRED_FIELD: 必填字段缺失: + VALIDATION_FAIL: '验证失败:' + INVALID_INPUT: '无效输入' + MISSING_REQUIRED_FIELD: '必填字段缺失:' MONTHS_OF_THE_YEAR: - '1月' - '2月' diff --git a/system/src/Grav/Common/Themes.php b/system/src/Grav/Common/Themes.php index 45bea5e4b..6adeea09e 100644 --- a/system/src/Grav/Common/Themes.php +++ b/system/src/Grav/Common/Themes.php @@ -318,6 +318,7 @@ class Themes extends Iterator /** * Load theme languages. + * Reads ALL language files from theme stream and merges them. * * @param Config $config Configuration class * @return void @@ -328,13 +329,13 @@ class Themes extends Iterator $locator = $this->grav['locator']; if ($config->get('system.languages.translations', true)) { - $language_file = $locator->findResource('theme://languages' . YAML_EXT); - if ($language_file) { + $language_files = array_reverse($locator->findResources('theme://languages' . YAML_EXT)); + foreach ($language_files as $language_file) { $language = CompiledYamlFile::instance($language_file)->content(); $this->grav['languages']->mergeRecursive($language); } - $languages_folder = $locator->findResource('theme://languages'); - if (file_exists($languages_folder)) { + $languages_folders = array_reverse($locator->findResources('theme://languages')); + foreach ($languages_folders as $languages_folder) { $languages = []; $iterator = new DirectoryIterator($languages_folder); foreach ($iterator as $file) {