diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars index cdef90f2c5e..0a614262ace 100644 --- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars @@ -47,18 +47,6 @@ {{boundAvatar model imageSize="large"}} -
- {{#if Discourse.SiteSettings.allow_uploaded_avatars}} - {{#if use_uploaded_avatar}} - {{{i18n user.avatar.instructions.uploaded_avatar}}} - {{else}} - {{{i18n user.avatar.instructions.gravatar}}} {{email}} - {{/if}} - {{else}} - {{{i18n user.avatar.instructions.gravatar}}} {{email}} - - {{/if}} -
diff --git a/config/locales/client.cs.yml b/config/locales/client.cs.yml index 57cc658473f..17fd5625b45 100644 --- a/config/locales/client.cs.yml +++ b/config/locales/client.cs.yml @@ -327,8 +327,6 @@ cs: title: "Poslední IP adresa" avatar: title: "Avatar" - instructions: - gravatar: "Používáme službu Gravatar pro zobrazení avataru podle vaší emailové adresy" title: title: "Nadpis" diff --git a/config/locales/client.da.yml b/config/locales/client.da.yml index 3ac6a6d0d34..9687ad2529e 100644 --- a/config/locales/client.da.yml +++ b/config/locales/client.da.yml @@ -187,9 +187,6 @@ da: title: "Sidste IP-adresse" avatar: title: "Brugerbillede" - instructions: - gravatar: "Vi bruger Gravatar for brugerbilleder baseret på e-mail-adresse" - filters: all: "Alle" diff --git a/config/locales/client.de.yml b/config/locales/client.de.yml index 450025133ba..778ebc5d045 100644 --- a/config/locales/client.de.yml +++ b/config/locales/client.de.yml @@ -308,9 +308,6 @@ de: title: "Letzte IP-Adresse" avatar: title: "Avatar" - instructions: - gravatar: "Wir nutzen Gravatar zur Darstellung von Avataren basierend auf deiner Mailadresse:" - title: title: "Title" diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 07fdaf03c24..1bbc2c8357c 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -317,9 +317,6 @@ en: title: "Last IP Address" avatar: title: "Avatar" - instructions: - gravatar: "We use Gravatar for avatars based on your email:" - uploaded_avatar: "We use the avatar you uploaded." title: title: "Title" diff --git a/config/locales/client.es.yml b/config/locales/client.es.yml index fbdefd05915..caa00975745 100644 --- a/config/locales/client.es.yml +++ b/config/locales/client.es.yml @@ -263,9 +263,6 @@ es: title: "Última Dirección IP" avatar: title: "Avatar" - instructions: - gravatar: "Usamos Gravatar para obtener tu avatar basado en tu dirección de email." - filters: all: "Todos" diff --git a/config/locales/client.fr.yml b/config/locales/client.fr.yml index d69dd9feb00..6c64eb6bf9b 100644 --- a/config/locales/client.fr.yml +++ b/config/locales/client.fr.yml @@ -321,10 +321,6 @@ fr: title: "Dernières adresses IP" avatar: title: "Avatar" - instructions: - gravatar: "Nous utilisons Gravatar pour associer votre avatar avec votre adresse email :" - uploaded_avatar: "Nous utilisons l'avatar que vous avez envoyé." - upload: "Ou vous pouvez envoyer une image" filters: all: "Tout" diff --git a/config/locales/client.id.yml b/config/locales/client.id.yml index f4f86754ff0..d12abc97d40 100644 --- a/config/locales/client.id.yml +++ b/config/locales/client.id.yml @@ -181,9 +181,6 @@ id: title: "Last IP Address" avatar: title: "Avatar" - instructions: - gravatar: "We use Gravatar for avatars based on your email" - filters: all: "All" diff --git a/config/locales/client.it.yml b/config/locales/client.it.yml index 5d92f69520d..92289ec23b0 100644 --- a/config/locales/client.it.yml +++ b/config/locales/client.it.yml @@ -247,9 +247,6 @@ it: title: "Ultimo indirizzo IP" avatar: title: "Avatar" - instructions: - gravatar: "Usiamo Gravatar per gli avatar basandoci sulla tua email" - filters: all: "Tutti" diff --git a/config/locales/client.ko.yml b/config/locales/client.ko.yml index db347b288e4..df6e36b56c2 100644 --- a/config/locales/client.ko.yml +++ b/config/locales/client.ko.yml @@ -213,9 +213,6 @@ ko: title: "마지막 IP 주소" avatar: title: "아바타" - instructions: - gravatar: "포럼에서는 당신의 Email을 기바능로 Gravatar 아바타 서비스를 기본적으로 사용합니다" - filters: all: "All" diff --git a/config/locales/client.nb_NO.yml b/config/locales/client.nb_NO.yml index 64f5dc2486a..1283425fe46 100644 --- a/config/locales/client.nb_NO.yml +++ b/config/locales/client.nb_NO.yml @@ -247,9 +247,6 @@ nb_NO: title: "Siste IP Addresse" avatar: title: "Profilbilde" - instructions: - gravatar: "Vi bruker Gravatar basert på din email for profilbilder." - filters: all: "Alle" diff --git a/config/locales/client.nl.yml b/config/locales/client.nl.yml index d9a6d886d17..9eddf29f96a 100644 --- a/config/locales/client.nl.yml +++ b/config/locales/client.nl.yml @@ -308,8 +308,6 @@ nl: title: Laatste IP-adres avatar: title: Profielfoto - instructions: - gravatar: "Wij gebruiken Gravatar voor profielfoto's die aan je e-mailadres gekoppeld zijn" title: title: Titel diff --git a/config/locales/client.pseudo.yml b/config/locales/client.pseudo.yml index 592f108916b..f1d048d8e64 100644 --- a/config/locales/client.pseudo.yml +++ b/config/locales/client.pseudo.yml @@ -275,9 +275,6 @@ pseudo: title: '[[ Łášť ÍР Áďďřéšš ]]' avatar: title: '[[ Áνáťář ]]' - instructions: - gravatar: '[[ Ŵé ůšé <á ĥřéƒ=''ĥťťƿš://ǧřáνáťář.čóɱ'' ťářǧéť=''_ƀłáɳǩ''>Ǧřáνáťář - ƒóř áνáťářš ƀášéď óɳ ýóůř éɱáíł ]]' title: title: '[[ Ťíťłé ]]' filters: diff --git a/config/locales/client.pt.yml b/config/locales/client.pt.yml index 69e302cb095..a1c4204a642 100644 --- a/config/locales/client.pt.yml +++ b/config/locales/client.pt.yml @@ -181,8 +181,6 @@ pt: title: "Último endereço IP" avatar: title: "Avatar" - instructions_gravatar: "Nós utilizamos Gravatar para os avatares baseados no teu email" - filters: all: "Todos" diff --git a/config/locales/client.pt_BR.yml b/config/locales/client.pt_BR.yml index 86167d5bb9a..5ef208e7318 100644 --- a/config/locales/client.pt_BR.yml +++ b/config/locales/client.pt_BR.yml @@ -268,8 +268,6 @@ pt_BR: title: "Último endereço IP" avatar: title: "Avatar" - instructions: - gravatar: "Nós utilizamos Gravatar para os avatares baseados no seu email" title: title: "Título" filters: diff --git a/config/locales/client.ru.yml b/config/locales/client.ru.yml index 77635407067..50f4af139e7 100644 --- a/config/locales/client.ru.yml +++ b/config/locales/client.ru.yml @@ -339,9 +339,6 @@ ru: title: Последний IP адрес avatar: title: Аватар - instructions: - gravatar: "Мы используем Gravatar для аватаров на основе вашего почтового адреса:" - uploaded_avatar: Мы используем аватар, который вы загрузили. title: title: Заголовок filters: diff --git a/config/locales/client.sv.yml b/config/locales/client.sv.yml index f1b67562c0e..965fb35e389 100644 --- a/config/locales/client.sv.yml +++ b/config/locales/client.sv.yml @@ -191,9 +191,6 @@ sv: title: "Senaste IP-adress" avatar: title: "Profilbild" - instructions: - gravatar: "Vi använder Gravatar för profilbilder baserat på din e-post" - filters: all: "Alla" diff --git a/config/locales/client.zh_CN.yml b/config/locales/client.zh_CN.yml index 33829e5de7a..6ffb3170db1 100644 --- a/config/locales/client.zh_CN.yml +++ b/config/locales/client.zh_CN.yml @@ -317,9 +317,6 @@ zh_CN: title: "最后使用的IP地址" avatar: title: "头像" - instructions: - gravatar: "正在使用基于此邮件地址的Gravatar头像:" - uploaded_avatar: "正在使用上传的头像" title: title: "头衔" diff --git a/config/locales/client.zh_TW.yml b/config/locales/client.zh_TW.yml index 7fe7cb1aee6..f640346451a 100644 --- a/config/locales/client.zh_TW.yml +++ b/config/locales/client.zh_TW.yml @@ -307,9 +307,6 @@ zh_TW: title: "最後使用的IP地址" avatar: title: "頭像" - instructions: - gravatar: "我們目前使用 Gravatar 來基於你的郵箱生成頭像" - filters: all: "全部"