diff options
author | ThibG <thib@sitedethib.com> | 2018-06-22 00:10:43 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-22 00:10:43 +0200 |
commit | 03cfe366fd0146cb4c3ede4dcdeeb2228a513e7d (patch) | |
tree | 4ea4874b420a859b706b1187440e2ed103800396 /config/locales/oc.yml | |
parent | f0161702d857a2f91d2e51469e8480253ffcd86e (diff) | |
parent | 0c3a337e045dbd4b7be6ae6c3f07969b42f08857 (diff) |
Merge pull request #550 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/oc.yml')
-rw-r--r-- | config/locales/oc.yml | 42 |
1 files changed, 12 insertions, 30 deletions
diff --git a/config/locales/oc.yml b/config/locales/oc.yml index 04c2bf942..c06628330 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -483,38 +483,18 @@ oc: - :year datetime: distance_in_words: - about_x_hours: - one: Fa una ora - other: Fa %{count} oras - about_x_months: - one: Fa un mes - other: Fa %{count} meses - about_x_years: - one: Fa un an - other: Fa %{count} ans - almost_x_years: - one: Fa quasi un an - other: Fa quasi %{count} ans + about_x_hours: "%{count} h" + about_x_months: "%{count} meses" + about_x_years: "%{count} ans" + almost_x_years: "%{count}ans" half_a_minute: Ara - less_than_x_minutes: - one: Fa mens d’una minuta - other: Fa mens de %{count} minutas + less_than_x_minutes: "%{count} min" less_than_x_seconds: Ara meteis - over_x_years: - one: Fa mai d’un an - other: Fa mai de %{count} ans - x_days: - one: Fa un jorn - other: Fa %{count} jorns - x_minutes: - one: Fa una minuta - other: Fa %{count} minutas - x_months: - one: Fa un mes - other: Fa %{count} meses - x_seconds: - one: Fa una segonda - other: Fa %{count} segondas + over_x_years: "%{count} ans" + x_days: "%{count} jorns" + x_minutes: "%{count} min" + x_months: "%{count} meses" + x_seconds: "%{count}s" x_years: one: Fa un an other: Fa %{count} ans @@ -591,6 +571,7 @@ oc: '86400': 1 jorn expires_in_prompt: Jamai generate: Generar + invited_by: 'Vos a convidat :' max_uses: one: 1 persona other: "%{count} personas" @@ -751,6 +732,7 @@ oc: disallowed_hashtags: one: 'conten una etiqueta desactivada : %{tags}' other: 'conten las etiquetas desactivadas : %{tags}' + language_detection: Detectar automaticament la lenga open_in_web: Dobrir sul web over_character_limit: limit de %{max} caractèrs passat pin_errors: |