diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-11-12 22:13:57 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-11-12 22:13:57 +0100 |
| commit | c077cdaba70eac154909cad412ece409acc2e688 (patch) | |
| tree | 7d13d319ce62475de15014406635f32a8742ca4b /config/locales/simple_form.is.yml | |
| parent | 67125534bc0fd48a45d6cb17a5c78712d8e87150 (diff) | |
| parent | 9870b175b477bbc984fc7945f1ebe07e3f2b0053 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/relationships_controller.rb`: Upstream changed a line too close to a glitch-soc only line related to glitch-soc's theming system. Applied upstream changes accordingly.
Diffstat (limited to 'config/locales/simple_form.is.yml')
| -rw-r--r-- | config/locales/simple_form.is.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/simple_form.is.yml b/config/locales/simple_form.is.yml index b751e5de1..ed948a699 100644 --- a/config/locales/simple_form.is.yml +++ b/config/locales/simple_form.is.yml @@ -100,6 +100,7 @@ is: types: disable: Gera innskráningu óvirka none: Gera ekkert + sensitive: Viðkvæmt silence: Hylja suspend: Setja í bið og eyða endanlega gögnum notandaaðgangsins warning_preset_id: Nota forstillta aðvörun |