diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-23 10:17:18 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-03-23 10:17:18 +0000 |
| commit | 03b2f701e755b2dcc013619d8e234fdec315c418 (patch) | |
| tree | ab2bb62e747d568e88d4208f2c57f8a67f3a8a1a /config/locales/simple_form.oc.yml | |
| parent | 9c3e4bdead953fb67fde32f5ef5db39ed2974362 (diff) | |
| parent | ecdc5957a34b7f7a7a342c631690802d79d13f37 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/locales/simple_form.oc.yml')
| -rw-r--r-- | config/locales/simple_form.oc.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.oc.yml b/config/locales/simple_form.oc.yml index addca75ce..690d1de20 100644 --- a/config/locales/simple_form.oc.yml +++ b/config/locales/simple_form.oc.yml @@ -45,6 +45,7 @@ oc: setting_default_privacy: Confidencialitat de las publicacions setting_default_sensitive: Totjorn marcar los mèdias coma sensibles setting_delete_modal: Afichar una fenèstra de confirmacion abans de suprimir un estatut + setting_display_sensitive_media: Totjorn mostrar los mèdias coma sensibles setting_noindex: Èsser pas indexat pels motors de recèrca setting_reduce_motion: Reduire la velocitat de las animacions setting_system_font_ui: Utilizar la polissa del sisèma @@ -53,6 +54,7 @@ oc: severity: Severitat type: Tip d’impòrt username: Nom d’utilizaire + username_or_email: Nom d’utilizaire o corrièl interactions: must_be_follower: Blocar las notificacions del mond que vos sègon pas must_be_following: Blocar las notificacions del mond que seguètz pas |