Merge remote-tracking branch 'upstream/develop' into develop

This commit is contained in:
gianantoniopini
2021-01-20 15:53:29 +01:00
2 changed files with 11 additions and 3 deletions

View File

@ -44,34 +44,42 @@ module.exports = {
{ {
family: 'Lato', family: 'Lato',
variants: ['400', '700'], variants: ['400', '700'],
subsets: ['latin-ext'],
}, },
{ {
family: 'Montserrat', family: 'Montserrat',
variants: ['400', '500', '600', '700'], variants: ['400', '500', '600', '700'],
subsets: ['latin-ext'],
}, },
{ {
family: 'Nunito', family: 'Nunito',
variants: ['400', '600', '700'], variants: ['400', '600', '700'],
subsets: ['latin-ext'],
}, },
{ {
family: 'Open Sans', family: 'Open Sans',
variants: ['400', '600', '700'], variants: ['400', '600', '700'],
subsets: ['latin-ext'],
}, },
{ {
family: 'Raleway', family: 'Raleway',
variants: ['400', '500', '700'], variants: ['400', '500', '700'],
subsets: ['latin-ext'],
}, },
{ {
family: 'Rubik', family: 'Rubik',
variants: ['400', '500', '700'], variants: ['400', '500', '700'],
subsets: ['latin-ext'],
}, },
{ {
family: 'Source Sans Pro', family: 'Source Sans Pro',
variants: ['400', '600', '700'], variants: ['400', '600', '700'],
subsets: ['latin-ext'],
}, },
{ {
family: 'Titillium Web', family: 'Titillium Web',
variants: ['400', '600', '700'], variants: ['400', '600', '700'],
subsets: ['latin-ext'],
}, },
], ],
}, },

View File

@ -31,7 +31,7 @@
"edit": "Edytuj", "edit": "Edytuj",
"cancel": "Anuluj", "cancel": "Anuluj",
"delete": "Usuń", "delete": "Usuń",
"loading": "Ładuję...", "loading": "Wczytywanie...",
"confirmation": "Na pewno?", "confirmation": "Na pewno?",
"login": "Login", "login": "Login",
"logout": "Wyloguj" "logout": "Wyloguj"
@ -71,7 +71,7 @@
"work": "Doświadczenie zawodowe", "work": "Doświadczenie zawodowe",
"education": "Wyksztłacenie", "education": "Wyksztłacenie",
"project": "Projekt", "project": "Projekt",
"projects": "Ptojekty", "projects": "Projekty",
"award": "Nagroda", "award": "Nagroda",
"awards": "Nagrody", "awards": "Nagrody",
"certification": "Certyfikat", "certification": "Certyfikat",
@ -96,7 +96,7 @@
"photograph": "Fotografia", "photograph": "Fotografia",
"firstName": "Imię", "firstName": "Imię",
"lastName": "Nazwisko", "lastName": "Nazwisko",
"birthDate": "Data urodzin", "birthDate": "Data urodzenia",
"address": { "address": {
"line1": "Pole adresowe 1", "line1": "Pole adresowe 1",
"line2": "Pole adresowe 2", "line2": "Pole adresowe 2",