diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 17:52:08 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-30 17:52:08 +0100 |
| commit | 1c448d647488dc3dd3b72e9fe15efb971612157c (patch) | |
| tree | 2b31e4ed019a29043aa07d9d95e7f8b64e309bbd /config/locales/oc.yml | |
| parent | 7e18e95716052d5566f2e31559cbe4a68268f493 (diff) | |
| parent | 66019b0ec4aaa584e58e91583425ed7c0d55c28e (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/auth/sessions_controller.rb Upstream reverted something we partially reverted already. Reverted the rest to match upstream.
Diffstat (limited to 'config/locales/oc.yml')
| -rw-r--r-- | config/locales/oc.yml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/locales/oc.yml b/config/locales/oc.yml index a127236a9..61717ca3b 100644 --- a/config/locales/oc.yml +++ b/config/locales/oc.yml @@ -311,7 +311,7 @@ oc: description_html: Un <strong> relai de federacion</strong> es un servidor intermediari qu’escàmbia de bèls volumes de tuts publics entre servidors que son abonats e i publican.<strong>Pòt ajudar de pichons e mejans servidors a trobar de contenguts del fediverse estant</strong>, qu’autrament demandariá als utilizaires locals de s’abonar manualament a d’autres monde marcats sus de servidors alonhats. disable: Desactivar disabled: Desactivat - enable: Activat + enable: Activar enable_hint: Un còp activat, vòstre servidor s’abonarà a totes los tuts publics del relai estant, e començarà de mandar sos tuts publics a aqueste d’enlà. enabled: Activat inbox_url: URL del relai @@ -533,7 +533,7 @@ oc: formats: default: "%e/%m/%Y" long: Lo %e %B de %Y - short: "%e %b. de %Y" + short: "%e %B de %Y" month_names: - None - de genièr @@ -557,7 +557,7 @@ oc: about_x_hours: "%{count} h" about_x_months: "%{count} meses" about_x_years: "%{count} ans" - almost_x_years: "%{count}ans" + almost_x_years: "%{count} ans" half_a_minute: Ara less_than_x_minutes: "%{count} min" less_than_x_seconds: Ara meteis |