Merge branch 'dev'

spejman · Jan 20, 2010 · 3a81b39 · 3a81b39
2 parents b78c2dc + acd8169
commit 3a81b39
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 12 deletions.
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -834,10 +834,6 @@ en:
       note: Note
       invitation: Invitation
       upload: Upload
-      user:
-        attributes:
-          avatar:
-            attachment_content_type_invalid: Upload only JPEG and PNG files.
     attributes:
       card:
         street: Street

diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -833,10 +833,6 @@ es:
       note: Nota
       invitation: Invitación
       upload: Archivo
-      user:
-        attributes:
-          avatar:
-            attachment_content_type_invalid: Sube una imagen JPEG o PNG.
     attributes:
       card:
         street: Calle

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
@@ -833,10 +833,6 @@ fr:
       note: Note
       invitation: Invitation
       upload: Archive
-      user:
-        attributes:
-          avatar:
-            attachment_content_type_invalid: Seules les images JPEG ou PNG son acceptées.
     attributes:
       card:
         street: Rue