diff --git a/avatar/locale/de/LC_MESSAGES/django.mo b/avatar/locale/de/LC_MESSAGES/django.mo
index 7d50ea81..e0ec1629 100644
Binary files a/avatar/locale/de/LC_MESSAGES/django.mo and b/avatar/locale/de/LC_MESSAGES/django.mo differ
diff --git a/avatar/locale/de/LC_MESSAGES/django.po b/avatar/locale/de/LC_MESSAGES/django.po
index 5f8378f4..ec81c4f3 100644
--- a/avatar/locale/de/LC_MESSAGES/django.po
+++ b/avatar/locale/de/LC_MESSAGES/django.po
@@ -7,18 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-28 10:59+0200\n"
-"PO-Revision-Date: 2016-09-14 13:07+0200\n"
+"POT-Creation-Date: 2016-09-14 16:37+0200\n"
+"PO-Revision-Date: 2016-09-14 14:34+0200\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"Language: de\n"
 "X-Generator: Poedit 1.8.9\n"
 
-#: forms.py:34
+#: admin.py:26
+msgid "Avatar"
+msgstr "Avatar"
+
+#: forms.py:24 models.py:84 models.py:97
+msgid "avatar"
+msgstr "avatar"
+
+#: forms.py:37
 #, python-format
 msgid ""
 "%(ext)s is an invalid file extension. Authorized extensions are : "
@@ -27,7 +35,7 @@ msgstr ""
 "%(ext)s ist ein ungültiges Dateiformat. Erlaubte Formate sind: "
 "%(valid_exts_list)s"
 
-#: forms.py:38
+#: forms.py:44
 #, python-format
 msgid ""
 "Your file is too big (%(size)s), the maximum allowed size is "
@@ -35,7 +43,7 @@ msgid ""
 msgstr ""
 "Die Datei ist zu groß (%(size)s), die Maximalgröße ist %(max_valid_size)s"
 
-#: forms.py:44
+#: forms.py:54
 #, python-format
 msgid ""
 "You already have %(nb_avatars)d avatars, and the maximum allowed is "
@@ -44,26 +52,25 @@ msgstr ""
 "Sie haben bereits %(nb_avatars)d Avatarbilder hochgeladen. Die maximale "
 "Anzahl ist %(nb_max_avatars)d."
 
-#: forms.py:56 forms.py:67
+#: forms.py:71 forms.py:84
 msgid "Choices"
 msgstr "Auswahl"
 
-#: models.py:75
-#, python-format
-msgid "Avatar for %s"
-msgstr "Avatar für %s"
+#: models.py:77
+msgid "user"
+msgstr "Benutzer"
 
-#: views.py:73 views.py:95
-msgid "Successfully uploaded a new avatar."
-msgstr "Ein neuer Avatar wurde erfolgreich hochgeladen."
+#: models.py:80
+msgid "primary"
+msgstr "primär"
 
-#: views.py:132
-msgid "Successfully updated your avatar."
-msgstr "Ihr Avatar wurde erfolgreich aktualisiert."
+#: models.py:91
+msgid "uploaded at"
+msgstr "hochgeladen am"
 
-#: views.py:166
-msgid "Successfully deleted the requested avatars."
-msgstr "Ihr Avatar wurde erfolgreich gelöscht."
+#: models.py:98
+msgid "avatars"
+msgstr "Avatare"
 
 #: templates/avatar/add.html:5 templates/avatar/change.html:5
 msgid "Your current avatar: "
@@ -137,10 +144,22 @@ msgstr ""
 "Sie haben Ihren Avatar aktualisiert <a href=\"%(avatar_url)s\">%(avatar)s</"
 "a>."
 
-#: templatetags/avatar_tags.py:45
+#: templatetags/avatar_tags.py:69
 msgid "Default Avatar"
 msgstr "Standard-Avatar"
 
+#: views.py:73
+msgid "Successfully uploaded a new avatar."
+msgstr "Ein neuer Avatar wurde erfolgreich hochgeladen."
+
+#: views.py:111
+msgid "Successfully updated your avatar."
+msgstr "Ihr Avatar wurde erfolgreich aktualisiert."
+
+#: views.py:150
+msgid "Successfully deleted the requested avatars."
+msgstr "Ihr Avatar wurde erfolgreich gelöscht."
+
 #~ msgid "Avatar Updated"
 #~ msgstr "Avatar aktualisiert"
 
diff --git a/avatar/locale/es/LC_MESSAGES/django.po b/avatar/locale/es/LC_MESSAGES/django.po
index b88a4cee..3b3cff43 100644
--- a/avatar/locale/es/LC_MESSAGES/django.po
+++ b/avatar/locale/es/LC_MESSAGES/django.po
@@ -7,26 +7,26 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2.0a10\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-08-26 23:53-0500\n"
+"POT-Creation-Date: 2016-09-14 16:37+0200\n"
 "PO-Revision-Date: 2013-08-27 00:21-0600\n"
 "Last-Translator: David Loaiza M. <david@zooluciones.com>\n"
 "Language-Team: es <david.loaiza@gmail.com>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.7\n"
-"Language: es\n"
 
-#: admin.py:19
+#: admin.py:26
 msgid "Avatar"
 msgstr "Avatar"
 
-#: forms.py:23
+#: forms.py:24 models.py:84 models.py:97
 msgid "avatar"
 msgstr "avatar"
 
-#: forms.py:35
+#: forms.py:37
 #, python-format
 msgid ""
 "%(ext)s is an invalid file extension. Authorized extensions are : "
@@ -35,7 +35,7 @@ msgstr ""
 "%(ext)s es una extensión de archivo inválida. Las extensiones de archivo "
 "autorizadas son: %(valid_exts_list)s"
 
-#: forms.py:39
+#: forms.py:44
 #, python-format
 msgid ""
 "Your file is too big (%(size)s), the maximum allowed size is "
@@ -44,7 +44,7 @@ msgstr ""
 "Su archivo es muy grande (%(size)s), el tamaño máximo permitido es "
 "%(max_valid_size)s"
 
-#: forms.py:49
+#: forms.py:54
 #, python-format
 msgid ""
 "You already have %(nb_avatars)d avatars, and the maximum allowed is "
@@ -53,43 +53,49 @@ msgstr ""
 "Usted ya tiene %(nb_avatars)d avatares, y el máximo permitido es "
 "%(nb_max_avatars)d."
 
-#: forms.py:65 forms.py:77
+#: forms.py:71 forms.py:84
 msgid "Choices"
 msgstr "Opciones"
 
-#: views.py:71
-msgid "Successfully uploaded a new avatar."
-msgstr "Se ha subido correctamente un nuevo avatar"
+#: models.py:77
+msgid "user"
+msgstr ""
 
-#: views.py:106
-msgid "Successfully updated your avatar."
-msgstr "Se ha actualizado correctamente su avatar."
+#: models.py:80
+msgid "primary"
+msgstr ""
 
-#: views.py:141
-msgid "Successfully deleted the requested avatars."
-msgstr "Se han eliminado correctamente los avatares solicitados."
+#: models.py:91
+msgid "uploaded at"
+msgstr ""
 
-#: templates/avatar/add.html:6 templates/avatar/change.html:6
+#: models.py:98
+#, fuzzy
+#| msgid "avatar"
+msgid "avatars"
+msgstr "avatar"
+
+#: templates/avatar/add.html:5 templates/avatar/change.html:5
 msgid "Your current avatar: "
 msgstr "Su avatar actual:"
 
-#: templates/avatar/add.html:9 templates/avatar/change.html:9
+#: templates/avatar/add.html:8 templates/avatar/change.html:8
 msgid "You haven't uploaded an avatar yet. Please upload one now."
 msgstr "No ha subido un avatar aún. Por favor, suba uno ahora."
 
-#: templates/avatar/add.html:13 templates/avatar/change.html:20
+#: templates/avatar/add.html:12 templates/avatar/change.html:19
 msgid "Upload New Image"
 msgstr "Subir Nueva Imagen"
 
-#: templates/avatar/change.html:15
+#: templates/avatar/change.html:14
 msgid "Choose new Default"
 msgstr "Elige nuevo predeterminado"
 
-#: templates/avatar/confirm_delete.html:6
+#: templates/avatar/confirm_delete.html:5
 msgid "Please select the avatars that you would like to delete."
 msgstr "Por favor seleccione los avatares que le gustaría eliminar."
 
-#: templates/avatar/confirm_delete.html:9
+#: templates/avatar/confirm_delete.html:8
 #, python-format
 msgid ""
 "You have no avatars to delete. Please <a href=\"%(avatar_change_url)s"
@@ -98,7 +104,7 @@ msgstr ""
 "No tiene avatares para borrar. Por favor <a href=\"%(avatar_change_url)s"
 "\">suba uno</a> ahora."
 
-#: templates/avatar/confirm_delete.html:15
+#: templates/avatar/confirm_delete.html:14
 msgid "Delete These"
 msgstr "Eliminar Estos"
 
@@ -138,6 +144,18 @@ msgstr ""
 msgid "You have updated your avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 msgstr "Ha actualizado su avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 
-#: templatetags/avatar_tags.py:57
+#: templatetags/avatar_tags.py:69
 msgid "Default Avatar"
 msgstr "Avatar Predeterminado"
+
+#: views.py:73
+msgid "Successfully uploaded a new avatar."
+msgstr "Se ha subido correctamente un nuevo avatar"
+
+#: views.py:111
+msgid "Successfully updated your avatar."
+msgstr "Se ha actualizado correctamente su avatar."
+
+#: views.py:150
+msgid "Successfully deleted the requested avatars."
+msgstr "Se han eliminado correctamente los avatares solicitados."
diff --git a/avatar/locale/fr/LC_MESSAGES/django.po b/avatar/locale/fr/LC_MESSAGES/django.po
index 53121064..1b1f3956 100644
--- a/avatar/locale/fr/LC_MESSAGES/django.po
+++ b/avatar/locale/fr/LC_MESSAGES/django.po
@@ -7,61 +7,75 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-28 10:59+0200\n"
+"POT-Creation-Date: 2016-09-14 16:37+0200\n"
 "PO-Revision-Date: 2010-03-26 18:35+0100\n"
 "Last-Translator: Mathieu Pillard <m.pillard@liberation.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: forms.py:34
+#: admin.py:26
+#, fuzzy
+#| msgid "Avatar for %s"
+msgid "Avatar"
+msgstr "Avatar pour %s"
+
+#: forms.py:24 models.py:84 models.py:97
+#, fuzzy
+#| msgid "Default Avatar"
+msgid "avatar"
+msgstr "Avatar par défaut"
+
+#: forms.py:37
 #, python-format
 msgid ""
-"%(ext)s is an invalid file extension. Authorized extensions are : %"
-"(valid_exts_list)s"
+"%(ext)s is an invalid file extension. Authorized extensions are : "
+"%(valid_exts_list)s"
 msgstr ""
 "%(ext)s n'est pas une extension de fichier valide. Les extensions autorisées "
 "sont: %(valid_exts_list)s"
 
-#: forms.py:38
+#: forms.py:44
 #, python-format
 msgid ""
-"Your file is too big (%(size)s), the maximum allowed size is %"
-"(max_valid_size)s"
+"Your file is too big (%(size)s), the maximum allowed size is "
+"%(max_valid_size)s"
 msgstr ""
-"Le fichier est trop gros (%(size)s), la taille maximum autorisée est %"
-"(max_valid_size)s"
+"Le fichier est trop gros (%(size)s), la taille maximum autorisée est "
+"%(max_valid_size)s"
 
-#: forms.py:44
+#: forms.py:54
 #, python-format
 msgid ""
-"You already have %(nb_avatars)d avatars, and the maximum allowed is %"
-"(nb_max_avatars)d."
+"You already have %(nb_avatars)d avatars, and the maximum allowed is "
+"%(nb_max_avatars)d."
 msgstr ""
-"Vous avez déjà %(nb_avatars)d avatars, et le maximum autorisé est %"
-"(nb_max_avatars)d."
+"Vous avez déjà %(nb_avatars)d avatars, et le maximum autorisé est "
+"%(nb_max_avatars)d."
 
-#: forms.py:56 forms.py:67
+#: forms.py:71 forms.py:84
 msgid "Choices"
 msgstr "Choix"
 
-#: models.py:75
-#, python-format
-msgid "Avatar for %s"
-msgstr "Avatar pour %s"
+#: models.py:77
+msgid "user"
+msgstr ""
 
-#: views.py:73 views.py:95
-msgid "Successfully uploaded a new avatar."
-msgstr "Votre nouveau avatar a été uploadé avec succès."
+#: models.py:80
+msgid "primary"
+msgstr ""
 
-#: views.py:132
-msgid "Successfully updated your avatar."
-msgstr "Votre avatar a été mis à jour avec succès."
+#: models.py:91
+msgid "uploaded at"
+msgstr ""
 
-#: views.py:166
-msgid "Successfully deleted the requested avatars."
-msgstr "Les avatars sélectionnés ont été effacés avec succès."
+#: models.py:98
+#, fuzzy
+#| msgid "Avatar for %s"
+msgid "avatars"
+msgstr "Avatar pour %s"
 
 #: templates/avatar/add.html:5 templates/avatar/change.html:5
 msgid "Your current avatar: "
@@ -89,8 +103,8 @@ msgid ""
 "You have no avatars to delete. Please <a href=\"%(avatar_change_url)s"
 "\">upload one</a> now."
 msgstr ""
-"Vous n'avez aucun avatar à effacer. Veuillez en <a href=\"%"
-"(avatar_change_url)s\">ajouter</a> un maintenant."
+"Vous n'avez aucun avatar à effacer. Veuillez en <a href="
+"\"%(avatar_change_url)s\">ajouter</a> un maintenant."
 
 #: templates/avatar/confirm_delete.html:14
 msgid "Delete These"
@@ -131,10 +145,22 @@ msgstr ""
 msgid "You have updated your avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 msgstr "Vous avez mis à jour votre <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 
-#: templatetags/avatar_tags.py:45
+#: templatetags/avatar_tags.py:69
 msgid "Default Avatar"
 msgstr "Avatar par défaut"
 
+#: views.py:73
+msgid "Successfully uploaded a new avatar."
+msgstr "Votre nouveau avatar a été uploadé avec succès."
+
+#: views.py:111
+msgid "Successfully updated your avatar."
+msgstr "Votre avatar a été mis à jour avec succès."
+
+#: views.py:150
+msgid "Successfully deleted the requested avatars."
+msgstr "Les avatars sélectionnés ont été effacés avec succès."
+
 #~ msgid "Avatar Updated"
 #~ msgstr "Avatar mis à jour"
 
diff --git a/avatar/locale/ja/LC_MESSAGES/django.po b/avatar/locale/ja/LC_MESSAGES/django.po
index c417e517..c7ed798f 100644
--- a/avatar/locale/ja/LC_MESSAGES/django.po
+++ b/avatar/locale/ja/LC_MESSAGES/django.po
@@ -8,88 +8,102 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-09-18 19:49+0900\n"
+"POT-Creation-Date: 2016-09-14 16:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: admin.py:19
+#: admin.py:26
 msgid "Avatar"
 msgstr "プロフィール画像"
 
-#: forms.py:24
+#: forms.py:24 models.py:84 models.py:97
 msgid "avatar"
 msgstr "プロフィール画像"
 
 #: forms.py:37
 #, python-format
 msgid ""
-"%(ext)s is an invalid file extension. Authorized extensions are : %"
-"(valid_exts_list)s"
-msgstr "%(ext)s は利用できない拡張子です。 使用可能な拡張子 : %(valid_exts_list)s"
+"%(ext)s is an invalid file extension. Authorized extensions are : "
+"%(valid_exts_list)s"
+msgstr ""
+"%(ext)s は利用できない拡張子です。 使用可能な拡張子 : %(valid_exts_list)s"
 
 #: forms.py:44
 #, python-format
 msgid ""
-"Your file is too big (%(size)s), the maximum allowed size is %"
-"(max_valid_size)s"
-msgstr "ファイルが大きすぎます(%(size)s)。アップロード可能な最大サイズは %(max_valid_size)s です。"
+"Your file is too big (%(size)s), the maximum allowed size is "
+"%(max_valid_size)s"
+msgstr ""
+"ファイルが大きすぎます(%(size)s)。アップロード可能な最大サイズは "
+"%(max_valid_size)s です。"
 
 #: forms.py:54
 #, python-format
 msgid ""
-"You already have %(nb_avatars)d avatars, and the maximum allowed is %"
-"(nb_max_avatars)d."
-msgstr "登録可能なプロフィール画像は %(nb_max_avatars)d 個までです。すでに %(nb_avatars)d 個登録されています。"
+"You already have %(nb_avatars)d avatars, and the maximum allowed is "
+"%(nb_max_avatars)d."
+msgstr ""
+"登録可能なプロフィール画像は %(nb_max_avatars)d 個までです。すでに "
+"%(nb_avatars)d 個登録されています。"
 
 #: forms.py:71 forms.py:84
 msgid "Choices"
 msgstr "選択"
 
-#: views.py:74
-msgid "Successfully uploaded a new avatar."
-msgstr "新しいプロフィール画像をアップロードしました。"
+#: models.py:77
+msgid "user"
+msgstr ""
 
-#: views.py:110
-msgid "Successfully updated your avatar."
-msgstr "プロフィール画像を更新しました。"
+#: models.py:80
+msgid "primary"
+msgstr ""
 
-#: views.py:148
-msgid "Successfully deleted the requested avatars."
-msgstr "指定されたプロフィール画像を削除しました。"
+#: models.py:91
+msgid "uploaded at"
+msgstr ""
+
+#: models.py:98
+#, fuzzy
+#| msgid "avatar"
+msgid "avatars"
+msgstr "プロフィール画像"
 
-#: templates/avatar/add.html:6 templates/avatar/change.html:6
+#: templates/avatar/add.html:5 templates/avatar/change.html:5
 msgid "Your current avatar: "
 msgstr "現在のプロフィール画像："
 
-#: templates/avatar/add.html:9 templates/avatar/change.html:9
+#: templates/avatar/add.html:8 templates/avatar/change.html:8
 msgid "You haven't uploaded an avatar yet. Please upload one now."
 msgstr "登録されているプロフィール画像はありません。アップロードしてください。"
 
-#: templates/avatar/add.html:13 templates/avatar/change.html:20
+#: templates/avatar/add.html:12 templates/avatar/change.html:19
 msgid "Upload New Image"
 msgstr "新しい画像のアップロード"
 
-#: templates/avatar/change.html:15
+#: templates/avatar/change.html:14
 msgid "Choose new Default"
 msgstr "デフォルトの画像を選択"
 
-#: templates/avatar/confirm_delete.html:6
+#: templates/avatar/confirm_delete.html:5
 msgid "Please select the avatars that you would like to delete."
 msgstr "削除したいプロフィール画像を選択してください。"
 
-#: templates/avatar/confirm_delete.html:9
+#: templates/avatar/confirm_delete.html:8
 #, python-format
 msgid ""
 "You have no avatars to delete. Please <a href=\"%(avatar_change_url)s"
 "\">upload one</a> now."
-msgstr "削除できるプロフィール画像はありません。<a href=\"%(avatar_change_url)s\">新規画像のアップロード</a>."
+msgstr ""
+"削除できるプロフィール画像はありません。<a href=\"%(avatar_change_url)s\">新"
+"規画像のアップロード</a>."
 
-#: templates/avatar/confirm_delete.html:15
+#: templates/avatar/confirm_delete.html:14
 msgid "Delete These"
 msgstr "削除"
 
@@ -99,7 +113,9 @@ msgid ""
 "%(avatar_creator)s has updated their avatar %(avatar)s.\n"
 "\n"
 "http://%(current_site)s%(avatar_url)s\n"
-msgstr "%(avatar_creator)s さんがプロフィール画像 %(avatar)s をアップロードしました。\n"
+msgstr ""
+"%(avatar_creator)s さんがプロフィール画像 %(avatar)s をアップロードしまし"
+"た。\n"
 "\n"
 "http://%(current_site)s%(avatar_url)s\n"
 
@@ -108,7 +124,8 @@ msgstr "%(avatar_creator)s さんがプロフィール画像 %(avatar)s をア
 msgid ""
 "<a href=\"%(user_url)s\">%(avatar_creator)s</a> has updated their avatar <a "
 "href=\"%(avatar_url)s\">%(avatar)s</a>."
-msgstr "<a href=\"%(user_url)s\">%(avatar_creator)s</a> さんがプロフィール画像 <a "
+msgstr ""
+"<a href=\"%(user_url)s\">%(avatar_creator)s</a> さんがプロフィール画像 <a "
 "href=\"%(avatar_url)s\">%(avatar)s</a> をアップロードしました。"
 
 #: templates/notification/avatar_updated/full.txt:1
@@ -117,15 +134,29 @@ msgid ""
 "Your avatar has been updated.  %(avatar)s\n"
 "\n"
 "http://%(current_site)s%(avatar_url)s\n"
-msgstr "プロフィール画像を更新しました。 %(avatar)s\n"
+msgstr ""
+"プロフィール画像を更新しました。 %(avatar)s\n"
 "\n"
 "http://%(current_site)s%(avatar_url)s\n"
 
 #: templates/notification/avatar_updated/notice.html:2
 #, python-format
 msgid "You have updated your avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
-msgstr "プロフィール画像を更新しました。 <a href=\"%(avatar_url)s\">%(avatar)s</a>."
+msgstr ""
+"プロフィール画像を更新しました。 <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 
-#: templatetags/avatar_tags.py:51
+#: templatetags/avatar_tags.py:69
 msgid "Default Avatar"
 msgstr "デフォルトのプロフィール画像"
+
+#: views.py:73
+msgid "Successfully uploaded a new avatar."
+msgstr "新しいプロフィール画像をアップロードしました。"
+
+#: views.py:111
+msgid "Successfully updated your avatar."
+msgstr "プロフィール画像を更新しました。"
+
+#: views.py:150
+msgid "Successfully deleted the requested avatars."
+msgstr "指定されたプロフィール画像を削除しました。"
diff --git a/avatar/locale/nl/LC_MESSAGES/django.po b/avatar/locale/nl/LC_MESSAGES/django.po
index f35cf5d0..d365526c 100644
--- a/avatar/locale/nl/LC_MESSAGES/django.po
+++ b/avatar/locale/nl/LC_MESSAGES/django.po
@@ -7,21 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-11-11 12:32+0100\n"
+"POT-Creation-Date: 2016-09-14 16:37+0200\n"
 "PO-Revision-Date: 2013-11-11 12:49+0100\n"
 "Last-Translator: Ivor <ivorbosloper@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 1.5.5\n"
 
-#: admin.py:19
+#: admin.py:26
 msgid "Avatar"
 msgstr "Profielfoto"
 
-#: forms.py:24
+#: forms.py:24 models.py:84 models.py:97
 msgid "avatar"
 msgstr "profielfoto"
 
@@ -55,39 +56,45 @@ msgstr ""
 msgid "Choices"
 msgstr "Keuzes"
 
-#: views.py:74
-msgid "Successfully uploaded a new avatar."
-msgstr "De profielfoto is ververst."
+#: models.py:77
+msgid "user"
+msgstr ""
 
-#: views.py:110
-msgid "Successfully updated your avatar."
-msgstr "Profielfoto vernieuwd."
+#: models.py:80
+msgid "primary"
+msgstr ""
 
-#: views.py:148
-msgid "Successfully deleted the requested avatars."
-msgstr "Profielfoto verwijderd."
+#: models.py:91
+msgid "uploaded at"
+msgstr ""
+
+#: models.py:98
+#, fuzzy
+#| msgid "avatar"
+msgid "avatars"
+msgstr "profielfoto"
 
-#: templates/avatar/add.html:6 templates/avatar/change.html:6
+#: templates/avatar/add.html:5 templates/avatar/change.html:5
 msgid "Your current avatar: "
 msgstr "De huidige profielfoto:"
 
-#: templates/avatar/add.html:9 templates/avatar/change.html:9
+#: templates/avatar/add.html:8 templates/avatar/change.html:8
 msgid "You haven't uploaded an avatar yet. Please upload one now."
 msgstr "Er is nog geen profielfoto. Upload een nieuwe."
 
-#: templates/avatar/add.html:13 templates/avatar/change.html:20
+#: templates/avatar/add.html:12 templates/avatar/change.html:19
 msgid "Upload New Image"
 msgstr "Upload nieuw plaatje"
 
-#: templates/avatar/change.html:15
+#: templates/avatar/change.html:14
 msgid "Choose new Default"
 msgstr "Kies nieuwe standaard"
 
-#: templates/avatar/confirm_delete.html:6
+#: templates/avatar/confirm_delete.html:5
 msgid "Please select the avatars that you would like to delete."
 msgstr "Selecteer de te verwijderen de profielfoto's."
 
-#: templates/avatar/confirm_delete.html:9
+#: templates/avatar/confirm_delete.html:8
 #, python-format
 msgid ""
 "You have no avatars to delete. Please <a href=\"%(avatar_change_url)s"
@@ -96,7 +103,7 @@ msgstr ""
 "Er zijn geen profielfoto's om te verwijderen. <a href=\"%(avatar_change_url)s"
 "\">Upload</a> een nieuwe."
 
-#: templates/avatar/confirm_delete.html:15
+#: templates/avatar/confirm_delete.html:14
 msgid "Delete These"
 msgstr "Verwijder deze"
 
@@ -136,6 +143,18 @@ msgstr ""
 msgid "You have updated your avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 msgstr "De profielfoto is vernieuwd <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 
-#: templatetags/avatar_tags.py:51
+#: templatetags/avatar_tags.py:69
 msgid "Default Avatar"
 msgstr "Standaard profielfoto"
+
+#: views.py:73
+msgid "Successfully uploaded a new avatar."
+msgstr "De profielfoto is ververst."
+
+#: views.py:111
+msgid "Successfully updated your avatar."
+msgstr "Profielfoto vernieuwd."
+
+#: views.py:150
+msgid "Successfully deleted the requested avatars."
+msgstr "Profielfoto verwijderd."
diff --git a/avatar/locale/pl/LC_MESSAGES/django.po b/avatar/locale/pl/LC_MESSAGES/django.po
index 110d4996..b099f0c3 100644
--- a/avatar/locale/pl/LC_MESSAGES/django.po
+++ b/avatar/locale/pl/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-avatar 0.0.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-07-19 15:45+0200\n"
+"POT-Creation-Date: 2016-09-14 16:37+0200\n"
 "PO-Revision-Date: 2015-07-19 15:46+0100\n"
 "Last-Translator: Adam Dobrawy <naczelnik@jawnosc.tk>\n"
 "Language-Team: Adam Dobrawy <naczelnik@jawnosc.tk>\n"
@@ -23,7 +23,7 @@ msgstr ""
 msgid "Avatar"
 msgstr "Avatar"
 
-#: forms.py:24
+#: forms.py:24 models.py:84 models.py:97
 msgid "avatar"
 msgstr "avatar"
 
@@ -58,27 +58,45 @@ msgstr ""
 msgid "Choices"
 msgstr "Opcje wyboru"
 
-#: templates/avatar/add.html:6 templates/avatar/change.html:6
+#: models.py:77
+msgid "user"
+msgstr ""
+
+#: models.py:80
+msgid "primary"
+msgstr ""
+
+#: models.py:91
+msgid "uploaded at"
+msgstr ""
+
+#: models.py:98
+#, fuzzy
+#| msgid "avatar"
+msgid "avatars"
+msgstr "avatar"
+
+#: templates/avatar/add.html:5 templates/avatar/change.html:5
 msgid "Your current avatar: "
 msgstr "Twój aktualny avatar"
 
-#: templates/avatar/add.html:9 templates/avatar/change.html:9
+#: templates/avatar/add.html:8 templates/avatar/change.html:8
 msgid "You haven't uploaded an avatar yet. Please upload one now."
 msgstr "Nie masz aktualnie żadnych avatarów. Prosimy wyślij teraz. "
 
-#: templates/avatar/add.html:13 templates/avatar/change.html:20
+#: templates/avatar/add.html:12 templates/avatar/change.html:19
 msgid "Upload New Image"
 msgstr "Wyślij nowy obraz"
 
-#: templates/avatar/change.html:15
+#: templates/avatar/change.html:14
 msgid "Choose new Default"
 msgstr "Wybierz nowy domyślny"
 
-#: templates/avatar/confirm_delete.html:6
+#: templates/avatar/confirm_delete.html:5
 msgid "Please select the avatars that you would like to delete."
 msgstr "Wybierz avatar, który chcesz usunąć."
 
-#: templates/avatar/confirm_delete.html:9
+#: templates/avatar/confirm_delete.html:8
 #, python-format
 msgid ""
 "You have no avatars to delete. Please <a href=\"%(avatar_change_url)s"
@@ -87,7 +105,7 @@ msgstr ""
 "Nie masz avatarów do usunięcia. Prosimy <a href=\"%(avatar_change_url)s"
 "\">dodaj nowy</a>."
 
-#: templates/avatar/confirm_delete.html:15
+#: templates/avatar/confirm_delete.html:14
 msgid "Delete These"
 msgstr "Usuń wybrane"
 
@@ -129,18 +147,18 @@ msgstr ""
 "Zaktualizowałeś / zaktualizowałaś swój avatar <a href=\"%(avatar_url)s\">"
 "%(avatar)s</a>."
 
-#: templatetags/avatar_tags.py:51
+#: templatetags/avatar_tags.py:69
 msgid "Default Avatar"
 msgstr "Domyślny avatar"
 
-#: views.py:74
+#: views.py:73
 msgid "Successfully uploaded a new avatar."
 msgstr "Pomyślnie wysłano nowy avatar."
 
-#: views.py:110
+#: views.py:111
 msgid "Successfully updated your avatar."
 msgstr "Pomyślnie zaktualizowano Twój avatar."
 
-#: views.py:148
+#: views.py:150
 msgid "Successfully deleted the requested avatars."
 msgstr "Pomyślnie usunięto wskazany avatar."
diff --git a/avatar/locale/pt_BR/LC_MESSAGES/django.po b/avatar/locale/pt_BR/LC_MESSAGES/django.po
index aad3f837..5ab487a6 100644
--- a/avatar/locale/pt_BR/LC_MESSAGES/django.po
+++ b/avatar/locale/pt_BR/LC_MESSAGES/django.po
@@ -8,56 +8,73 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-28 10:59+0200\n"
+"POT-Creation-Date: 2016-09-14 16:37+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: forms.py:34
+#: admin.py:26
+#, fuzzy
+#| msgid "Avatar for %s"
+msgid "Avatar"
+msgstr "Avatar para %s"
+
+#: forms.py:24 models.py:84 models.py:97
+#, fuzzy
+#| msgid "Default Avatar"
+msgid "avatar"
+msgstr "Foto de Perfil Padrão"
+
+#: forms.py:37
 #, python-format
 msgid ""
-"%(ext)s is an invalid file extension. Authorized extensions are : %"
-"(valid_exts_list)s"
-msgstr "%(ext)s é uma extensão informada inválida. Os Formatos permitidos são : %"
-"(valid_exts_list)s"
-#: forms.py:38
+"%(ext)s is an invalid file extension. Authorized extensions are : "
+"%(valid_exts_list)s"
+msgstr ""
+"%(ext)s é uma extensão informada inválida. Os Formatos permitidos são : "
+"%(valid_exts_list)s"
+
+#: forms.py:44
 #, python-format
 msgid ""
-"Your file is too big (%(size)s), the maximum allowed size is %"
-"(max_valid_size)s"
-msgstr "Arquivo muito grande (%(size)s), o máximo permitido é %"
-"(max_valid_size)s"
+"Your file is too big (%(size)s), the maximum allowed size is "
+"%(max_valid_size)s"
+msgstr ""
+"Arquivo muito grande (%(size)s), o máximo permitido é %(max_valid_size)s"
 
-#: forms.py:44
+#: forms.py:54
 #, python-format
 msgid ""
-"You already have %(nb_avatars)d avatars, and the maximum allowed is %"
-"(nb_max_avatars)d."
-msgstr "Você já possui %(nb_avatars)d fotos. O máximo permitido é %"
-"(nb_max_avatars)d."
-#: forms.py:56 forms.py:67
+"You already have %(nb_avatars)d avatars, and the maximum allowed is "
+"%(nb_max_avatars)d."
+msgstr ""
+"Você já possui %(nb_avatars)d fotos. O máximo permitido é %(nb_max_avatars)d."
+
+#: forms.py:71 forms.py:84
 msgid "Choices"
 msgstr "Opções"
 
-#: models.py:75
-#, python-format
-msgid "Avatar for %s"
-msgstr "Avatar para %s"
+#: models.py:77
+msgid "user"
+msgstr ""
 
-#: views.py:73 views.py:95
-msgid "Successfully uploaded a new avatar."
-msgstr "Nova foto de perfil enviada com sucesso."
+#: models.py:80
+msgid "primary"
+msgstr ""
 
-#: views.py:132
-msgid "Successfully updated your avatar."
-msgstr "Sua foto foi atualizada com sucesso."
+#: models.py:91
+msgid "uploaded at"
+msgstr ""
 
-#: views.py:166
-msgid "Successfully deleted the requested avatars."
-msgstr "As fotos de perfil selecionadas foram excluídas com sucesso."
+#: models.py:98
+#, fuzzy
+#| msgid "Avatar for %s"
+msgid "avatars"
+msgstr "Avatar para %s"
 
 #: templates/avatar/add.html:5 templates/avatar/change.html:5
 msgid "Your current avatar: "
@@ -84,8 +101,9 @@ msgstr "Por favor, selecione as fotos que você deseja excluir"
 msgid ""
 "You have no avatars to delete. Please <a href=\"%(avatar_change_url)s"
 "\">upload one</a> now."
-msgstr "Você não possui uma foto. Deseja <a href=\"%(avatar_change_url)s"
-"\">enviar uma agora?</a>"
+msgstr ""
+"Você não possui uma foto. Deseja <a href=\"%(avatar_change_url)s\">enviar "
+"uma agora?</a>"
 
 #: templates/avatar/confirm_delete.html:14
 msgid "Delete These"
@@ -97,9 +115,9 @@ msgid ""
 "%(avatar_creator)s has updated their avatar %(avatar)s.\n"
 "\n"
 "http://%(current_site)s%(avatar_url)s\n"
-msgstr "%(avatar_creator)s atualizou a foto do perfil %(avatar)s.\n"
+msgstr ""
+"%(avatar_creator)s atualizou a foto do perfil %(avatar)s.\n"
 "\n"
-
 "<a href=\"%(user_url)s\">%(avatar_creator)s</a> atualizou a foto de perfil "
 "<a href=\"%(avatar_url)s\">%(avatar)s</a>."
 
@@ -118,11 +136,11 @@ msgid ""
 "Your avatar has been updated.  %(avatar)s\n"
 "\n"
 "http://%(current_site)s%(avatar_url)s\n"
-msgstr "Sua foto de perfil foi atualizada.  %(avatar)s\n"
+msgstr ""
+"Sua foto de perfil foi atualizada.  %(avatar)s\n"
 "\n"
 "http://%(current_site)s%(avatar_url)s\n"
 
-
 #: templates/notification/avatar_updated/notice.html:2
 #, fuzzy, python-format
 msgid "You have updated your avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
@@ -130,10 +148,22 @@ msgstr ""
 "<a href=\"%(user_url)s\">%(avatar_creator)s</a> atualizou a foto de perfil "
 "<a href=\"%(avatar_url)s\">%(avatar)s</a>."
 
-#: templatetags/avatar_tags.py:45
+#: templatetags/avatar_tags.py:69
 msgid "Default Avatar"
 msgstr "Foto de Perfil Padrão"
 
+#: views.py:73
+msgid "Successfully uploaded a new avatar."
+msgstr "Nova foto de perfil enviada com sucesso."
+
+#: views.py:111
+msgid "Successfully updated your avatar."
+msgstr "Sua foto foi atualizada com sucesso."
+
+#: views.py:150
+msgid "Successfully deleted the requested avatars."
+msgstr "As fotos de perfil selecionadas foram excluídas com sucesso."
+
 #~ msgid "Avatar Updated"
 #~ msgstr "Foto de Perfil Atualizada"
 
diff --git a/avatar/locale/ru/LC_MESSAGES/django.po b/avatar/locale/ru/LC_MESSAGES/django.po
index a8cfe585..353d1fda 100644
--- a/avatar/locale/ru/LC_MESSAGES/django.po
+++ b/avatar/locale/ru/LC_MESSAGES/django.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-03-17 00:31+0400\n"
+"POT-Creation-Date: 2016-09-14 16:37+0200\n"
 "PO-Revision-Date: 2012-03-17 00:31+0400\n"
 "Last-Translator: frost-nzcr4 <frost.nzcr4@jagmort.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,50 +20,74 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: forms.py:33
-#, python-format
-msgid "%(ext)s is an invalid file extension. Authorized extensions are : %(valid_exts_list)s"
-msgstr "%(ext)s запрещённое расширение. Разрешённые расширения: %(valid_exts_list)s"
+#: admin.py:26
+#, fuzzy
+#| msgid "Avatar for %s"
+msgid "Avatar"
+msgstr "Аватар для %s"
+
+#: forms.py:24 models.py:84 models.py:97
+#, fuzzy
+#| msgid "Default Avatar"
+msgid "avatar"
+msgstr "Аватар по умолчанию"
 
 #: forms.py:37
 #, python-format
-msgid "Your file is too big (%(size)s), the maximum allowed size is %(max_valid_size)s"
-msgstr "Файл слишком большой (%(size)s), максимальный допустимый размер %(max_valid_size)s"
+msgid ""
+"%(ext)s is an invalid file extension. Authorized extensions are : "
+"%(valid_exts_list)s"
+msgstr ""
+"%(ext)s запрещённое расширение. Разрешённые расширения: %(valid_exts_list)s"
 
-#: forms.py:43
+#: forms.py:44
 #, python-format
-msgid "You already have %(nb_avatars)d avatars, and the maximum allowed is %(nb_max_avatars)d."
-msgstr "У вас уже %(nb_avatars)d аватаров, максимально допустимо %(nb_max_avatars)d."
+msgid ""
+"Your file is too big (%(size)s), the maximum allowed size is "
+"%(max_valid_size)s"
+msgstr ""
+"Файл слишком большой (%(size)s), максимальный допустимый размер "
+"%(max_valid_size)s"
 
-#: models.py:72
+#: forms.py:54
 #, python-format
-msgid "Avatar for %s"
-msgstr "Аватар для %s"
+msgid ""
+"You already have %(nb_avatars)d avatars, and the maximum allowed is "
+"%(nb_max_avatars)d."
+msgstr ""
+"У вас уже %(nb_avatars)d аватаров, максимально допустимо %(nb_max_avatars)d."
 
-#: views.py:90
-msgid "Successfully uploaded a new avatar."
-msgstr "Новый аватар загружен."
+#: forms.py:71 forms.py:84
+msgid "Choices"
+msgstr ""
 
-#: views.py:128
-msgid "Successfully updated your avatar."
-msgstr "Аватар обновлён."
+#: models.py:77
+msgid "user"
+msgstr ""
 
-#: views.py:166
-msgid "Successfully deleted the requested avatars."
-msgstr "Выбранные аватары удалены."
+#: models.py:80
+msgid "primary"
+msgstr ""
+
+#: models.py:91
+msgid "uploaded at"
+msgstr ""
 
-#: templates/avatar/add.html:5
-#: templates/avatar/change.html:5
+#: models.py:98
+#, fuzzy
+#| msgid "Avatar for %s"
+msgid "avatars"
+msgstr "Аватар для %s"
+
+#: templates/avatar/add.html:5 templates/avatar/change.html:5
 msgid "Your current avatar: "
 msgstr "Ваш аватар:"
 
-#: templates/avatar/add.html:8
-#: templates/avatar/change.html:8
+#: templates/avatar/add.html:8 templates/avatar/change.html:8
 msgid "You haven't uploaded an avatar yet. Please upload one now."
 msgstr "Вы ещё не загружали аватар. Пожалуйста, загрузите его."
 
-#: templates/avatar/add.html:12
-#: templates/avatar/change.html:19
+#: templates/avatar/add.html:12 templates/avatar/change.html:19
 msgid "Upload New Image"
 msgstr "Загрузить новое изображение"
 
@@ -76,24 +101,63 @@ msgstr "Выберите аватары, которые собираетесь 
 
 #: templates/avatar/confirm_delete.html:8
 #, python-format
-msgid "You have no avatars to delete. Please <a href=\"%(avatar_change_url)s\">upload one</a> now."
-msgstr "У вас нет аватаров. <a href=\"%(avatar_change_url)s\">Загрузите</a> его."
+msgid ""
+"You have no avatars to delete. Please <a href=\"%(avatar_change_url)s"
+"\">upload one</a> now."
+msgstr ""
+"У вас нет аватаров. <a href=\"%(avatar_change_url)s\">Загрузите</a> его."
 
 #: templates/avatar/confirm_delete.html:14
 msgid "Delete These"
 msgstr "Удалить эти"
 
+#: templates/notification/avatar_friend_updated/full.txt:1
+#, fuzzy, python-format
+#| msgid ""
+#| "<a href=\"%(user_url)s\">%(avatar_creator)s</a> has updated their avatar "
+#| "<a href=\"%(avatar_url)s\">%(avatar)s</a>."
+msgid ""
+"%(avatar_creator)s has updated their avatar %(avatar)s.\n"
+"\n"
+"http://%(current_site)s%(avatar_url)s\n"
+msgstr ""
+"<a href=\"%(user_url)s\">%(avatar_creator)s</a> обновил свои аватары <a href="
+"\"%(avatar_url)s\">%(avatar)s</a>."
+
 #: templates/notification/avatar_friend_updated/notice.html:2
 #, python-format
-msgid "<a href=\"%(user_url)s\">%(avatar_creator)s</a> has updated their avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
-msgstr "<a href=\"%(user_url)s\">%(avatar_creator)s</a> обновил свои аватары <a href=\"%(avatar_url)s\">%(avatar)s</a>."
+msgid ""
+"<a href=\"%(user_url)s\">%(avatar_creator)s</a> has updated their avatar <a "
+"href=\"%(avatar_url)s\">%(avatar)s</a>."
+msgstr ""
+"<a href=\"%(user_url)s\">%(avatar_creator)s</a> обновил свои аватары <a href="
+"\"%(avatar_url)s\">%(avatar)s</a>."
+
+#: templates/notification/avatar_updated/full.txt:1
+#, python-format
+msgid ""
+"Your avatar has been updated.  %(avatar)s\n"
+"\n"
+"http://%(current_site)s%(avatar_url)s\n"
+msgstr ""
 
 #: templates/notification/avatar_updated/notice.html:2
 #, python-format
 msgid "You have updated your avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 msgstr "Вы обновили аватар <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 
-#: templatetags/avatar_tags.py:40
+#: templatetags/avatar_tags.py:69
 msgid "Default Avatar"
 msgstr "Аватар по умолчанию"
 
+#: views.py:73
+msgid "Successfully uploaded a new avatar."
+msgstr "Новый аватар загружен."
+
+#: views.py:111
+msgid "Successfully updated your avatar."
+msgstr "Аватар обновлён."
+
+#: views.py:150
+msgid "Successfully deleted the requested avatars."
+msgstr "Выбранные аватары удалены."
diff --git a/avatar/locale/zh_CN/LC_MESSAGES/django.po b/avatar/locale/zh_CN/LC_MESSAGES/django.po
index c18d3351..f4db91e1 100644
--- a/avatar/locale/zh_CN/LC_MESSAGES/django.po
+++ b/avatar/locale/zh_CN/LC_MESSAGES/django.po
@@ -7,21 +7,22 @@ msgid ""
 msgstr ""
 "Project-Id-Version: django-avatar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-03-26 16:50+0800\n"
+"POT-Creation-Date: 2016-09-14 16:37+0200\n"
 "PO-Revision-Date: 2014-03-26 17:08+0800\n"
 "Last-Translator: Bruce Yang <ayang23@gmail.com>\n"
 "Language-Team: Bruce Yang <ayang23@gmail.com>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Poedit 1.5.7\n"
 
-#: admin.py:19
+#: admin.py:26
 msgid "Avatar"
 msgstr "头像"
 
-#: forms.py:24
+#: forms.py:24 models.py:84 models.py:97
 msgid "avatar"
 msgstr "头像"
 
@@ -50,27 +51,45 @@ msgstr "您目前有 %(nb_avatars)d 个头像, 最多可以有 %(nb_max_avatars)
 msgid "Choices"
 msgstr "选项"
 
-#: templates/avatar/add.html:6 templates/avatar/change.html:6
+#: models.py:77
+msgid "user"
+msgstr ""
+
+#: models.py:80
+msgid "primary"
+msgstr ""
+
+#: models.py:91
+msgid "uploaded at"
+msgstr ""
+
+#: models.py:98
+#, fuzzy
+#| msgid "avatar"
+msgid "avatars"
+msgstr "头像"
+
+#: templates/avatar/add.html:5 templates/avatar/change.html:5
 msgid "Your current avatar: "
 msgstr "您当前的头像："
 
-#: templates/avatar/add.html:9 templates/avatar/change.html:9
+#: templates/avatar/add.html:8 templates/avatar/change.html:8
 msgid "You haven't uploaded an avatar yet. Please upload one now."
 msgstr "您还没有上传任何头像，请现在上传一个吧。"
 
-#: templates/avatar/add.html:13 templates/avatar/change.html:20
+#: templates/avatar/add.html:12 templates/avatar/change.html:19
 msgid "Upload New Image"
 msgstr "上传新照片"
 
-#: templates/avatar/change.html:15
+#: templates/avatar/change.html:14
 msgid "Choose new Default"
 msgstr "选择默认"
 
-#: templates/avatar/confirm_delete.html:6
+#: templates/avatar/confirm_delete.html:5
 msgid "Please select the avatars that you would like to delete."
 msgstr "选择要删除的头像。"
 
-#: templates/avatar/confirm_delete.html:9
+#: templates/avatar/confirm_delete.html:8
 #, python-format
 msgid ""
 "You have no avatars to delete. Please <a href=\"%(avatar_change_url)s"
@@ -78,7 +97,7 @@ msgid ""
 msgstr ""
 "没有头像可以删除. 请 <a href=\"%(avatar_change_url)s\">上传一个新头像</a>。"
 
-#: templates/avatar/confirm_delete.html:15
+#: templates/avatar/confirm_delete.html:14
 msgid "Delete These"
 msgstr "删除"
 
@@ -118,18 +137,18 @@ msgstr ""
 msgid "You have updated your avatar <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 msgstr "您已经更新了头像 <a href=\"%(avatar_url)s\">%(avatar)s</a>."
 
-#: templatetags/avatar_tags.py:51
+#: templatetags/avatar_tags.py:69
 msgid "Default Avatar"
 msgstr "默认头像"
 
-#: views.py:74
+#: views.py:73
 msgid "Successfully uploaded a new avatar."
 msgstr "成功上传头像。"
 
-#: views.py:110
+#: views.py:111
 msgid "Successfully updated your avatar."
 msgstr "更新头像成功。"
 
-#: views.py:148
+#: views.py:150
 msgid "Successfully deleted the requested avatars."
 msgstr "成功删除头像。"
diff --git a/avatar/migrations/0002_add_verbose_names_to_avatar_fields.py b/avatar/migrations/0002_add_verbose_names_to_avatar_fields.py
new file mode 100644
index 00000000..ca12b156
--- /dev/null
+++ b/avatar/migrations/0002_add_verbose_names_to_avatar_fields.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2016-09-16 08:50
+from __future__ import unicode_literals
+
+import avatar.models
+from django.conf import settings
+import django.core.files.storage
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('avatar', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='avatar',
+            options={'verbose_name': 'avatar', 'verbose_name_plural': 'avatars'},
+        ),
+        migrations.AlterField(
+            model_name='avatar',
+            name='avatar',
+            field=models.ImageField(blank=True, max_length=1024, storage=django.core.files.storage.FileSystemStorage(), upload_to=avatar.models.avatar_path_handler, verbose_name='avatar'),
+        ),
+        migrations.AlterField(
+            model_name='avatar',
+            name='date_uploaded',
+            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='uploaded at'),
+        ),
+        migrations.AlterField(
+            model_name='avatar',
+            name='primary',
+            field=models.BooleanField(default=False, verbose_name='primary'),
+        ),
+        migrations.AlterField(
+            model_name='avatar',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user'),
+        ),
+    ]
diff --git a/avatar/models.py b/avatar/models.py
index 0d4d76b5..e0dc5271 100644
--- a/avatar/models.py
+++ b/avatar/models.py
@@ -72,16 +72,30 @@ def find_extension(format):
 
 
 class Avatar(models.Model):
-    user = models.ForeignKey(getattr(settings, 'AUTH_USER_MODEL', 'auth.User'))
-    primary = models.BooleanField(default=False)
-    avatar = models.ImageField(max_length=1024,
-                               upload_to=avatar_file_path,
-                               storage=avatar_storage,
-                               blank=True)
-    date_uploaded = models.DateTimeField(default=now)
+    user = models.ForeignKey(
+        getattr(settings, 'AUTH_USER_MODEL', 'auth.User'),
+        verbose_name=_("user"),
+    )
+    primary = models.BooleanField(
+        verbose_name=_("primary"),
+        default=False,
+    )
+    avatar = models.ImageField(
+        verbose_name=_("avatar"),
+        max_length=1024,
+        upload_to=avatar_file_path,
+        storage=avatar_storage,
+        blank=True,
+    )
+    date_uploaded = models.DateTimeField(
+        verbose_name=_("uploaded at"),
+        default=now,
+    )
 
     class Meta:
         app_label = 'avatar'
+        verbose_name = _('avatar')
+        verbose_name_plural = _('avatars')
 
     def __unicode__(self):
         return _(six.u('Avatar for %s')) % self.user