From 33ea042decc03c494c78a896934455ef79abc16b Mon Sep 17 00:00:00 2001 From: JeanGauthier <32121978+JeanGauthier@users.noreply.github.com> Date: Tue, 17 Oct 2017 21:49:39 +0200 Subject: [PATCH] i18n better wording (OC/CA/FR) + string added in FR (#5438) * Update oc.json * Update fr.json * Update ca.json * Update fr.json * Update simple_form.fr.yml * Update ca.json * Update fr.json * Update oc.json * Update oc.json * Update fr.json --- app/javascript/mastodon/locales/ca.json | 8 ++++---- app/javascript/mastodon/locales/fr.json | 10 +++++----- app/javascript/mastodon/locales/oc.json | 8 ++++---- config/locales/simple_form.fr.yml | 1 + 4 files changed, 14 insertions(+), 13 deletions(-) diff --git a/app/javascript/mastodon/locales/ca.json b/app/javascript/mastodon/locales/ca.json index 413de3d08..af732921d 100644 --- a/app/javascript/mastodon/locales/ca.json +++ b/app/javascript/mastodon/locales/ca.json @@ -159,11 +159,11 @@ "privacy.public.short": "Públic", "privacy.unlisted.long": "No publicar en línies de temps públiques", "privacy.unlisted.short": "No llistat", - "relative_time.days": "{number}d", - "relative_time.hours": "{number}h", + "relative_time.days": "fa {number} jorns", + "relative_time.hours": "fa {number} hores", "relative_time.just_now": "ara", - "relative_time.minutes": "{number}m", - "relative_time.seconds": "{number}s", + "relative_time.minutes": "fa {number} minutes", + "relative_time.seconds": "fa {number} segondes", "reply_indicator.cancel": "Cancel·lar", "report.placeholder": "Comentaris addicionals", "report.submit": "Enviar", diff --git a/app/javascript/mastodon/locales/fr.json b/app/javascript/mastodon/locales/fr.json index b7eb0a218..a607b16b9 100644 --- a/app/javascript/mastodon/locales/fr.json +++ b/app/javascript/mastodon/locales/fr.json @@ -63,7 +63,7 @@ "confirmations.mute.message": "Confirmez-vous le masquage de {name} ?", "confirmations.unfollow.confirm": "Ne plus suivre", "confirmations.unfollow.message": "Voulez-vous arrêter de suivre {name} ?", - "embed.instructions": "Intégrez ce statut à votre site en copiant ce code ci-dessous.", + "embed.instructions": "Intégrez ce statut à votre site en copiant le code ci-dessous.", "embed.preview": "Il apparaîtra comme cela : ", "emoji_button.activity": "Activités", "emoji_button.custom": "Personnalisés", @@ -159,11 +159,11 @@ "privacy.public.short": "Public", "privacy.unlisted.long": "Ne pas afficher dans les fils publics", "privacy.unlisted.short": "Non-listé", - "relative_time.days": "{number}d", - "relative_time.hours": "{number}h", + "relative_time.days": "il y a {number} jour", + "relative_time.hours": "il y a {number}h", "relative_time.just_now": "à l’instant", - "relative_time.minutes": "{number}m", - "relative_time.seconds": "{number}s", + "relative_time.minutes": "il y a {number} min.", + "relative_time.seconds": "il y a {number}s", "reply_indicator.cancel": "Annuler", "report.placeholder": "Commentaires additionnels", "report.submit": "Envoyer", diff --git a/app/javascript/mastodon/locales/oc.json b/app/javascript/mastodon/locales/oc.json index 75933c633..1e0849d95 100644 --- a/app/javascript/mastodon/locales/oc.json +++ b/app/javascript/mastodon/locales/oc.json @@ -159,11 +159,11 @@ "privacy.public.short": "Public", "privacy.unlisted.long": "Mostrar pas dins los fluxes publics", "privacy.unlisted.short": "Pas-listat", - "relative_time.days": "{number}d", - "relative_time.hours": "{number}h", + "relative_time.days": "fa {number}j", + "relative_time.hours": "fa {number}h", "relative_time.just_now": "ara", - "relative_time.minutes": "{number}m", - "relative_time.seconds": "{number}s", + "relative_time.minutes": "fa {number} minutas", + "relative_time.seconds": "fa {number} segondas", "reply_indicator.cancel": "Anullar", "report.placeholder": "Comentaris addicionals", "report.submit": "Mandar", diff --git a/config/locales/simple_form.fr.yml b/config/locales/simple_form.fr.yml index 40fed9675..06ab018a7 100644 --- a/config/locales/simple_form.fr.yml +++ b/config/locales/simple_form.fr.yml @@ -44,6 +44,7 @@ fr: setting_default_sensitive: Toujours marquer les médias comme sensibles setting_delete_modal: Afficher une fenêtre de confirmation avant de supprimer un pouet setting_noindex: Demander aux moteurs de recherche de ne pas indexer vos informations personnelles + setting_reduce_motion: Réduire la vitesse des animations setting_system_font_ui: Utiliser la police par défaut du système setting_theme: Thème du site setting_unfollow_modal: Afficher une fenêtre de confirmation avant de vous désabonner d’un compte