Merge branch 'master' into glitch-soc/merge-upstream

This commit is contained in:
Thibaut Girka
2018-12-01 21:00:16 +01:00
11 changed files with 46 additions and 37 deletions

View File

@ -17,8 +17,8 @@ export default [{
},
relativeTime: {
future: {
one: "dins {0} an",
other: "dins {0} ans",
one: "daquí {0} an",
other: "daquí {0} ans",
},
past: {
one: "fa {0} an",
@ -35,8 +35,8 @@ export default [{
},
relativeTime: {
future: {
one: "dins {0} mes",
other: "dins {0} meses",
one: "daquí {0} mes",
other: "daquí {0} meses",
},
past: {
one: "fa {0} mes",
@ -53,8 +53,8 @@ export default [{
},
relativeTime: {
future: {
one: "dins {0} jorn",
other: "dins {0} jorns",
one: "daquí {0} jorn",
other: "daquí {0} jorns",
},
past: {
one: "fa {0} jorn",
@ -66,8 +66,8 @@ export default [{
displayName: "ora",
relativeTime: {
future: {
one: "dins {0} ora",
other: "dins {0} oras",
one: "daquí {0} ora",
other: "daquí {0} oras",
},
past: {
one: "fa {0} ora",
@ -79,8 +79,8 @@ export default [{
displayName: "minuta",
relativeTime: {
future: {
one: "dins {0} minuta",
other: "dins {0} minutas",
one: "daquí {0} minuta",
other: "daquí {0} minutas",
},
past: {
one: "fa {0} minuta",
@ -95,8 +95,8 @@ export default [{
},
relativeTime: {
future: {
one: "dins {0} segonda",
other: "dins {0} segondas",
one: "daquí {0} segonda",
other: "daquí {0} segondas",
},
past: {
one: "fa {0} segonda",