diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index ce609d0fc..7e93df46f 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -94,7 +94,7 @@
   <string name="faint_subtitle">Nicht verzweifeln!</string>
   <string name="faint_penalty_body">Du hast einen Level, Dein Gold und einen Teil Deiner Ausrüstung verloren, aber Du kannst alles durch harte Arbeit wieder zurückbekommen! Viel Glück -- Du schaffst das.</string>
   <string name="faint_header">Du hast alle Deine Lebenspunkte verloren!</string>
-  <string name="faint_button"><![CDATA[Lebenspunkte wiederherstellen & nochmal versuchen]]></string>
+  <string name="faint_button">Lebenspunkte auffüllen &amp; Nochmal versuchen</string>
   <string name="filter">Filtern</string>
   <string name="profile_image">Profilbild</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 3022ca7a2..f633a58dd 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -93,7 +93,6 @@
   <string name="faint_subtitle">Don\'t despair!</string>
   <string name="faint_penalty_body">You lost a Level, your Gold, and a piece of Equipment, but you can get them all back with hard work! Good luck--you\'ll do great.</string>
   <string name="faint_header">You ran out of Health!</string>
-  <string name="faint_button"><![CDATA[Refill Health & Try Again]]></string>
   <string name="filter">Filter</string>
   <string name="profile_image">Profile Image</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 59686c2e0..6ed6ec16f 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -70,6 +70,7 @@
   <string name="positive_habit_form">Positivo ( + )</string>
   <string name="negative_habit_form">Negativo ( - )</string>
   <string name="checklist">Listado</string>
+  <string name="reminders">Recordatorios</string>
   <string name="actions">Acciones</string>
   <string name="attributes">Atributos</string>
   <string name="physical">Físico</string>
@@ -93,7 +94,7 @@
   <string name="faint_subtitle">¡No desesperes!</string>
   <string name="faint_penalty_body">Has perdido un nivel, todo tu oro y una pieza de tu equipamiento, ¡pero puedes recuperarlo todo con tu esfuerzo! Buena suerte, lo harás genial.</string>
   <string name="faint_header">¡Te has quedado sin salud!</string>
-  <string name="faint_button"><![CDATA[Recuperar salud y volver a intentarlo]]></string>
+  <string name="faint_button">Recuperar toda la salud y volver a intentarlo</string>
   <string name="filter">Filtro</string>
   <string name="profile_image">Imagen de perfil</string>
   <string name="mana_price_button" formatted="false">%d PM</string>
@@ -104,7 +105,7 @@
   <string name="skill_progress_title">Usando habilidad</string>
   <string name="coming_soon">Próximamente</string>
   <string name="chat_flag_confirmation">¿Seguro que quieres informar de que este mensaje incumple las normas?</string>
-  <string name="flag_confirm">Marcar mensaje</string>
+  <string name="flag_confirm">Denunciar mensaje</string>
   <string name="unlock_lvl_11">Se desbloquea en el nivel 11</string>
   <string name="no_party_message">No formas parte de ningún grupo. Para unirte a uno, entra en la página web.</string>
   <string name="forgot_pw_btn">He olvidado la contraseña</string>
@@ -200,7 +201,7 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="setup_task_teams_3">Acabar trabajo en equipo</string>
   <string name="setup_task_chores_1">Limpiar 10 minutos</string>
   <string name="setup_task_chores_2">Lavar los platos</string>
-  <string name="setup_task_chores_3">Organizar el armario</string>
+  <string name="setup_task_chores_3">Ordenar el armario</string>
   <string name="setup_task_creativity_1">Estudiar hasta dominar la técnica</string>
   <string name="setup_task_creativity_2">Trabajar en proyecto creativo</string>
   <string name="setup_task_creativity_3">Terminar proyecto creativo</string>
@@ -225,7 +226,7 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="todo_due" formatted="false">Para: %s</string>
   <string name="daily_streak" formatted="false">racha actual: %d</string>
   <string name="todo_has_duedate">La tarea tiene fecha límite</string>
-  <string name="battle_gear">Armadura</string>
+  <string name="battle_gear">Equipo de batalla</string>
   <string name="costume">Disfraz</string>
   <string name="outfit_head">Cabeza</string>
   <string name="outfit_headAccessory">Accesorio para la cabeza</string>
@@ -304,6 +305,7 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="dialog_go_back">Volver</string>
   <string name="opt_out_confirmation">¿Seguro que no quieres elegir?</string>
   <string name="change_class">Cambiar de clase</string>
+  <string name="change_class_description">Cambia de clase y recupera tus puntos de atributos por 3 gemas. Puedes asignar los puntos de atributos en el sitio web.</string>
   <string name="enable_class">Activar sistema de clases</string>
   <string name="changing_class_progress">Cambio de clase</string>
   <string name="by_email">Por correo electrónico</string>
@@ -320,4 +322,7 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="share_levelup" formatted="false">¡He subido al nivel %s en Habitica mejorando mis hábitos en el mundo real!</string>
   <string name="share_hatched" formatted="false">¡He criado un %1$s %2$s de mascota en Habitica realizando tareas en mi vida real!</string>
   <string name="share_raised" formatted="false">¡He conseguido una montura de %1$s %2$s en Habitica realizando tareas en mi vida real!</string>
+  <string name="open_in_store">Abrir en Play Store</string>
+  <string name="change_class_confirmation">¿Seguro que quieres cambiar de clase? Te costará 3 gemas.</string>
+  <string name="leaderMessage" formatted="false">Mensaje de %1$s</string>
 </resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index a0bc75877..e1c419e04 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -94,7 +94,7 @@
   <string name="faint_subtitle">Ne désespérez pas !</string>
   <string name="faint_penalty_body">Vous avez perdu un niveau, de l\'or, et une pièce d\'équipement, mais vous pouvez tous les récupérer en travaillant dur ! Bonne chance--vous y arriverez.</string>
   <string name="faint_header">Vous n\'avez plus de points de vie !</string>
-  <string name="faint_button"><![CDATA[Reprendre Vie & Essayer à Nouveau]]></string>
+  <string name="faint_button">Reprendre des forces &amp; réessayer</string>
   <string name="filter">Filtrer</string>
   <string name="profile_image">Image de Profil</string>
   <string name="mana_price_button" formatted="false">%d Points de Mana</string>
diff --git a/Habitica/res/values-he/strings.xml b/Habitica/res/values-he/strings.xml
index a24283bab..024e54570 100644
--- a/Habitica/res/values-he/strings.xml
+++ b/Habitica/res/values-he/strings.xml
@@ -70,6 +70,7 @@
   <string name="positive_habit_form">חיובי ( + )</string>
   <string name="negative_habit_form">שלילי ( - )</string>
   <string name="checklist">רשימה</string>
+  <string name="reminders">תזכורות</string>
   <string name="actions">פעולות</string>
   <string name="attributes">תכונות</string>
   <string name="physical">פיזי</string>
@@ -93,7 +94,6 @@
   <string name="faint_subtitle">אל ייאוש!</string>
   <string name="faint_penalty_body">הפסדתם דרגה, זהב, וחפץ, אך אתם יכולים להשיג אותם שוב עם עבודה קשה! בהצלחה--אתם תצליחו.</string>
   <string name="faint_header">נגמרה לכם הבריאות!</string>
-  <string name="faint_button"><![CDATA[מלאו בריאות ונסו שוב]]></string>
   <string name="filter">מסנן</string>
   <string name="profile_image">תמונת פרופיל</string>
   <string name="mana_price_button" formatted="false">%d מאנה</string>
@@ -323,4 +323,5 @@
   <string name="share_raised" formatted="false">הרגע הרווחתי חיית רכיבה של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
   <string name="open_in_store">פתיחה בפליי סטור</string>
   <string name="change_class_confirmation">האם אתם בטוחים שאתם מעוניינים להחליף מקצוע? זה יעלה לכם 3 אבני חן.</string>
+  <string name="leaderMessage" formatted="false">הודעה מאת %1$s</string>
 </resources>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 4f25533a0..52cc42f0a 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -93,7 +93,6 @@
   <string name="faint_subtitle">Ne očajavaj!</string>
   <string name="faint_penalty_body">Pao/la si Razinu, izgubio/la Zlato i komad Opreme, ali možeš sve to vratiti ako se potrudiš! Sretno--proć ćeš super.</string>
   <string name="faint_header">Ostao/la si bez života</string>
-  <string name="faint_button"><![CDATA[Napuni život i pokušaj ponovno]]></string>
   <string name="filter">Filtriraj</string>
   <string name="profile_image">Profilna Slika</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
diff --git a/Habitica/res/values-id/strings.xml b/Habitica/res/values-id/strings.xml
index 62ee8b470..00852c7b7 100644
--- a/Habitica/res/values-id/strings.xml
+++ b/Habitica/res/values-id/strings.xml
@@ -93,7 +93,6 @@
   <string name="faint_subtitle">Jangan bersedih!</string>
   <string name="faint_penalty_body">Kamu kehilangan Level, Emasmu, dan sepotong Perlengkapan, tetapi kamu dapat mendapatkannya kembali dengan kerja keras! Semoga berhasil--kamu pasti bisa.</string>
   <string name="faint_header">Kamu kehabisan Nyawa!</string>
-  <string name="faint_button"><![CDATA[Refill Health & Try Again]]></string>
   <string name="filter">Filter</string>
   <string name="profile_image">Gambar Profil</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 0cd872020..c46f53112 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -94,7 +94,6 @@
   <string name="faint_subtitle">Non disperarti!</string>
   <string name="faint_penalty_body">Hai perso un livello, il tuo oro e un pezzo di equipaggiamento, ma puoi riottenere ogni cosa lavorando sodo! Buona fortuna - vedrai che ci riuscirai.</string>
   <string name="faint_header">Hai finito i punti salute!</string>
-  <string name="faint_button"><![CDATA[Ripristina Salute e riprova]]></string>
   <string name="filter">Filtro</string>
   <string name="profile_image">Immagine profilo</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 9baba5ac3..e7feeefe8 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -94,11 +94,11 @@
   <string name="faint_subtitle">がっかりしないで!</string>
   <string name="faint_penalty_body">レベルとゴールドと、いずれかの装備品を失いました。しかし、がんばればすべてを取り返せます! 　あなたなら、きっとできる。幸あらんことを。</string>
   <string name="faint_header">体力がなくなった!</string>
-  <string name="faint_button"><![CDATA[体力を満たしてもう一度]]></string>
+  <string name="faint_button">体力を全回復してやり直す</string>
   <string name="filter">フィルター</string>
   <string name="profile_image">プロフィール画像</string>
   <string name="mana_price_button" formatted="false">%d マナ</string>
-  <string name="used_skill" formatted="false">%2$d マナを %1$s ゴールドで買った</string>
+  <string name="used_skill" formatted="false">%2$dマナを消費して%1$sを使いました。</string>
   <string name="new_checklist_item">新しいチェックリスト項目</string>
   <string name="add_checklist_item">追加</string>
   <string name="reminder_title">日課をチェックしましたか?</string>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 0ac4d1c21..e7c27082a 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -94,7 +94,6 @@
   <string name="faint_subtitle">좌절하지 말아요!</string>
   <string name="faint_penalty_body">당신은 레벨, 골드, 장비 한개를 잃었지만, 열심히 일하면 곧 되찾을 수 있을꺼에요! 행운을 빌어요--분명 잘 해낼꺼에요.</string>
   <string name="faint_header">체력이 모두 떨어졌어요!</string>
-  <string name="faint_button"><![CDATA[체력 회복하고 다시 도전하기]]></string>
   <string name="filter">필터</string>
   <string name="profile_image">프로필 사진</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index 139ea84d4..e1a1488ef 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -93,7 +93,6 @@
   <string name="faint_subtitle">Nepergyvenk!</string>
   <string name="faint_penalty_body">Praradai Lygį, Auksą, ir dalį savo Aprangos, bet gali juos visus atgauti labiau pasistengęs(us)! Sėkmės - tau tikrai pasiseks.</string>
   <string name="faint_header">Tavo gyvybingumas išseko!</string>
-  <string name="faint_button"><![CDATA[Refill Health & Try Again]]></string>
   <string name="filter">FIltras</string>
   <string name="profile_image">Profilis Paveikslėlis</string>
   <string name="mana_price_button" formatted="false">%d Magijos Taškai</string>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index c72b42bab..d250c60a2 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -70,6 +70,7 @@
   <string name="positive_habit_form">Positief ( + )</string>
   <string name="negative_habit_form">Negatief ( - )</string>
   <string name="checklist">Checklist</string>
+  <string name="reminders">Herinneringen</string>
   <string name="actions">Acties</string>
   <string name="attributes">Attributen</string>
   <string name="physical">Fysiek</string>
@@ -93,7 +94,6 @@
   <string name="faint_subtitle">Wanhoop niet!</string>
   <string name="faint_penalty_body">Je verliest een Level, je Goud, en een stuk Uitrusting, maar je kunt ze allemaal terugkrijgen door hard te werken! Succes--je zult het geweldig doen.</string>
   <string name="faint_header">Je hebt geen Gezondheid meer!</string>
-  <string name="faint_button"><![CDATA[Refill Health & Try Again]]></string>
   <string name="filter">Filter</string>
   <string name="profile_image">Profielfoto</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
@@ -323,4 +323,5 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="share_raised" formatted="false">Ik heb net een %1$s %2$s rijdier gekregen in Habitica door mijn echte taken uit te voeren!</string>
   <string name="open_in_store">Open in de play store</string>
   <string name="change_class_confirmation">Weet je zeker dat je van klasse wil veranderen? Dit kost 3 edelstenen.</string>
+  <string name="leaderMessage" formatted="false">Bericht van %1$s</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 2e7a780ab..23f140a7d 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -93,7 +93,6 @@
   <string name="faint_subtitle">Nie rozpaczaj!</string>
   <string name="faint_penalty_body">Straciłeś Poziom, Złoto i jedną część Wyposażenia, ale możesz je odzyskać dzięki ciężkiej pracy! Powodzenia - dasz radę.</string>
   <string name="faint_header">Możesz stracić całe Zdrowie!</string>
-  <string name="faint_button"><![CDATA[Odnów Zdrowie i spróbuj ponownie]]></string>
   <string name="filter">Filtr</string>
   <string name="profile_image">Obrazek profilowy</string>
   <string name="mana_price_button" formatted="false">%d PM</string>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index ab3e28f4a..c3f3a8d65 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -94,7 +94,7 @@
   <string name="faint_subtitle">Não se desespere!</string>
   <string name="faint_penalty_body">Você perdeu um Nível. seu Ouro, e uma parte de Equipamento, mas você pode ganhar todos eles de volta com trabalho pesado! Boa sorte--Você se sairá ótimo!</string>
   <string name="faint_header">Você esgotou sua vida!</string>
-  <string name="faint_button"><![CDATA[Refill Health & Try Again]]></string>
+  <string name="faint_button">Restaurar Vida &amp; Tentar Novamente</string>
   <string name="filter">Filtro</string>
   <string name="profile_image">Imagem de Perfil</string>
   <string name="mana_price_button" formatted="false">%d PM</string>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index ec235da66..995b38d14 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -92,7 +92,6 @@
   <string name="faint_subtitle">Não desesperes!</string>
   <string name="faint_penalty_body">Tu perdeste um Nível, o teu Ouro e uma peça do teu Equipamento, mas consegues recuperá-los de volta com trabalho duro! Boa sorte - tu serás grande.</string>
   <string name="faint_header">Tu ficaste sem Saúde!</string>
-  <string name="faint_button"><![CDATA[Reenche a Saúde e Tenta Novamente]]></string>
   <string name="filter">Filtro</string>
   <string name="profile_image">Imagem de perfil</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index b1ca4d07d..edaf6225a 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -94,7 +94,6 @@
   <string name="faint_subtitle">Не отчаивайтесь!</string>
   <string name="faint_penalty_body">Вы потеряли уровень, золото и предмет экипировки, но сможете это наверстать, если постараетесь! Удачи! Все получится!</string>
   <string name="faint_header">У вас закончилось здоровье!</string>
-  <string name="faint_button"><![CDATA[Refill Health & Try Again]]></string>
   <string name="filter">Фильтр</string>
   <string name="profile_image">Аватар</string>
   <string name="mana_price_button" formatted="false">%d М</string>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index cf713a44e..6f21deddc 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -70,6 +70,7 @@
   <string name="positive_habit_form">正面的(+)</string>
   <string name="negative_habit_form">负面的 (-)</string>
   <string name="checklist">检查蛋</string>
+  <string name="reminders">提醒</string>
   <string name="actions">动作</string>
   <string name="attributes">属性</string>
   <string name="physical">身体上的</string>
@@ -93,6 +94,7 @@
   <string name="faint_subtitle">别失望！</string>
   <string name="faint_penalty_body">你降了一级，丢失了所有的金币和一件装备。不过继续努力，你还可以把他们都拿回来的！加油！你做的很棒！</string>
   <string name="faint_header">你没有生命值了！</string>
+  <string name="faint_button">补满生命值 &amp; 再次尝试</string>
   <string name="filter">过滤器</string>
   <string name="profile_image">头像</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
@@ -216,6 +218,7 @@
   <string name="flag">标志</string>
   <string name="delete">删除</string>
   <string name="name">名称</string>
+  <string name="description">描述</string>
   <string name="add_tag">添加标签</string>
   <string name="privacy">隐私</string>
   <string name="write_message">写消息</string>
@@ -321,4 +324,5 @@
   <string name="share_raised" formatted="false">我刚刚在Habitica中通完成我现实生活中的任务得到了一匹坐骑%1$s %2$s！</string>
   <string name="open_in_store">在应用商店开放</string>
   <string name="change_class_confirmation">你确定想要转变职业吗？这将花费3颗宝石。</string>
+  <string name="leaderMessage" formatted="false">从%1$s来的消息</string>
 </resources>