about summary refs log tree commit diff
path: root/config/locales/simple_form.sv.yml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-06-13 23:53:21 +0200
committerGitHub <noreply@github.com>2019-06-13 23:53:21 +0200
commitc0e5f32d13dfd696728dc1fa2ad9a93a27aa405f (patch)
treecf6ad8df684977b10ffd0d4a313d6dccb42ac15a /config/locales/simple_form.sv.yml
parent80849812d2a03ff9da671a2204bacf0c85f6ab0d (diff)
parent0fd7a8b63d6247ff1fe1d305ec712c0a519a52f1 (diff)
Merge pull request #1111 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/locales/simple_form.sv.yml')
-rw-r--r--config/locales/simple_form.sv.yml3
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/simple_form.sv.yml b/config/locales/simple_form.sv.yml
index e7ed33d0b..171714ab0 100644
--- a/config/locales/simple_form.sv.yml
+++ b/config/locales/simple_form.sv.yml
@@ -34,13 +34,11 @@ sv:
           value: Innehåll
       defaults:
         autofollow: Bjud in till att följa ditt konto
-        avatar: Avatar
         bot: Detta är ett botkonto
         chosen_languages: Filtrera språk
         confirm_new_password: Bekräfta nytt lösenord
         confirm_password: Bekräfta lösenord
         current_password: Nuvarande lösenord
-        data: Data
         display_name: Visningsnamn
         email: E-postadress
         expires_in: Förfaller efter
@@ -82,6 +80,5 @@ sv:
         reblog: Skicka e-post när någon knuffar din status
     'no': Nej
     required:
-      mark: "*"
       text: obligatorisk
     'yes': Ja