diff --git a/Habitica/res/layout/dialog_levelup.xml b/Habitica/res/layout/dialog_levelup.xml
index ff02a086c..f7b8ff269 100644
--- a/Habitica/res/layout/dialog_levelup.xml
+++ b/Habitica/res/layout/dialog_levelup.xml
@@ -8,23 +8,18 @@
     android:paddingStart="24dip"
     android:paddingRight="24dip">
     <com.habitrpg.android.habitica.ui.AvatarView
-        android:layout_width="@dimen/avatar_small_width"
-        android:layout_height="@dimen/avatar_small_height"
+        android:layout_width="@dimen/avatar_width"
+        android:layout_height="@dimen/avatar_height"
         android:id="@+id/avatarView"
         android:layout_gravity="center_horizontal"
-        app:showBackground="false"
-        app:showMount="false"
-        app:showPet="false" />
+        android:layout_marginTop="@dimen/spacing_large"
+        android:layout_marginBottom="@dimen/spacing_large"/>
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/levelupDetail"
-        android:textStyle="bold" />
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/levelup_health"
-        android:id="@+id/textView11" />
+        android:text="@string/levelup_detail"
+        android:gravity="center_horizontal"
+        android:textColor="@color/gray_200"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 046d1a345..36d968ebf 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -115,9 +115,6 @@
   <string name="friday">Петък</string>
   <string name="saturday">Събота</string>
   <string name="sunday">Неделя</string>
-  <string name="levelup_header">Вдигнахте ниво!</string>
-  <string name="levelup_detail">Изпълнявайки целите си в истинския живот, Вие достигнахте ниво %1$d!</string>
-  <string name="levelup_health">Вие бяхте излекуван(а) напълно!</string>
   <string name="levelup_button">Ура!</string>
   <string name="faint_subtitle">Не се отчайвайте!</string>
   <string name="faint_penalty_body">Изгубихте ниво, всичкото си злато и един предмет от екипировката си, но можете да си ги върнете с усърдна работа! Късмет — ще се справите.</string>
@@ -130,7 +127,7 @@
   <string name="used_skill_without_mana">Вие използвахте %1$s.</string>
   <string name="new_checklist_item">нова подзадача</string>
   <string name="add_checklist_item">Добавяне</string>
-  <string name="reminder_title">Не забравяйте да изпълнявате ежедневните си задачи!</string>
+  <string name="reminder_title">Не забравяйте да отметнете задачите си</string>
   <string name="skill_progress_title">Използване на умение</string>
   <string name="coming_soon">Очаквайте скоро</string>
   <string name="chat_flag_confirmation">Наистина ли искате да докладвате това съобщение за нарушение?</string>
@@ -212,7 +209,7 @@
   <string name="setup_group_school">Училище</string>
   <string name="setup_group_teams">Екипи</string>
   <string name="setup_group_chores">Домакинска работа</string>
-  <string name="setup_group_creativity">Изобретателност</string>
+  <string name="setup_group_creativity">Творчество</string>
   <string name="setup_task_work_1">Обработка на е-поща</string>
   <string name="setup_task_work_2">Най-важната задача</string>
   <string name="setup_task_work_3">Работен проект</string>
@@ -270,13 +267,14 @@
   <string name="equipped">Екипирано</string>
   <string name="quest_cancel_message">Наистина ли искате да прекратите мисията? Всички приети покани ще бъдат загубени. Притежателят на мисията ще си запази свитъка ѝ.</string>
   <string name="quest.invitation">Покана за мисия</string>
+  <string name="quest_begin_message">Наистина ли искате това? Само %1$d от общо %2$d членове на групата са се присъединили в мисията! Мисията ще започне автоматично, след като всички играчи се присъединят или откажат поканата.</string>
   <string name="quest.invitation.text">Получихте покана за участие в мисия!</string>
-  <string name="ago_1day">Преди 1 ден</string>
-  <string name="ago_days">Преди %d дни</string>
-  <string name="ago_1Minute">Преди 1 минута</string>
-  <string name="ago_minutes">Преди %d минути</string>
-  <string name="ago_hours">Преди %d часа</string>
-  <string name="ago_1hour">Преди 1 час</string>
+  <string name="ago_1day">Преди 1 час</string>
+  <string name="ago_days">Преди %dдни</string>
+  <string name="ago_1Minute">Преди 1 мин</string>
+  <string name="ago_minutes">Преди %dмин</string>
+  <string name="ago_hours">Преди %dч</string>
+  <string name="ago_1hour">Преди 1 ч</string>
   <string name="today">Днес</string>
   <string name="sidebar_items">Предмети</string>
   <string name="eggs">Яйца</string>
@@ -301,22 +299,26 @@
   <string name="feed">Хранене</string>
   <string name="hatch_with">Излюпване на любимец с %s</string>
   <string name="hatched_pet_title">Вие излюпихте %1$s %2$s!</string>
-  <string name="evolved_pet_title">Вие укротихте %1$s %2$s, хайде да пояздим!</string>
+  <string name="evolved_pet_title">Вие опитомихте %1$s %2$s. Да се качваме!</string>
   <string name="close">Затваряне</string>
   <string name="share">Споделяне</string>
   <string name="notification_pet_fed">Вие нахранихте своя(та/то) %1$s %2$s!</string>
   <string name="notification_purchase">Вие закупихте %s</string>
   <string name="notification_purchase_reward">Вие закупихте награда</string>
-  <string name="sectionpets">Обикновени любимци</string>
-  <string name="sectionpremiumPets">Любимци от магически отвари</string>
-  <string name="sectionquestPets">Любимци от мисии</string>
-  <string name="sectionspecialPets">Редки любимци</string>
-  <string name="sectionmounts">Обикновени превози</string>
-  <string name="sectionpremiumMounts">Превози от магически отвари</string>
-  <string name="sectionquestMounts">Превози от мисии</string>
-  <string name="sectionspecialMounts">Редки превози</string>
+  <string name="sectionpets">Обикновени</string>
+  <string name="sectionpremiumPets">Магическа отвара</string>
+  <string name="sectionquestPets">Мисия</string>
+  <string name="sectionspecialPets">Редки</string>
+  <string name="sectionmounts">Обикновени</string>
+  <string name="sectionpremiumMounts">Магическа отвара</string>
+  <string name="sectionquestMounts">Мисия</string>
+  <string name="sectionspecialMounts">Редки</string>
   <string name="world_quest">Световна мисия</string>
-  <string name="inn_description">Починете в странноприемницата, за да не Ви наранят неизпълнените ежедневни задачи! (Забележка: това не Ви защитава от получаването на щети от главатари.)</string>
+  <string name="inn_description">Нуждаете се от почивка? Идете в странноприемницата на Даниел, за да спрете някои от по-трудните механики на Хабитика:\n\n
+• Пропуснатите ежедневни задачи няма да Ви нараняват;\n
+• Задачите няма да губят серията си или да променят цвета си;\n
+• Главатарите няма да Ви нанасят щети заради пропуснатите ежедневни задачи;\n
+• Щетите Ви срещу главатар и предметите от събираческите мисии ще Ви чакат докато излезете от странноприемницата.</string>
   <string name="empty_items">Нямате %s</string>
   <string name="user_level">Ниво %d</string>
   <string name="user_level_with_class">Ниво %1$d %2$s</string>
@@ -338,7 +340,7 @@
   <string name="dialog_go_back">Назад</string>
   <string name="opt_out_confirmation">Наистина ли искате да се откажете?</string>
   <string name="change_class">Промяна на класа</string>
-  <string name="change_class_description">Променете класа си и възстановете показателните си точки за 3 диаманта. Можете да разпределите показателните си точки през уеб сайта</string>
+  <string name="change_class_description">Променете класа си и възстановете точките си за показателите за 3 диаманта.</string>
   <string name="enable_class">Включване на класовата система</string>
   <string name="changing_class_progress">Промяна на класа</string>
   <string name="by_email">По е-поща</string>
@@ -346,6 +348,7 @@
   <string name="send">Изпращане</string>
   <string name="invite">Поканете приятели</string>
   <string name="invite_id_description">Ако имате приятели, които вече използват Хабитика, поканете ги чрез потребителски идентификатор тук.</string>
+  <string name="invite_username_description">Ако имате приятели, които вече използват Хабитика, поканете ги чрез потребителските им имена тук.</string>
   <string name="invite_email_description">Ако приятел се присъедини към Хабитика през Вашето е-писмо, той автоматично ще бъде поканен в групата Ви!</string>
   <string name="add_invites">Добавяне на покани</string>
   <string name="user_id">Потребителски ид.</string>
@@ -364,8 +367,10 @@
   <string name="market">Пазар</string>
   <string name="timeTravelers">Пътешественици във времето</string>
   <string name="seasonalShop">Сезонен магазин</string>
-  <string name="empty_inbox">Нямате входящи съобщения. Можете да изпратите ново съобщение на потребител от екрана с неговите публични съобщения в чата!</string>
+  <string name="empty_inbox">Нямате съобщения. Можете да изпратите съобщение на потребител от екрана с неговите публични съобщения в чата!</string>
   <string name="party_invite">Отключете като поканите приятели</string>
+  <string name="login_incentive">Отключете като се вписвате редовно в Хабитика</string>
+  <string name="create_account">Отключете като си създадете профил</string>
   <string name="no_gold">Нямате достатъчно злато</string>
   <string name="no_potion">Няма нужда да купувате лековита отвара</string>
   <string name="successful_purchase">Закупено: %1$s</string>
@@ -493,7 +498,7 @@
   <string name="warning">Внимание</string>
   <string name="open_settings">Отваряне на настройките</string>
   <string name="dont_keep_activities_warning">Изглежда сте включили опцията за разработчици „Да не се пазят дейностите“. В момента тя предизвиква проблеми с приложението на Хабитика, така че е препоръчително да я изключите.</string>
-  <string name="inbox">Входящи</string>
+  <string name="inbox">Съобщения</string>
   <string name="FAQ">Често задавани въпроси</string>
   <string name="special">Специален</string>
   <string name="gem_for_gold_description">Тъй като имате абонамент за Хабитика, можете всеки месец да купувате определен брой диаманти срещу злато.</string>
@@ -519,7 +524,7 @@
   <string name="login_btn_fb">Влизане с Фейсбук</string>
   <string name="login_btn_google">Влизане с Гугъл</string>
   <string name="action_back">Назад</string>
-  <string name="welcome_text">О, сигурно сте нов тук. Аз съм Джъстин и ще бъда Вашият съветник в Хабитика.\n\nЗа да започнете, ще трябва да си създадете герой.</string>
+  <string name="welcome_text">О, сигурно сте нов тук. Аз съм Джъстин и ще бъда Вашият съветник в Хабитика.\n\nПърво, как да Ви наричам? Можете спокойно да промените това, което съм избрал. Когато сте готови, можем да преминем към създаването на герой!</string>
   <string name="randomize">Разбъркване</string>
   <string name="avatar_extras">Екстри</string>
   <string name="avatar_skin_color">Цвят на кожата</string>
@@ -531,7 +536,7 @@
   <string name="weak">Слаби</string>
   <string name="strong">Силни</string>
   <string name="gray">Изпълнени</string>
-  <string name="dated">С дата</string>
+  <string name="dated">Запланувани</string>
   <string name="completed">Завършени</string>
   <string name="setuP_group_other">Други</string>
   <string name="clear">Изчистване</string>
@@ -556,11 +561,11 @@
   <string name="gem_reward">Награда в диаманти</string>
   <string name="tasks">Задачи</string>
   <string name="create_challenge">Създаване на предизвикателство</string>
-  <string name="edit_challenge">Редактирай предизвикателството</string>
-  <string name="challenge_create_error_tavern_one_gem">За да създадете предизвикателство в кръчмата, се нуждаете от поне 1 диамант.</string>
+  <string name="edit_challenge">Редактиране</string>
+  <string name="challenge_create_error_tavern_one_gem">Трябва да разполагате с поне 1 диамант, за да създадете обществено предизвикателство.</string>
   <string name="challenge_create_error_enough_gems">Не разполагате с достатъчно диаманти, за да създадете предизвикателство.</string>
-  <string name="identify_your_challenge_with_a_tag">Задайте етикет на предизвикателството си…</string>
-  <string name="challenge_create_error_tag">Трябва Ви етикет, за да създадете това предизвикателство.</string>
+  <string name="identify_your_challenge_with_a_tag">Задайте кратко име на предизвикателството си</string>
+  <string name="challenge_create_error_tag">Трябва Ви кратко име, за да създадете това предизвикателство.</string>
   <string name="challenge_create_error_no_tasks">Трябва да добавите поне една задача, за да създадете това предизвикателство.</string>
   <string name="challenge_create_error_title">Трябва Ви заглавие, за да създадете това предизвикателство.</string>
   <string name="description_optional">Описание (незадължително)</string>
@@ -609,7 +614,7 @@
   <string name="int_abbrv">ИНТ</string>
   <string name="con_abbrv">ЯКО</string>
   <string name="reset_account">Нулиране на профила</string>
-  <string name="reset_account_description">ВНИМАНИЕ! Това нулира части от профила Ви. Това е силно непрепоръчително, но някои хора го смятат за полезно в началото, след като са използвали уеб сайта известно време.\n\nЩе загубите всичките си нива, злато и точки опит. Всички задачи (освен тези от предизвикателства) ще бъдат изтрити завинаги и ще загубите цялата им история. Ще загубите всичката си екипировка, но ще можете да си купите отново всичко, включително предметите от ограничени серии и тайнствените предмети за абонати, които притежавате в момента (ще трябва да използвате правилния клас, за да закупите отново класово-специфичната екипировка). Ще запазите текущия си клас, както и любимците и превозите си. Вместо това, може да предпочетете да използвате Кълбото на прераждането, което е много по-безопасно и ще запази задачите и екипировката Ви.</string>
+  <string name="reset_account_description">ВНИМАНИЕ! Това нулира много части от профила Ви. Това е силно непрепоръчително, но някои хора го смятат за полезно в началото, след като са използвали уеб сайта известно време.\n\nЩе загубите всичките си нива, злато и точки опит. Всички задачи (освен тези от предизвикателства) ще бъдат изтрити завинаги и ще загубите цялата им история. Ще загубите всичката си екипировка, но ще можете да си купите отново всичко, включително предметите от ограничени серии и тайнствените предмети за абонати, които притежавате в момента (ще трябва да използвате правилния клас, за да закупите отново класово-специфичната екипировка). Ще запазите текущия си клас, както и любимците и превозите си. Вместо това, може да предпочетете да използвате Кълбото на прераждането, което е много по-безопасно и ще запази задачите и екипировката Ви.</string>
   <string name="delete_account">Изтриване на профила</string>
   <string name="delete_account_description">Наистина ли искате това? Профилът Ви ще бъде изтрит завинаги и няма да може да бъде възстановен! Ще трябва да регистрирате нов профил, ако искате да използвате Хабитика отново. Закупените и използваните диаманти няма да Ви бъдат възстановени. Ако сте напълно сигурен/на в решението си, въведете паролата си в полето.</string>
   <string name="reset_account_confirmation">нулиране на профила ми</string>
@@ -650,6 +655,7 @@
   <string name="change_password">Промяна на паролата</string>
   <string name="change_email">Промяна на е-пощата</string>
   <string name="change_login_name">Промяна на потребителското име</string>
+  <string name="change_username">Промяна на потребителското име</string>
   <string name="change">Промяна</string>
   <string name="character_level">Ниво на героя</string>
   <string name="auto_allocate_points">Авт. разпределение на точките</string>
@@ -675,4 +681,120 @@
   <string name="distribute_class_help">Задава повече точки на показателите, които са важни за класа Ви.</string>
   <string name="distribute_task_help">Задава точки според силата, интелигентността, якостта и усета, свързани със задачите, които изпълнявате.</string>
   <string name="allocating_points">Разпределение на точките</string>
+  <string name="class_equipment">Екипировка</string>
+  <string name="equipment_empty">Вече имате всичката възможна екипировка! Още ще стане налична по време на големите празненства, около слънцестоенията и равноденствията.</string>
+  <string name="classless">Без клас</string>
+  <string name="class_equipment_shop_dialog">Този предмет е предназначен само за определен клас.\nМожете да промените класа си от Настройките.</string>
+  <string name="class_gear_disclaimer">Можете да купувате екипировка само за текущия си клас</string>
+  <string name="available_stats" formatted="false">%d точки</string>
+  <string name="toogle_emojis">Превкл. на емоджитата</string>
+  <string name="tavern_description">Добре дошли в Странноприемницата! Поседнете, за да си поговорим, или за да си починете от задачите.</string>
+  <string name="check_into_inn">Влизане в странноприемницата</string>
+  <string name="community_guidelines">Обществени правила</string>
+  <string name="view_community_guidelines">Преглед на Обществените правила</string>
+  <string name="guidelines_description">Хабитика се опитва да бъде приятна среда за потребители от всички възрасти и произход, особено в обществени места като кръчмата. Ако имате въпроси, моля, прегледайте Обществените правила.</string>
+  <string name="helpful_links">Полезни връзки</string>
+  <string name="view_faq">Преглед на ЧЗВ</string>
+  <string name="report_bug">Докладване на проблем</string>
+  <string name="player_tiers">Нива на играчите</string>
+  <string name="staff_moderators">Екип и модератори</string>
+  <string name="tiers_descriptions">Цветните потребителски имена, които виждате в разговорите, показват нивото на сътрудник на съответния човек. Колкото по-високо е нивото, толкова повече е допринесъл човекът към Хабитика, например с изображения, програмиране, подпомагане на общността и т.н.!</string>
+  <string name="navigation_drawer_open">Отваряне на менюто за преход</string>
+  <string name="navigation_drawer_close">Затваряне на менюто за преход</string>
+  <string name="world_boss">Световен главатар</string>
+  <string name="world_boss_art">Графика на главатаря</string>
+  <string name="boss_art">Графика на главатаря</string>
+  <string name="world_boss_description">Описание на световния главатар</string>
+  <string name="rage_strike_count" formatted="false">Яростни удари: %d/%d</string>
+  <string name="pending_strike_description">Този удар още не е бил изпълнен!\nСветовният главатар ще се нахвърли върху някой от нашите дружелюбни продавачи, когато лентата на яростта му се запълни. Изпълнявайте ежедневните си задачи, за да се опитате да предотвратите това!</string>
+  <string name="pending_strike_title">Изчакващ удар</string>
+  <string name="strike_description_title">Какво е яростен удар?</string>
+  <string name="strike_description_subtitle">Има 3 възможни яростни удара</string>
+  <string name="strike_description_description">Този измервателен елемент се запълва, когато хабитиканците пропускат ежедневните си задачи. Ако се запълни докрай, Обезсърчителят ще отприщи своята атака, наречена „Сърцеразбиване“, върху някой от продавачите на Хабитика, така че не пропускайте да изпълнявате задачите си!</string>
+  <string name="pending_strike_subtitle">Този удар още не е бил изпълнен!</string>
+  <string name="strike_active_title" formatted="false">%s беше нападнат!</string>
+  <string name="strike_active_subtitle" formatted="false">%s получи Сърцеразбиване!</string>
+  <string name="strike_active_description" formatted="false">Нашият %s беше съсипан когато %s разби %s. Бързо, справете се със задачите си, за да победите чудовището и да помогнете за възстановяването!</string>
+  <string name="questShop">Магазинът за мисии</string>
+  <string name="market_owner_long">Алекс Търговеца</string>
+  <string name="tavern_owner_long">Даниел Кръчмаря</string>
+  <string name="stable_owner_long">господар на зверовете Мат</string>
+  <string name="hide_boss_art">Скриване на графиката на главатаря</string>
+  <string name="active_world_boss">Текущ световен главатар</string>
+  <string name="no_party_description">Изпълнявайте мисии заедно с приятели или самостоятелно. Бийте се с чудовища, създавайте предизвикателства и поддържайте отговорността си чрез групите.</string>
+  <string name="no_party_title">Играйте Хабитика в група</string>
+  <string name="join_party_description">Дайте потребителското си име (по-долу) на член на гилдия, за да може да Ви изпрати покана.</string>
+  <string name="join_party_description_id">Дайте потребителския си идентификатор или покажете своя QR-код за поканата</string>
+  <string name="join_party_title">Искате ли да се присъедините към група?</string>
+  <string name="create_party_website">Отворете уеб сайта, за да създадете група</string>
+  <string name="id_copied">Идентификаторът е копиран</string>
+  <string name="insufficientSubscriberGems">Не можете да купите повече диаманти този месец. Ограничението се премахва през първите три дни на всеки месец. Благодарим Ви за абонамента!</string>
+  <string name="insufficientSubscriberGemsTitle">Достигнато е месечното ограничение на диамантите</string>
+  <string name="chat_message">Съобщение в чата</string>
+  <string name="world_boss_description_title">Какво е световен главатар?</string>
+  <string name="world_boss_description_description">Световният главатар е специално събитие, при което цялата общност работи заедно, за да победи могъщо чудовище, използвайки задачите си!\nЗавършете задачите си, за да нанесете щети на главатаря.\nГлаватарят няма да Ви нанесе щети за пропуснатите задачи, но яростомерът му ще се запълни. Ако лентата се запълни, главатарят ще нападне някой от продавачите!\nМожете да продължите с нормалните главатари от мисиите си, като щетите ще се прилагат и на двамата главатари.\nПогледнете в кръчмата, за да видите напредъка за главатаря и яростните удари.</string>
+  <string name="world_boss_description_intro">Световният главатар е специално събитие, при което цялата общност работи заедно, за да победи могъщо чудовище, използвайки задачите си!</string>
+  <string name="world_boss_description_1">Завършете задачите си, за да нанесете щети на главатаря.</string>
+  <string name="world_boss_description_2">Главатарят няма да Ви нанесе щети за пропуснатите задачи, но яростомерът му ще се запълни. Ако лентата се запълни, главатарят ще нападне някой от продавачите!</string>
+  <string name="world_boss_description_3">Можете да продължите с нормалните главатари от мисиите си, като щетите ще се прилагат и на двамата главатари.</string>
+  <string name="world_boss_description_4">Погледнете в кръчмата, за да видите напредъка за главатаря и яростните удари.</string>
+  <string name="world_boss_action_prompt" formatted="false">Победете главатаря, за да спечелите специални награди и да спасите Хабитика от ужаса на %s!</string>
+  <string name="world_boss_description_subtitle">%s атакува!</string>
+  <string name="questShop_owner_long">Иън Пазителят на Мисиите</string>
+  <string name="seasonalShop_owner_long">Сезонната магьосница</string>
+  <string name="rage_attack">Яростна атака:</string>
+  <string name="tavern_description_world_boss">Не обръщай внимание на чудовището по-долу – това все още е спокойно място за разговори по време на почивките Ви.</string>
+  <string name="report">Докладване</string>
+  <string name="like">Харесва ми</string>
+  <string name="reply">Отговор</string>
+  <string name="challenge_prize">Награда за предизвикателството</string>
+  <string name="challenge_categories">Категории за предизвикателството</string>
+  <string name="created_challenge">Създадено предизвикателство</string>
+  <string name="joined">Присъединен</string>
+  <string name="public_challenge">Обществено предизвикателство</string>
+  <string name="short_name">Кратко име</string>
+  <string name="unlock_attribute_points">Разпределянето на точките за показатели се отключва на ниво 10</string>
+  <string name="same_day_reminder_title">Добавихте ли вече задачите си?</string>
+  <string name="same_day_reminder_text">Колкото повече добавяте, толкова повече ще бъдете наградени. И малките навици са от значение за постигането на голяма промяна.</string>
+  <string name="next_day_reminder_title">Отметнахте ли задачите си днес?</string>
+  <string name="next_day_reminder_text">Има много неща за откриване и отключване, когато качвате нива, така че изпълнявайте задачите си и се забавлявайте!</string>
+  <string name="daily_tip_0">Искате да опитате нещо ново? Присъединете се към предизвикателство, за да увеличите списъка си от задачи и да спечелите диаманти!</string>
+  <string name="daily_tip_1">Добавете списъци с подзадачи към задачите си за изпълнение, за да умножите наградите от тях!</string>
+  <string name="daily_tip_2">Можете да промените това колко често се повтаря всяка ежедневна задача. Дори рядко изпълняваните задачи могат да бъдат планирани.</string>
+  <string name="daily_tip_3">Можете да създадете и специални напомняния за ежедневните задачи.</string>
+  <string name="daily_tip_4">Честото преразглеждане на задачите може да Ви помогне да се придържате в правилната посока.</string>
+  <string name="daily_tip_5">Поемете дълбоко въздух няколко пъти, за да се концентрирате. Можете да направите всичко!</string>
+  <string name="daily_tip_6">Опитайте да пуснете отброяване на десет минути и вижте колко неща можете да свършите!</string>
+  <string name="daily_tip_7">Опитайте да закачите неща от пазара в наградите си, за да се мотивирате да ги спечелите!</string>
+  <string name="daily_tip_8">Можете да промените трудността на задачите си, за да получавате повече награди за по-трудните задачи!</string>
+  <string name="daily_tip_9">Ако се затруднявате, разделете задачите си на по-малки подзадачи.</string>
+  <string name="moderator">Модератор</string>
+  <string name="staff">Екип</string>
+  <string name="expand_notes">Прочетете повече</string>
+  <string name="collapse_notes">Показване на по-малко</string>
+  <string name="reset_streak">Нулиране на серията</string>
+  <string name="week_reminder_title">Как се справяте със задачите си?</string>
+  <string name="week_reminder_text">Почивките са полезни, но все още можете да печелите точки за прости действия, за да качвате нива и да печелите предмети!</string>
+  <string name="last_login">Последно отчитане</string>
+  <string name="total_checkins">Общ брой отчитания</string>
+  <string name="two_handed">За две ръце</string>
+  <string name="usernamePromptTitle">Време е да си създадете потребителско име!</string>
+  <string name="usernamePromptBody">Имената за вписване вече са уникални потребителски имена, които се виждат до екранните имена и се използват за покани, @споменавания в чата и за изпращане на съобщения.</string>
+  <string name="usernamePromptWiki">Ако искате да научите повече за тази промяна, посетете <a href="https://habitica.wikia.com/wiki/Player_Names">уикито ни</a>.</string>
+  <string name="confirmUsername">Потвърждаване на потребителското име</string>
+  <string name="usernamePromptDisclaimer">Потребителските имена трябва са съобразени с <a href="https://habitica.com/static/terms">Условията за ползване</a> и <a href="https://habitica.com/static/community-guidelines">Обществените правила</a>. Ако преди това не сте имали име за вписване, то потребителското Ви име е създадено автоматично.</string>
+  <string name="confirm_username_title">Наистина ли искате да потвърдите текущото си потребителско име?</string>
+  <string name="confirm_username_description">Ако потвърдите потребителското си име, то ще стане публично и ще може да се използва за покани, @споменавания и съобщения. Можете да промените потребителското си име по всяко време в настройките.</string>
+  <string name="cancel">Отказ</string>
+  <string name="confirm_username">Потвърждаване на потребителското име</string>
+  <string name="username_not_confirmed">Потребителското име не е потвърдено</string>
+  <string name="username_confirmed">Потребителското име е потвърдено</string>
+  <string name="username_level">\@%s ・Ниво %d</string>
+  <string name="enter_recipient_username">Въведете потр. име на получателя</string>
+  <string name="username_copied">Потребителското име е копирано</string>
+  <string name="verification_pet">Един от тези любимци-ветерани ще Ви чака след като завършите потвърждението!</string>
+  <string name="welcomeNameTitle">Как да Ви наричаме?</string>
+  <string name="display_name_length_error">Екранното име трябва да бъде с дължина между 1 и 30 знака.</string>
+  <string name="setup_task_join_habitica">Присъединяване към Хабитика (отметнете ме!)</string>
+  <string name="setup_task_join_habitica_notes">Можете да изпълните тази задача, да я редактирате или да я премахнете.</string>
 </resources>
diff --git a/Habitica/res/values-de/strings.sidebar.xml b/Habitica/res/values-de/strings.sidebar.xml
index 8e7a1f760..aed435a3e 100644
--- a/Habitica/res/values-de/strings.sidebar.xml
+++ b/Habitica/res/values-de/strings.sidebar.xml
@@ -3,7 +3,7 @@
   <string name="sidebar.tasks">Aufgaben</string>
   <string name="sidebar.skills">Fähigkeiten</string>
   <string name="sidebar.section.social">Soziales</string>
-  <string name="sidebar.inbox">Postfach</string>
+  <string name="sidebar.inbox">Nachrichten</string>
   <string name="sidebar.tavern">Gasthaus</string>
   <string name="sidebar.party">Gruppe</string>
   <string name="sidebar.purchaseGems">Edelsteine &amp; Abonnement</string>
diff --git a/Habitica/res/values-de/strings.tutorial.xml b/Habitica/res/values-de/strings.tutorial.xml
index 14da0fded..58df70d21 100644
--- a/Habitica/res/values-de/strings.tutorial.xml
+++ b/Habitica/res/values-de/strings.tutorial.xml
@@ -19,4 +19,5 @@
   <string name="tutorial_party">Hier können du und deine Freunde einander motivieren und mit euren Aufgaben Monster bekämpfen!</string>
   <string name="tutorial_tavern">Willkommen im Gasthaus, einem öffentlichen Chat für alle Altersklassen! Hier kannst du dich über Produktivität unterhalten und Fragen stellen. Viel Spaß!</string>
   <string name="tutorial_classes">Wähle aus, ob du Krieger, Magier, Heiler oder Schurke werden möchtest. Jede Klasse hat einzigartige Ausrüstungsgegenstände und Fähigkeiten. Tippe auf (?), um mehr zu erfahren!</string>
+  <string name="tutorial_stats">Tippe auf den grauen Button, um mehrere Punkte auf einmal zuzuweisen, oder tippe auf die Pfeile, um die Punkte einzeln zu verteilen.</string>
 </resources>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index c11cd4775..c623c9673 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -28,11 +28,11 @@
   <string name="pref_push_notifications_checkbox">Push-Benachrichtigungen des Benutzers</string>
   <string name="push_notifications">Push-Benachrichtigungen</string>
   <string name="push_notifications_sum">Stelle deine Push-Benachrichtigungen ein</string>
-  <string name="preference_push_you_won_challenge">Du hast einen Wettbewerb gewonnen!</string>
+  <string name="preference_push_you_won_challenge">Du hast eine Herausforderung gewonnen!</string>
   <string name="preference_push_received_a_private_message">Private Nachricht erhalten</string>
   <string name="preference_push_gifted_gems">Geschenkte Edelsteine</string>
   <string name="preference_push_gifted_subscription">Geschenkte Abonnements</string>
-  <string name="preference_push_invited_to_party">Zur Gruppe eingeladen</string>
+  <string name="preference_push_invited_to_party">Zur Party eingeladen</string>
   <string name="preference_push_invited_to_guild">Zur Gilde eingeladen</string>
   <string name="preference_push_your_quest_has_begun">Deine Quest hat begonnen</string>
   <string name="preference_push_invited_to_quest">Zur Quest eingeladen</string>
@@ -115,12 +115,9 @@
   <string name="friday">Freitag</string>
   <string name="saturday">Samstag</string>
   <string name="sunday">Sonntag</string>
-  <string name="levelup_header">Du bist ein Level aufgestiegen!</string>
-  <string name="levelup_detail">Das Erfüllen Deiner Lebensziele hat Dich auf Level %1$d steigen lassen!</string>
-  <string name="levelup_health">Du wurdest vollständig geheilt!</string>
   <string name="levelup_button">Hurra!</string>
   <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_penalty_body">Du hast ein Level, dein Gold und ein Teil deiner Ausrüstung verloren, aber du kannst, mit harter Arbeit alles 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">Lebenspunkte auffüllen &amp; Nochmal versuchen</string>
   <string name="filter">Filtern</string>
@@ -130,18 +127,18 @@
   <string name="used_skill_without_mana">Du hast %1$s benutzt.</string>
   <string name="new_checklist_item">Neue Unteraufgabe</string>
   <string name="add_checklist_item">Hinzufügen</string>
-  <string name="reminder_title">Denke daran Deine täglichen Aufgaben abzuhaken!</string>
+  <string name="reminder_title">Vergiss nicht deine Aufgaben zu überprüfen</string>
   <string name="skill_progress_title">Fertigkeiten benutzen</string>
   <string name="coming_soon">demnächst verfügbar</string>
   <string name="chat_flag_confirmation">Möchtest Du diesen Beitrag wirklich melden?</string>
   <string name="flag_confirm">Verletzung der Community-Richtlinien melden</string>
   <string name="unlock_lvl_11">Freigeschaltet ab Lvl 11</string>
-  <string name="no_party_message">Du bist nicht in einer Gruppe. Besuche die Website, um einer Gruppe beizutreten.</string>
+  <string name="no_party_message">Du bist in keiner Party. Besuche die Website, um einer Party beizutreten.</string>
   <string name="forgot_pw_btn">Passwort vergessen</string>
   <string name="tavern.inn.checkOut">Reaktiviere Deine täglichen Aufgaben</string>
   <string name="tavern.inn.rest">Pausiere Deine täglichen Aufgaben</string>
   <string name="reward.dialog.buy">Kaufen</string>
-  <string name="reward.dialog.dismiss">Als gelesen markieren</string>
+  <string name="reward.dialog.dismiss">Ausblenden</string>
   <string name="party">Gruppe</string>
   <string name="chat">Chat</string>
   <string name="members">Mitglieder</string>
@@ -270,13 +267,12 @@
   <string name="equipped">Ausgerüstet</string>
   <string name="quest_cancel_message">Bist Du sicher, dass Du diese Quest abbrechen willst? Alle angenommenen Einladungen gehen verloren. Der Questbesitzer erhält die Questschriftrolle zurück.</string>
   <string name="quest.invitation">Questeinladung</string>
-    <string name="quest.invitation.text">Du wurdest eingeladen, an einer Quest teilzunehmen!</string>
-  <string name="ago_1day">Vor einem Tag</string>
-  <string name="ago_days">Vor %d Tagen</string>
-  <string name="ago_1Minute">Vor einer Minute</string>
-  <string name="ago_minutes">Vor %d Minuten</string>
-  <string name="ago_hours">Vor %d Stunden</string>
-  <string name="ago_1hour">Vor einer Stunde</string>
+  <string name="quest_begin_message">Bist Du sicher? Nur %1$d von %2$d Party-Mitglieder nehmen an der Quest teil. Quests starten automatisch, wenn alle Spieler die Einladung angenommen oder abgelehnt haben.</string>
+  <string name="quest.invitation.text">Du wurdest eingeladen, an einer Quest teilzunehmen!</string>
+  <string name="ago_1day">vor einem Tag</string>
+  <string name="ago_days">vor %d Tagen</string>
+  <string name="ago_minutes">vor %d Minuten</string>
+  <string name="ago_hours">vor %d Stunden</string>
   <string name="today">Heute</string>
   <string name="sidebar_items">Gegenstände</string>
   <string name="eggs">Eier</string>
@@ -295,28 +291,32 @@
   <string name="hatch_with_potion">Mit Elixier ausbrüten</string>
   <string name="feed_to_pet">An Haustier verfüttern</string>
   <string name="hatch_egg">Mit Ei ausbrüten</string>
-  <string name="invite_party">Gruppe einladen</string>
+  <string name="invite_party">Party einladen</string>
   <string name="dialog_feeding">Füttere %1$s %2$s mit:</string>
   <string name="use_animal">Nutzen</string>
   <string name="feed">Füttern</string>
   <string name="hatch_with">Haustier mit %s ausbrüten</string>
   <string name="hatched_pet_title">Du hast ein %1$s %2$s ausgebrütet!</string>
-  <string name="evolved_pet_title">%1$s %2$s wurde gezähmt. Es ist an der Zeit aufzusitzen!</string>
+  <string name="evolved_pet_title">Du hast %1$s%2$s gezähmt, auf geht\'s!</string>
   <string name="close">Schließen</string>
   <string name="share">Teilen</string>
   <string name="notification_pet_fed">Du hast Dein/e/n %1$s %2$s gefüttert!</string>
   <string name="notification_purchase">Du hast %s gekauft</string>
   <string name="notification_purchase_reward">Du hast eine Belohnung gekauft</string>
-  <string name="sectionpets">Normale Haustiere</string>
-  <string name="sectionpremiumPets">Magische Haustiere</string>
-  <string name="sectionquestPets">Quest-Haustiere</string>
-  <string name="sectionspecialPets">Seltene Haustiere</string>
-  <string name="sectionmounts">Normale Reittiere</string>
-  <string name="sectionpremiumMounts">Magische Reittiere</string>
-  <string name="sectionquestMounts">Quest-Reittiere</string>
-  <string name="sectionspecialMounts">Seltene Reittiere</string>
+  <string name="sectionpets">Standard</string>
+  <string name="sectionpremiumPets">Magisches Schlüpfelixier</string>
+  <string name="sectionquestPets">Quest</string>
+  <string name="sectionspecialPets">Spezial</string>
+  <string name="sectionmounts">Standard</string>
+  <string name="sectionpremiumMounts">Magisches Schlüpfelixier</string>
+  <string name="sectionquestMounts">Quest</string>
+  <string name="sectionspecialMounts">Spezial</string>
   <string name="world_quest">Weltenquest</string>
-  <string name="inn_description">Ruhe Dich im Gasthaus aus damit Deine täglichen Aufgaben Dich über Nacht nicht verletzen! (Beachte: verhindert nicht den Schaden durch einen Boss.)</string>
+  <string name="inn_description">Brauchst du eine Pause? Kehre in Daniels Gasthaus ein, um ein paar von Habiticas schwierigeren Spielmechaniken zu pausieren:\n\n
+• Verpasste Tagesaufgaben fügen dir keinen Schaden zu\n
+• Aufgaben fallen nicht aus ihrer Serie und verschlechtern sich nicht in der Farbe\n
+• Bossgegner verursachen keinen Schaden für deine verpassten Tagesaufgaben\n
+• Deine Schadens- oder Sammelquest-Gegenstände bleiben bis zum Ausloggen im unerledigten Zustand</string>
   <string name="empty_items">Du hast kein/e %s</string>
   <string name="user_level">Lvl %d</string>
   <string name="user_level_with_class">Lvl %1$d %2$s</string>
@@ -324,10 +324,10 @@
   <string name="rogue">Schurke</string>
   <string name="mage">Magier</string>
   <string name="healer">Heiler</string>
-  <string name="warrior_description">Krieger verursachen mehr und stärkere \"kritische Treffer\", die zufällige Boni auf Gold, Erfahrung und Beute beim Erfüllen einer Aufgabe geben. Sie sind auch sehr stark gegen Bossmonster. Spiele einen Krieger, wenn Dich die Chance auf Belohnungen im Lottogewinn-Stil besonders reizt und Du besonders effektiv gegen Bossmonster sein willst.</string>
+  <string name="warrior_description">Krieger verursachen mehr und stärkere \"kritische Treffer\", die zufällig Bonus Gold, Erfahrung und größere Chance auf Beute beim Erfüllen einer Aufgabe geben. Sie teilen außerdem schweren Schaden gegen Boss Monster aus. Spiele einen Krieger, wenn es dich anspornt, unvorhergesehene Chancen auf große Belohnungen zu haben und du in Endgegner-Quests besonders viel Schaden austeilen möchtest.</string>
   <string name="mage_description">Magier lernen rasch und erhalten schneller Erfahrung und Level als andere Klassen. Sie bekommen zudem eine große Menge Mana, um ihre Spezialfähigkeiten einzusetzen. Spiele einen Magier, wenn Dir die taktischen Aspekte des Spiels Spaß bereiten, oder wenn Du motiviert wirst durch schnellen Level-Aufstieg und das Freischalten fortgeschrittener Funktionen.</string>
   <string name="rogue_description">Schurken lieben es Reichtümer anzuhäufen, indem sie mehr Gold als andere verdienen und geschickt darin sind, neue Gegenstände zu finden. Ihre typische Fähigkeit sich im verborgenen zu bewegen erlaubt Dir gelegentlich, die Folgen verpasster täglicher Aufgaben zu vermeiden. Spiele einen Schurken, wenn Dich Spielbelohnungen und Erfolge besonders reizen und Du nach Beute und Abzeichen trachtest!</string>
-  <string name="healer_description">Heiler stehen Schaden unbeeindruckt gegenüber und erweitern diesen Schutz auf andere. Verpasste tägliche Aufgaben und schlechte Angewohnheiten schaden ihnen nicht viel und sie haben Mittel und Wege Lebenspunkte wiederherzustellen. Spiele einen Heiler, wenn Du gerne Anderen in Deiner Gruppe hilfst, oder wenn es Dich besonders reizt, dem Tod durch harte Arbeit zu entkommen!</string>
+  <string name="healer_description">Heiler stehen Schaden unbeeindruckt gegenüber und erweitern diesen Schutz auf andere. Verpasste tägliche Aufgaben und schlechte Angewohnheiten schaden ihnen nicht viel und sie haben Mittel und Wege Lebenspunkte wiederherzustellen. Spiele einen Heiler, wenn Du gerne Anderen in Deiner Party hilfst, oder wenn es Dich besonders reizt, dem Tod durch harte Arbeit zu entkommen!</string>
   <string name="select_class">Klasse wählen</string>
   <string name="opt_out_class">Später entscheiden</string>
   <string name="opt_out_description">Du willst keine Klasse oder möchtest Dich später entscheiden? Entscheide Dich später und werde zunächst ein Krieger ohne Spezialfähigkeiten. Du kannst später im Wiki etwas über das Klassensystem lesen und Deine Klasse jederzeit aktivieren.</string>
@@ -338,7 +338,7 @@
   <string name="dialog_go_back">Zurück</string>
   <string name="opt_out_confirmation">Bist Du sicher, dass Du Dich noch nicht entscheiden willst?</string>
   <string name="change_class">Deine Klasse ändern</string>
-  <string name="change_class_description">Ändere Deine Klasse und erhalte Deine Attributpunkte für 3 Edelsteine zurück. Du kannst die Punkte über die Webseite zuweisen</string>
+  <string name="change_class_description">Ändere Deine Klasse und erhalte Deine Attributspunkte für 3 Edelsteine zurück.</string>
   <string name="enable_class">Klassensystem freischalten</string>
   <string name="changing_class_progress">Klasse ändern</string>
   <string name="by_email">Per E-Mail</string>
@@ -346,7 +346,7 @@
   <string name="send">Senden</string>
   <string name="invite">Freunde einladen</string>
   <string name="invite_id_description">Wenn Deine Freunde bereits Habitica verwenden, lade sie hier mit Hilfe ihrer Benutzer-ID ein.</string>
-  <string name="invite_email_description">Wenn Freunde Habitica mit Hilfe Deiner E-Mail beitreten, werden sie automatisch zu Deiner Gruppe eingeladen!</string>
+  <string name="invite_email_description">Wenn Freunde Habitica mit Hilfe Deiner E-Mail beitreten, werden sie automatisch zu Deiner Party eingeladen!</string>
   <string name="add_invites">Einladungen hinzufügen</string>
   <string name="user_id">Benutzer-ID</string>
   <string name="email">E-Mail</string>
@@ -364,8 +364,10 @@
   <string name="market">Marktplatz</string>
   <string name="timeTravelers">Mysteriöse Zeitreisende</string>
   <string name="seasonalShop">Jahreszeitenmarkt</string>
-  <string name="empty_inbox">Du hast keine Nachrichten in Deinem Posteingang. Du kannst einem anderen Benutzer eine neue Nachricht von deren öffentlichen Chatnachrichten aus senden!</string>
+  <string name="empty_inbox">Du hast keine Nachrichten. Du kannst einem anderen Benutzer eine neue Nachricht von deren öffentlichen Chatnachrichten aus senden!</string>
   <string name="party_invite">Durch Einladen von Freunden freischalten</string>
+  <string name="login_incentive">Freischalten durch regelmäßiges einloggen bei Habitica</string>
+  <string name="create_account">Freischalten durch die Erstellung eines Kontos</string>
   <string name="no_gold">Nicht genügend Gold</string>
   <string name="no_potion">Du musst keinen Heiltrank kaufen</string>
   <string name="successful_purchase">%1$s gekauft</string>
@@ -396,7 +398,7 @@
   <string name="action_continue">Weiter</string>
   <string name="scan_qr_code">QR Code scannen</string>
   <string name="enter_recipient_uuid">ID des Empfängers eingeben</string>
-  <string name="invited_to_party">Du wurdest in eine Gruppe eingeladen!</string>
+  <string name="invited_to_party">Du wurdest in eine Party eingeladen!</string>
   <string name="stats_widget_label">Habitica: Avatar</string>
   <string name="add_task">Neue Aufgabe hinzufügen</string>
   <string name="add_habit">Neue Gewohnheit hinzufügen</string>
@@ -426,7 +428,7 @@
   <string name="AudioTheme_summary">Ändere Habiticas Hintergrundmusik</string>
   <!--Login Incentives-->
   <string name="see_you_tomorrow">Bis morgen!</string>
-  <string name="belongs_to_challenge">Gehört zum Wettbewerb</string>
+  <string name="belongs_to_challenge">Gehört zur Herausforderung</string>
   <string name="has_reminder">Hat eine Benachrichtigung</string>
   <string name="has_tag">Hat einen Tag</string>
   <string name="subscribe.title">Mit einem Abonnement unterstützt Du die Entwickler und den Betrieb von Habitica</string>
@@ -468,32 +470,32 @@
   <string name="subscribe_prompt_thanks">Für das Abonnieren bekommst Du diese nützlichen Vorteile: </string>
   <string name="subscription_status">Abonnement Status</string>
   <string name="byLeader">von %s</string>
-  <string name="challenge_details">Wettbewerbdetails</string>
-  <string name="challenge_leave_title">Wettbewerb verlassen</string>
-  <string name="challenge_leave_text">Bist Du Dir sicher, dass du den Wettbewerb \"%s\" verlassen willst?</string>
+  <string name="challenge_details">Herausforderungsdetails</string>
+  <string name="challenge_leave_title">Herausforderung abbrechen</string>
+  <string name="challenge_leave_text">Bist Du Dir sicher, dass du den die Herausforderung \"%s\" abbrechen willst?</string>
   <string name="challenge_remove_tasks_title">Aufgaben entfernen</string>
   <string name="challenge_remove_tasks_text">Willst du deine Aufgaben wirklich entfernen?</string>
   <string name="remove_tasks">Entfernen</string>
   <string name="keep_tasks">Behalten</string>
-  <string name="my_challenges">Meine Wettbewerbe</string>
+  <string name="my_challenges">Meine Herausforderungen</string>
   <string name="public_challenges">Öffentlich</string>
-  <string name="challenges">Wettbewerbe</string>
+  <string name="challenges">Herausforderungen</string>
   <string name="daily">Tägliche Aufgabe</string>
   <string name="habit">Gewohnheit</string>
   <string name="reward">Belohnung</string>
   <string name="todo">To-Do</string>
   <string name="official">Offiziell</string>
   <string name="participating">Beigetreten</string>
-  <string name="challenge">Wettbewerb</string>
-  <string name="go_to_challenge">Gehe zum Wettbewerb</string>
-  <string name="not_part_of_a_challenge">Du nimmst im Moment an keinen Wettbewerben teil!</string>
-  <string name="join_a_challenge">Trete einem Wettbewerb bei, um ein ausgewähltes Set von Aufgaben zu deiner Liste hinzuzufügen. Trete dann gegen andere Habitica-Mitglieder an, um Erfolge und sogar Edelsteine zu gewinnen!</string>
-  <string name="check_the_public_challenge_tab">Drücke auf den \"Öffentlich\"-Tab, um die von Mitgliedern erstellten Wettbewerbe zu finden, die am besten zu Dir passen!</string>
+  <string name="challenge">Herausforderung</string>
+  <string name="go_to_challenge">Gehe zur Herausforderung</string>
+  <string name="not_part_of_a_challenge">Du nimmst im Moment an keiner Herausforderung teil!</string>
+  <string name="join_a_challenge">Trete einer Herausforderung bei, um ein ausgewähltes Set an Aufgaben zu deiner Liste hinzuzufügen. Trete dann gegen andere Habitica-Mitglieder an, um Erfolge und sogar Edelsteine zu gewinnen!</string>
+  <string name="check_the_public_challenge_tab">Drücke auf den \"Öffentlich\"-Tab, um die von Mitgliedern erstellten Herausforderungen zu finden, die am besten zu Dir passen!</string>
   <string name="add_reminder">Erinnerung hinzufügen</string>
   <string name="warning">Warnung</string>
   <string name="open_settings">Einstellungen öffnen</string>
   <string name="dont_keep_activities_warning">Es sieht so aus, als wäre die Entwickleroption \\"Aktivitäten nicht behalten\\" aktiviert. Momentan können dadurch Probleme in der Habitica App entstehen, deshalb empfehlen wir Dir, die Option zu deaktivieren.</string>
-  <string name="inbox">Posteingang</string>
+  <string name="inbox">Nachrichten</string>
   <string name="FAQ">Häufig gestellte Fragen</string>
   <string name="special">Spezial</string>
   <string name="gem_for_gold_description">Weil Du Habitica abonnierst, kannst Du jeden Monat eine Anzahl von Edelsteinen mit Gold kaufen. </string>
@@ -519,7 +521,6 @@
   <string name="login_btn_fb">Mit Facebook-Konto einloggen</string>
   <string name="login_btn_google">Mit Google-Konto einloggen</string>
   <string name="action_back">Zurück</string>
-  <string name="welcome_text">Oh, Du musst neu hier sein. Ich bin Justin, der Stadtführer von Habitica.\n\nAls erstes erstellen wir Dir einen Avatar.</string>
   <string name="randomize">Zufällig</string>
   <string name="avatar_extras">Extras</string>
   <string name="avatar_skin_color">Hautfarbe</string>
@@ -531,7 +532,7 @@
   <string name="weak">Schwach</string>
   <string name="strong">Stark</string>
   <string name="gray">Grau</string>
-  <string name="dated">Terminiert</string>
+  <string name="dated">Geplant</string>
   <string name="completed">Vervollständigt</string>
   <string name="setuP_group_other">Anderes</string>
   <string name="clear">löschen</string>
@@ -553,31 +554,29 @@
   <string name="no_billing_subscriptions">Mit deinem Zugangsgerät hast Du keinen Zugriff auf die möglichen Zahlungsmethoden. Bitte nutze die Habitica Website um ein Abonnement zu kaufen.</string>
   <string name="save">Speichern</string>
   <string name="location">Standort</string>
-  <string name="gem_reward">Edelstein-Belohnung</string>
+  <string name="gem_reward">Juwelen Preis</string>
   <string name="tasks">Aufgaben</string>
-  <string name="create_challenge">Wettbewerb erstellen</string>
-  <string name="edit_challenge">Wettbewerb bearbeiten</string>
-  <string name="challenge_create_error_tavern_one_gem">Du benötigst mindestens 1 Edelstein, um einen Wettbewerb im Gasthaus zu erstellen.</string>
-  <string name="challenge_create_error_enough_gems">Du hast nicht genug Edelsteine, um einen Wettbewerb zu erstellen.</string>
-  <string name="identify_your_challenge_with_a_tag">Markiere Deinen Wettbewerb mit einem Tag ..</string>
-  <string name="challenge_create_error_tag">Du musst ein Tag angeben, um diesen Wettbewerb erstellen zu können.</string>
-  <string name="challenge_create_error_no_tasks">Du musst wenigstens eine Aufgabe hinzufügen, um diesen Wettbewerb erstellen zu können.</string>
-  <string name="challenge_create_error_title">Du musst einen Titel angeben, um diesen Wettbewerb erstellen zu können.</string>
+  <string name="create_challenge">Erstelle eine Herausforderung</string>
+  <string name="edit_challenge">Bearbeiten</string>
+  <string name="challenge_create_error_tavern_one_gem">Du benötigst mindestens 1 Juwel, um eine öffentliche Herausforderung zu erstellen.</string>
+  <string name="challenge_create_error_enough_gems">Du hast nicht genug Edelsteine, um eine Herausforderung zu erstellen.</string>
+  <string name="challenge_create_error_no_tasks">Du musst wenigstens eine Aufgabe hinzufügen, um diese Herausforderung erstellen zu können.</string>
+  <string name="challenge_create_error_title">Du musst einen Titel angeben, um diese Herausforderung erstellen zu können.</string>
   <string name="description_optional">Beschreibung (optional)</string>
-  <string name="new_challenge_title">Neuer Wettbewerbstitel</string>
+  <string name="new_challenge_title">Neuer Herausforderungstitel</string>
   <string name="ownership">Besitz</string>
   <string name="inn">Gasthaus</string>
   <string name="system">System</string>
   <string name="start_quest">Starte eine neue Quest</string>
-  <string name="leave_party">Verlasse die Gruppe</string>
-  <string name="party_description">Gruppen-Beschreibung</string>
-  <string name="abort_confirmation">Bist Du Dir sicher, dass Du die Mission abbrechen möchtest? Die Mission wird für alle Mitglieder Deiner Gruppe abgebrochen und Euer gesamter Fortschritt geht verloren. Die Questschriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
+  <string name="leave_party">Party verlassen</string>
+  <string name="party_description">Party-Beschreibung</string>
+  <string name="abort_confirmation">Bist Du Dir sicher, dass Du die Mission abbrechen möchtest? Die Mission wird für alle Mitglieder Deiner Party abgebrochen und Euer gesamter Fortschritt geht verloren. Die Questschriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="leave_quest_confirmation">Bist Du Dir sicher, dass Du die aktive Quest verlassen möchtest? Dein gesamter Fortschritt geht dabei verloren.</string>
   <string name="number_participants">%1$d Teilnehmer</string>
   <string name="welcome_back">Willkommen zurück</string>
   <string name="yesterdaililes_prompt">Hast du gestern einige Deiner täglichen Aufgaben gemacht?</string>
   <string name="start_day">Starte meinen Tag</string>
-  <string name="leave_party_confirmation">Bist Du sicher, dass Du die Gruppe verlassen willst?</string>
+  <string name="leave_party_confirmation">Bist Du sicher, dass Du die Party verlassen willst?</string>
   <string name="nextPrizeUnlocksIn" formatted="false">Nächste Belohnung in %d Check-Ins</string>
   <string name="pending">Ausstehend</string>
   <string name="accepted">Angenommen</string>
@@ -586,9 +585,8 @@
   <string name="invitations">Einladungen</string>
   <string name="quest_leader_header" formatted="false">Begonnen von %s</string>
   <string name="quest_abort_message">Willst Du diese Mission wirklich abbrechen?
-Sie wird für alle Mitglieder Deiner Gruppe abgebrochen und Euer gesamter Fortschritt geht verloren.
+Sie wird für alle Mitglieder Deiner Party abgebrochen und Euer gesamter Fortschritt geht verloren.
 Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
-  <string name="loading">Inhalt wird geladen....</string>
   <string name="reloading_content">Inhalt wird erneut geladen</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
@@ -606,8 +604,14 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="experience_reward" formatted="false">%d Erfahrungspunkte</string>
   <string name="gold_reward" formatted="false">%d Gold</string>
   <string name="quest_owner_rewards">Quest-Besitzer Belohnungen</string>
+  <string name="str_abbrv">STR</string>
+  <string name="per_abbrv">WAH</string>
+  <string name="int_abbrv">INT</string>
+  <string name="con_abbrv">AUS</string>
   <string name="reset_account">Konto zurücksetzen</string>
+  <string name="reset_account_description">WARNUNG! Das setzt viele Teile deines Kontos zurück. Vom Zurücksetzen des Kontos wird stark abgeraten, aber manche Leute finden diese Funktion zu Beginn hilfreich, wenn sie erst kurze Zeit auf der Webseite gespielt haben.\n\nDu verlierst alle deine Stufen, Gold und Erfahrungspunkte. Alle deine Aufgaben (außer denjenigen aus Herausforderungen) werden dauerhaft gelöscht und du verlierst alle historischen Daten dazu. Du verlierst deine komplette Ausrüstung, hast aber die Möglichkeit, alles wieder zurückzukaufen, inklusive Ausrüstung aus der limitierten Ausgabe oder Rätselgegenständen für Abonnenten, die dir bereits gehören (Du musst der passenden Klasse angehören, um klassenspezifische Ausrüstung zurückzukaufen). Eventuell ziehst du es vor, stattdessen eine Sphäre der Wiedergeburt zu benutzen, das ist eine viel sicherere Option und erhält deine Aufgaben und deine Ausrüstung.</string>
   <string name="delete_account">Konto löschen</string>
+  <string name="delete_account_description">Bist Du Dir sicher? Dies wird Dein Konto für immer löschen, und es kann nicht wiederhergestellt werden! Du wirst ein neues Konto erstellen müssen, wenn Du Habitica wieder nutzen möchtest. Vorhandene oder ausgegebene Edelsteine werden nicht zurückerstattet. Wenn Du Dir absolut sicher bist, tippe Dein Passwort in das Textfeld ein.</string>
   <string name="reset_account_confirmation">Konto zurücksetzen</string>
   <string name="delete_account_confirmation">Mein Konto löschen</string>
   <string name="danger_zone">Gefahrenzone</string>
@@ -620,11 +624,14 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="insufficientHourglasses">Du wirst mehr mystische Sanduhren benötigen um dieses Item zu kaufen!</string>
   <string name="get_hourglasses">Kaufe Sanduhren</string>
   <string name="subscribe_for_hourglasses">Abonniere für Sanduhren</string>
+  <string name="timetravelers_closed_description">Erhalte eine mystische Sanduhr alle drei Monate für ein aufeinanderfolgendes Abonnement, nutze diese dann, um Limitiertes freizuschalten: Gegenstände, Haustiere oder Reittiere aus der Vergangenheit... und aus der Zukunft!</string>
   <string name="want_to_subscribe">I möchte ein Abo abschließen</string>
+  <string name="seasonal_closed_description">Die Großen Galas werden an Sonnenwenden und Tag-Nacht-Gleichen veranstaltet, also komme zu dieser Zeit wieder, um eine lustige Auswahl von speziellen saisonalen Gegenständen zu finden!</string>
   <string name="come_back_soon">Komm bald zurück!</string>
   <string name="level">Level</string>
   <string name="streak_label">21-Tage-Strähnen</string>
   <string name="stats">Statuswerte</string>
+  <string name="fix_character_description">Für den Fall, dass Du einen Bug gefunden oder Fehler gemacht hast, der Deinen Charakter auf unfaire Art und Weise betroffen hat, kannst Du hier diese Werte manuell korrigieren.</string>
   <string name="fix_character_values">Charakterwerte reparieren</string>
   <string name="saving">Speichert</string>
   <string name="forgot_password_title">Einen Passwort-Rücksetz-Link per E-Mail senden</string>
@@ -646,12 +653,17 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="change">Ändern</string>
   <string name="character_level">Charakterlevel</string>
   <string name="auto_allocate_points">Punkte automatisch verteilen</string>
+  <string name="stat_guide">Attribut-Ratgeber</string>
   <string name="character_build">Charaktererstellung</string>
   <string name="character_build_description">Jedes Level bringt Dir einen Punkt, den Du einem Attribut Deiner Wahl zuschreiben kannst. Du kannst es selbst machen oder Du lässt das Spiel für dich entscheiden, indem du eine der Optionen der automatischen Zuweisung wählst.</string>
   <string name="strength">Stärke</string>
+  <string name="strength_description">Erhöht die Wahrscheinlichkeit und den Bonus kritischer Treffer beim Erledigen von Aufgaben. Erhöht außerdem den Schaden an Bossen.</string>
   <string name="intelligence">Intelligenz</string>
+  <string name="intelligence_description">Erhöht die gewonnenen Erfahrungspunkte beim Erledigen von Aufgaben. Erhöht außerdem Deine maximalen Manapunkte und die Manaregeneration.</string>
   <string name="constitution">Ausdauer</string>
+  <string name="constitution_description">Verringert den erlittenen Schaden durch Deine Aufgaben. Verringert jedoch nicht den Schaden durch Bosse.</string>
   <string name="perception">Wahrnehmung</string>
+  <string name="perception_description">Erhöht die Wahrscheinlichkeit, Beute zu finden, wenn eine Aufgabe abgehakt wird, die tägliche Beuteobergrenze, Strähnenboni und die Menge an Gold für eine Aufgabe.</string>
   <string name="buffs">Verstärkt</string>
   <string name="allocated">Verteilt</string>
   <string name="distribute_evenly">Gleichmäßig verteilen</string>
@@ -662,4 +674,65 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="distribute_evenly_help">Weist jedem Attribut die gleiche Anzahl an Punkten zu</string>
   <string name="distribute_class_help">Weist den Attributen, die wichtig für Deine Klasse sind, mehr Punkte zu</string>
   <string name="distribute_task_help">Weist Punkte nach den Eigenschaftskategorien zu, die mit den abgeschlossenen Aufgaben zusammenhängen.</string>
+  <string name="allocating_points">Attributspunkte zuweisen</string>
+  <string name="class_equipment">Ausrüstung</string>
+  <string name="equipment_empty">Du hast bereits sämtliche Ausrüstung! Weitere Ausrüstung wird während den Großen Galas, die an Sonnenwenden und Tag-Nacht-Gleichen stattfinden, veröffentlicht werden. </string>
+  <string name="classless">Klassenlos</string>
+  <string name="class_equipment_shop_dialog">Dieser Gegenstand ist nur für eine bestimmte Klasse verfügbar.\nDu kannst Deine Klasse in den Einstellungen wechseln.</string>
+  <string name="class_gear_disclaimer">Du kannst nur Ausrüstung für Deine aktuelle Klasse kaufen</string>
+  <string name="available_stats" formatted="false">%d Punkte</string>
+  <string name="toogle_emojis">Emojis ein-/ausschalten</string>
+  <string name="tavern_description">Willkommen im Gasthaus! Setze Dich dazu und chatte oder nimm Dir eine Pause von Deinen Aufgaben.</string>
+  <string name="check_into_inn">Im Gasthaus erholen</string>
+  <string name="community_guidelines">Community-Richtlinien</string>
+  <string name="view_community_guidelines">Community-Richtlinien ansehen</string>
+  <string name="guidelines_description">Habitica versucht eine einladende Umgebung für Nutzer aller Altersgruppen und Herkünfte zu schaffen, besonders in öffentlichen Bereichen wie der Taverne. Wenn Du Fragen hast, sieh bitte in unseren Richtlinien nach.</string>
+  <string name="helpful_links">Hilfreiche Links</string>
+  <string name="view_faq">Häufige Fragen ansehen</string>
+  <string name="report_bug">Melde einen Fehler</string>
+  <string name="player_tiers">Spielerränge</string>
+  <string name="staff_moderators">Mitarbeiter und Moderatoren</string>
+  <string name="tiers_descriptions">Die Farbe der Spielernamen im Chat repräsentieren den Rang der Mitwirkung dieser Person. Je höher der Rang, desto mehr hat die Person zu der Weiterenticklung von Habitica durch Kunst, Code oder mehr beigetragen. </string>
+  <string name="navigation_drawer_open">Öffne Navigationsleiste</string>
+  <string name="navigation_drawer_close">Schließe Navigationsleiste</string>
+  <string name="world_boss">Weltboss</string>
+  <string name="world_boss_art">Boss-Grafik</string>
+  <string name="boss_art">Boss-Grafik</string>
+  <string name="world_boss_description">Weltboss Beschreibung</string>
+  <string name="rage_strike_count" formatted="false">Wut-Angriff: %d/%d</string>
+  <string name="pending_strike_description">Dieser Angriff hat noch nicht stattgefunden!\nDer Weltboss einen unserer befreundeten Händler angreifen, sobald seine Wut-Anzeige voll ist. Erledige Deine Tagesaufgaben und versuche das zu verhindern!</string>
+  <string name="pending_strike_title">Ausstehender Angriff</string>
+  <string name="strike_description_title">Was ist ein Wut-Angriff?</string>
+  <string name="strike_description_subtitle">Es gibt 3 mögliche Wut-Angriffe</string>
+  <string name="strike_description_description">Die Anzeige füllt sich, wenn Habiticaner ihre Tagesaufgaben nicht erledigen. Sobald sie gefüllt ist, wird der Entmutiger seine Niederschmetternde Herzschmerz-Attacke über einem von Habitica\'s Händlern entfesseln, also erledige lieber Deine Aufgaben!</string>
+  <string name="pending_strike_subtitle">Dieser Angriff wurde noch nicht ausgeführt!</string>
+  <string name="strike_active_title" formatted="false">%s wurde angegriffen!</string>
+  <string name="strike_active_subtitle" formatted="false">%s wurde das Herz gebrochen!</string>
+  <string name="strike_active_description" formatted="false">%s war am Boden zerstört, als der %s die %s-Gebäude zerschmetterte. Schnell, packt Eure Aufgaben an, um das Monster zu besiegen und beim Wiederaufbau zu helfen!!</string>
+  <string name="questShop">Quest Shop</string>
+  <string name="market_owner_long">Alex der Händler</string>
+  <string name="tavern_owner_long">Daniel der Gastwirt</string>
+  <string name="stable_owner_long">Matt der Herr aller Bestien</string>
+  <string name="hide_boss_art">Boss-Grafik ausblenden</string>
+  <string name="active_world_boss">Aktiver Weltboss</string>
+  <string name="no_party_description">haftbarBestreite Quests mit Freunden oder im Alleingang. Bekämpfe Monster, erstelle Herausforderungen und bleibe auf der Spur durch Gruppen.</string>
+  <string name="no_party_title">Spiele Habitica in einer Party</string>
+  <string name="join_party_title">Willst Du einer Party beitreten?</string>
+  <string name="create_party_website">Öffne die Webseite, um eine Party zu erstellen</string>
+  <string name="id_copied">ID in Zwischenablage kopiert</string>
+  <string name="insufficientSubscriberGems">Du hast bereits die maximale Anzahl möglicher Edelsteine in diesem Monat gekauft. Neue Edelsteine werden innerhalb der ersten drei Tage jedes neuen Monats verfügbar. Danke für dein Abonnement!</string>
+  <string name="insufficientSubscriberGemsTitle">Monatliche Edelsteinobergrenze erreicht</string>
+  <string name="chat_message">Chat Nachricht</string>
+  <string name="world_boss_description_title">Was ist ein Weltboss?</string>
+  <string name="world_boss_description_description">Ein Weltboss ist ein spezielles Ereignis, bei dem die ganze Community zusammenarbeitet, um mit ihren Aufgaben ein mächtiges Monster zu besiegen!\nErledige Aufgaben, um dem Boss Schaden zuzufügen.\nDer Boss fügt Dir keinen Schaden für unerledigte Aufgaben zu, aber seine Raserei-Anzeige füllt sich. Wenn die Anzeige voll ist, wird der Boss einen unserer Ladenbesitzer angreifen!\nDu kannst weiterhin normale Questbosse bekämpfen;der Schaden wird beiden angerechnet.\nIn der Taverne kannst Du den Bosskampf-Fortschritt und die Raserei-Attacken einsehen.</string>
+  <string name="world_boss_description_intro">Ein Weltboss ist ein spezielles Ereignis, bei dem die ganze Community zusammenarbeitet, um mit ihren Aufgaben ein mächtiges Monster zu besiegen!</string>
+  <string name="world_boss_description_1">Erledige Aufgaben, um dem Boss Schaden zuzufügen.</string>
+  <string name="world_boss_description_2">Der Boss fügt Dir keinen Schaden für unerledigte Aufgaben zu, aber seine Raserei-Anzeige steigt. Wenn sie gefüllt ist, greift der Boss einen der Ladenbesitzer an!</string>
+  <string name="world_boss_description_3">Du kannst weiterhin gegen Questbosse kämpfen; der Schaden wird beiden angerechnet</string>
+  <string name="world_boss_description_4">In der Taverne kannst Du den aktuellen Stand im Bosskampf und die Raserei-Attacken einsehen</string>
+  <string name="world_boss_action_prompt" formatted="false">Besiege den Boss, um spezielle Belohnungen zu erhalten und Habitica vom Terror des %ss zu befreien!</string>
+  <string name="world_boss_description_subtitle">%s greift an!</string>
+  <string name="questShop_owner_long">Ian der Questmeister</string>
+  <string name="seasonalShop_owner_long">Jahreszeitenzauberin</string>
+  <string name="rage_attack">Raserei-Angriff:</string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.profile.xml b/Habitica/res/values-en-rGB/strings.profile.xml
index 6fd61612a..c56d3f9f2 100644
--- a/Habitica/res/values-en-rGB/strings.profile.xml
+++ b/Habitica/res/values-en-rGB/strings.profile.xml
@@ -3,6 +3,7 @@
     <string name="profile_pets_and_mounts">Pets &amp; Mounts</string>
     <string name="profile_pets_found">Pets Found</string>
     <string name="profile_mounts_tamed">Mounts Tamed</string>
+    <string name="profile_loading_data">Loading member data...</string>
     <string name="profile_send_message_to">Send message to %s</string>
     <string name="profile_message_sent_to">Message sent to %s</string>
     <string name="profile_level">Level:</string>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 434ae7f74..92582ea47 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -115,12 +115,8 @@
   <string name="friday">Friday</string>
   <string name="saturday">Saturday</string>
   <string name="sunday">Sunday</string>
-  <string name="levelup_header">You gained a level!</string>
-  <string name="levelup_detail">By accomplishing your real-life goals, you\'ve grown to Level %1$d!</string>
-  <string name="levelup_health">You have been fully healed!</string>
   <string name="levelup_button">Huzzah!</string>
   <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">Refill Health &amp; Try Again</string>
   <string name="filter">Filter</string>
@@ -130,7 +126,6 @@
   <string name="used_skill_without_mana">You used %1$s.</string>
   <string name="new_checklist_item">new checklist item</string>
   <string name="add_checklist_item">Add</string>
-  <string name="reminder_title">Remember to check off your Dailies!</string>
   <string name="skill_progress_title">Using Skill</string>
   <string name="coming_soon">Coming Soon</string>
   <string name="chat_flag_confirmation">Are you sure you want to report this message for violation?</string>
@@ -270,14 +265,7 @@
   <string name="equipped">Equipped</string>
   <string name="quest_cancel_message">Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll.</string>
   <string name="quest.invitation">Quest Invitation</string>
-  <string name="quest_begin_message">Are you sure? Only %1$d of your %2$d party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation.</string>
   <string name="quest.invitation.text">You have been invited to participate in a quest!</string>
-  <string name="ago_1day">1 day ago</string>
-  <string name="ago_days">%d days ago</string>
-  <string name="ago_1Minute">1 minute ago</string>
-  <string name="ago_minutes">%d minutes ago</string>
-  <string name="ago_hours">%d hours ago</string>
-  <string name="ago_1hour">1 hour ago</string>
   <string name="today">Today</string>
   <string name="sidebar_items">Items</string>
   <string name="eggs">Eggs</string>
@@ -302,20 +290,10 @@
   <string name="feed">Feed</string>
   <string name="hatch_with">Hatch pet with %s</string>
   <string name="hatched_pet_title">You hatched a %1$s %2$s!</string>
-  <string name="evolved_pet_title">You have tamed %1$s %2$s, let\'s go for a ride!</string>
   <string name="close">Close</string>
   <string name="share">Share</string>
   <string name="notification_pet_fed">You fed your %1$s %2$s!</string>
-  <string name="sectionpets">Base Pets</string>
-  <string name="sectionpremiumPets">Magic Potion Pets</string>
-  <string name="sectionquestPets">Quest Pets</string>
-  <string name="sectionspecialPets">Rare Pets</string>
-  <string name="sectionmounts">Base Mounts</string>
-  <string name="sectionpremiumMounts">Magic Potion Mounts</string>
-  <string name="sectionquestMounts">Quest Mounts</string>
-  <string name="sectionspecialMounts">Rare Mounts</string>
   <string name="world_quest">World Quest</string>
-  <string name="inn_description">Rest in the Inn to prevent your undone Dailies from hurting you overnight! (Note: does not prevent you from receiving Boss damage.)</string>
   <string name="empty_items">You don\'t have any %s</string>
   <string name="user_level">Lvl %d</string>
   <string name="user_level_with_class">Lvl %1$d %2$s</string>
@@ -323,7 +301,6 @@
   <string name="rogue">Rogue</string>
   <string name="mage">Mage</string>
   <string name="healer">Healer</string>
-  <string name="warrior_description">Warriors score more and better \"critical hits\", which randomly give bonus Gold, Experience, and drop chance for scoring a task. They also deal heavy damage to boss monsters. Play a Warrior if you find motivation from unpredictable jackpot-style rewards, or want to dish out the hurt in boss Quests!</string>
   <string name="mage_description">Mages learn swiftly, gaining Experience and Levels faster than other classes. They also get a great deal of Mana for using special abilities. Play a Mage if you enjoy the tactical game aspects of Habit, or if you are strongly motivated by leveling up and unlocking advanced features!</string>
   <string name="rogue_description">Rogues love to accumulate wealth, gaining more Gold than anyone else, and are adept at finding random items. Their iconic Stealth ability lets them duck the consequences of missed Dailies. Play a Rogue if you find strong motivation from Rewards and Achievements, striving for loot and badges!</string>
   <string name="healer_description">Healers stand impervious against harm, and extend that protection to others. Missed Dailies and bad Habits don\'t faze them much, and they have ways to recover Health from failure. Play a Healer if you enjoy assisting others in your Party, or if the idea of cheating Death through hard work inspires you!</string>
@@ -337,7 +314,6 @@
   <string name="dialog_go_back">Go Back</string>
   <string name="opt_out_confirmation">Are you sure you want to Opt Out?</string>
   <string name="change_class">Change your class</string>
-  <string name="change_class_description">Change your class and refund your attribute points for 3 gems. You can assign attribute points through the website.</string>
   <string name="enable_class">Enable Class System</string>
   <string name="changing_class_progress">Changing Class</string>
   <string name="by_email">By Email</string>
@@ -363,7 +339,6 @@
   <string name="market">Market</string>
   <string name="timeTravelers">Time Travellers</string>
   <string name="seasonalShop">Seasonal Shop</string>
-  <string name="empty_inbox">You don\'t have any Inbox messages. You can send a user a new message from their public chat messages!</string>
   <string name="party_invite">Unlock by inviting friends</string>
   <string name="no_gold">Not enough Gold</string>
   <string name="no_potion">You don\'t need to buy a health potion</string>
@@ -492,7 +467,6 @@
   <string name="warning">Warning</string>
   <string name="open_settings">Open Settings</string>
   <string name="dont_keep_activities_warning">It seems like you have the Developer option \“Don\'t keep Activities\” active. Currently this option causes issues with the Habitica app, so we suggest disabling it.</string>
-  <string name="inbox">Inbox</string>
   <string name="FAQ">Frequently Asked Questions</string>
   <string name="special">Special</string>
   <string name="gem_for_gold_description">Because you subscribe to Habitica, you can purchase a number of Gems each month using Gold.</string>
@@ -518,7 +492,6 @@
   <string name="login_btn_fb">Log in with Facebook</string>
   <string name="login_btn_google">Log in with Google</string>
   <string name="action_back">Back</string>
-  <string name="welcome_text">Oh, you must be new here. I’m Justin, I’ll be your guide in Habitica.\n\nTo start, you’ll need to create an avatar.</string>
   <string name="randomize">Randomise</string>
   <string name="avatar_extras">Extras</string>
   <string name="avatar_skin_color">Skin Colour</string>
@@ -530,7 +503,6 @@
   <string name="weak">Weak</string>
   <string name="strong">Strong</string>
   <string name="gray">Grey</string>
-  <string name="dated">Dated</string>
   <string name="completed">Completed</string>
   <string name="setuP_group_other">Other</string>
   <string name="clear">Clear</string>
@@ -552,14 +524,8 @@
   <string name="no_billing_subscriptions">Your device does not have any of the supported payment methods. Please use the Habitica website if you want to purchase a subscription.</string>
   <string name="save">Save</string>
   <string name="location">Location</string>
-  <string name="gem_reward">Gem reward</string>
   <string name="tasks">Tasks</string>
-  <string name="create_challenge">Create challenge</string>
-  <string name="edit_challenge">Edit Challenge</string>
-  <string name="challenge_create_error_tavern_one_gem">You need at least 1 gem to create a challenge in Tavern.</string>
   <string name="challenge_create_error_enough_gems">You don&amp;rsquo;t have enough gems to create a challenge.</string>
-  <string name="identify_your_challenge_with_a_tag">Identify your challenge with a tag ..</string>
-  <string name="challenge_create_error_tag">You need a tag to create this Challenge.</string>
   <string name="challenge_create_error_no_tasks">You need to add at least one task to create this Challenge.</string>
   <string name="challenge_create_error_title">You need a title to create this Challenge.</string>
   <string name="description_optional">Description (optional)</string>
@@ -585,7 +551,6 @@
   <string name="invitations">Invitations</string>
   <string name="quest_leader_header" formatted="false">Started by %s</string>
   <string name="quest_abort_message">Are you sure you want to abort this mission? It will abort it for everyone in your party and all progress will be lost. The quest scroll will be returned to the quest owner.</string>
-  <string name="loading">Loading...</string>
   <string name="reloading_content">Reloading Content</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
diff --git a/Habitica/res/values-es/strings.profile.xml b/Habitica/res/values-es/strings.profile.xml
index 9c3a150d3..dfeccc29f 100644
--- a/Habitica/res/values-es/strings.profile.xml
+++ b/Habitica/res/values-es/strings.profile.xml
@@ -3,6 +3,7 @@
     <string name="profile_pets_and_mounts">Mascotas y monturas</string>
     <string name="profile_pets_found">Mascotas encontradas</string>
     <string name="profile_mounts_tamed">Monturas domadas</string>
+    <string name="profile_loading_data">Cargando información de miembros...</string>
     <string name="profile_send_message_to">Enviar mensaje a %s</string>
     <string name="profile_message_sent_to">Mensaje enviado a %s</string>
     <string name="profile_level">Nivel:</string>
diff --git a/Habitica/res/values-es/strings.sidebar.xml b/Habitica/res/values-es/strings.sidebar.xml
index 8fdcef7af..a86baa590 100644
--- a/Habitica/res/values-es/strings.sidebar.xml
+++ b/Habitica/res/values-es/strings.sidebar.xml
@@ -3,7 +3,7 @@
   <string name="sidebar.tasks">Tareas</string>
   <string name="sidebar.skills">Habilidades</string>
   <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Bandeja de entrada</string>
+  <string name="sidebar.inbox">Mensajes</string>
   <string name="sidebar.tavern">Taberna</string>
   <string name="sidebar.party">Grupo</string>
   <string name="sidebar.purchaseGems">Comprar gemas</string>
@@ -17,4 +17,5 @@
   <string name="sidebar.settings">Ajustes</string>
   <string name="sidebar.about">Información</string>
   <string name="sidebar_shops">Tiendas</string>
+  <string name="sidebar_stats">Estadísticas</string>
 </resources>
diff --git a/Habitica/res/values-es/strings.tutorial.xml b/Habitica/res/values-es/strings.tutorial.xml
index 6f430e0a7..3663f809a 100644
--- a/Habitica/res/values-es/strings.tutorial.xml
+++ b/Habitica/res/values-es/strings.tutorial.xml
@@ -19,4 +19,5 @@
   <string name="tutorial_party">Aquí es donde tú y tus amigos podéis estar pendientes unos de otros para cumplir vuestros objetivos y combatir monstruos con vuestras tareas.</string>
   <string name="tutorial_tavern">Te damos la bienvenida a la Taberna, una sala de chat para todos los públicos y todas las edades. Aquí, puedes hablar de productividad y preguntar lo que quieras. ¡Que te diviertas!</string>
   <string name="tutorial_classes">¡Decide si quieres ser guerrero, mago, sanador o pícaro! Cada clase tiene sus propias habilidades y equipamiento. Si necesitas más información, pulsa en (?).</string>
+  <string name="tutorial_stats">Toca el botón gris para asignar los puntos de tus estadísticas a la vez, o toca las flechas para agregarlos punto por punto.</string>
 </resources>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 7ef9bdb4c..a13b446bc 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -115,12 +115,8 @@
   <string name="friday">Viernes</string>
   <string name="saturday">Sábado</string>
   <string name="sunday">Domingo</string>
-  <string name="levelup_header">¡Has subido de nivel!</string>
-  <string name="levelup_detail">Cumpliendo tus metas en la vida real, has pasado al nivel %1$d.</string>
-  <string name="levelup_health">¡Has recuperado toda tu salud!</string>
   <string name="levelup_button">¡Hurra!</string>
   <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">Recuperar toda la salud y volver a intentarlo</string>
   <string name="filter">Filtro</string>
@@ -130,7 +126,6 @@
   <string name="used_skill_without_mana">Has usado %1$s.</string>
   <string name="new_checklist_item">nuevo elemento de lista</string>
   <string name="add_checklist_item">Añadir</string>
-  <string name="reminder_title">¡Acuérdate de completar tus tareas diarias!</string>
   <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>
@@ -270,14 +265,14 @@
   <string name="equipped">Equipado</string>
   <string name="quest_cancel_message">¿Seguro que quieres cancelar esta misión? Se perderán todas las invitaciones que se hayan aceptado y el propietario de la misión recuperará el pergamino.</string>
   <string name="quest.invitation">Invitación a misión</string>
-  <string name="quest_begin_message">¿Estás seguro? Solamente %1$d de %2$d miembros de tu grupo se han unido a la misión! Las misiones comienzan automaticamente cuando todos los jugadores se han unido o han rechazado la invitación.</string>
+  <string name="quest_begin_message">¿Estás seguro? ¡Sólo %1$d de tus %2$d miembros de equipo se han unido a la misión! Las misiones comienzan automáticamente cuando todos los jugadores se han unido o rechazado la invitación.</string>
   <string name="quest.invitation.text">Te han invitado a participar en una misión.</string>
-  <string name="ago_1day">Hace 1 día</string>
-  <string name="ago_days">Hace %d días</string>
-  <string name="ago_1Minute">Hace 1 minuto</string>
-  <string name="ago_minutes">Hace %d minutos</string>
-  <string name="ago_hours">Hace %d horas</string>
-  <string name="ago_1hour">Hace 1 hora</string>
+  <string name="ago_1day">Hace 1d</string>
+  <string name="ago_days">Hace %dd</string>
+  <string name="ago_1Minute">Hace 1m</string>
+  <string name="ago_minutes">Hace %dm</string>
+  <string name="ago_hours">Hace %dh</string>
+  <string name="ago_1hour">Hace 1h</string>
   <string name="today">Hoy</string>
   <string name="sidebar_items">Artículos</string>
   <string name="eggs">Huevos</string>
@@ -302,20 +297,26 @@
   <string name="feed">Alimentar</string>
   <string name="hatch_with">Criar mascota con %s</string>
   <string name="hatched_pet_title">¡Ha nacido un/a %2$s %1$s!</string>
-  <string name="evolved_pet_title">Has dominado a %2$s %1$s, ¡vamos a dar una vuelta!</string>
+  <string name="evolved_pet_title">Has domado %1$s %2$s, ¡vamos a dar un paseo!</string>
   <string name="close">Cerrar</string>
   <string name="share">Compartir</string>
   <string name="notification_pet_fed">¡Tu %2$s %1$s ha comido!</string>
-  <string name="sectionpets">Mascotas básicas</string>
-  <string name="sectionpremiumPets">Mascotas de pociones mágicas</string>
-  <string name="sectionquestPets">Mascotas de misiones</string>
-  <string name="sectionspecialPets">Mascotas insólitas</string>
-  <string name="sectionmounts">Monturas básicas</string>
-  <string name="sectionpremiumMounts">Monturas de pociones mágicas</string>
-  <string name="sectionquestMounts">Monturas de misiones</string>
-  <string name="sectionspecialMounts">Monturas insólitas</string>
+  <string name="notification_purchase">Has comprado %s</string>
+  <string name="notification_purchase_reward">Has obtenido una recompensa.</string>
+  <string name="sectionpets">Estandar</string>
+  <string name="sectionpremiumPets">Poción Mágica</string>
+  <string name="sectionquestPets">Misión</string>
+  <string name="sectionspecialPets">Raro</string>
+  <string name="sectionmounts">Estandar</string>
+  <string name="sectionpremiumMounts">Poción Mágica</string>
+  <string name="sectionquestMounts">Misión</string>
+  <string name="sectionspecialMounts">Raro</string>
   <string name="world_quest">Misión mundial</string>
-  <string name="inn_description">Descansa en la posada para que tus tareas diarias sin completar no te hagan daño por la noche. (Nota: No evita que el jefe te dañe).</string>
+  <string name="inn_description">¿Necesitar un descanso? Visita la Posada de Daniel para pausar algunos de los mecánicos de juego más difíciles de Habitica:\n\n
+• Las Tareas Diarias perdidas no te harán daño\n
+• Las Tareas Pendientes no reiniciarán las rachas ni se degradarán en color\n
+• Los jefes no harán daño por tus Tareas Diarias perdidas\n
+• El daño que inflija el jefe o los objetos de una misión de recolección permanecerán pendientes hasta que salgas.</string>
   <string name="empty_items">No tienes %s</string>
   <string name="user_level">Nivel %d</string>
   <string name="user_level_with_class">Nivel %1$d %2$s</string>
@@ -323,7 +324,6 @@
   <string name="rogue">Pícaro</string>
   <string name="mage">Mago</string>
   <string name="healer">Sanador</string>
-  <string name="warrior_description">Los guerreros obtienen «rachas críticas» mejores y más frecuentes, que aportan oro y experiencia adicionales de forma aleatoria, y tienen más probabilidades de conseguir artículos al completar tareas. Además, hacen mucho daño a los monstruos. Juega como guerrero si lo que más te motiva es obtener recompensas aleatorias e impredecibles, o si disfrutas poniendo en su sitio a los monstruos de las misiones.</string>
   <string name="mage_description">Los magos aprenden rápido y tardan menos que otras clases en ganar experiencia y subir de nivel. Además, disponen de una gran cantidad de maná para usar sus habilidades especiales. Juega como mago si disfrutas con los aspectos estratégicos de Habitica, o si lo que más te motiva es subir de nivel y desbloquear funciones avanzadas.</string>
   <string name="rogue_description">A los pícaros les encanta acumular riquezas: ganan más oro que ninguna otra clase y son expertos en encontrar artículos por azar. Su habilidad más característica, la del sigilo, les permite eludir las consecuencias de no completar las tareas diarias. Juega como pícaro si lo que más te motiva es conseguir recompensas, logros, botines e insignias.</string>
   <string name="healer_description">Los sanadores se mantienen impertérritos ante los daños y ofrecen esa protección a los demás. Las tareas diarias sin cumplir y los hábitos negativos no les quitan el sueño, y tienen maneras de recuperar la salud cuando algo va mal. Juega como sanador si te gusta ayudar a los otros miembros del grupo o si te atrae la idea de esquivar a la Muerte con tu esfuerzo.</string>
@@ -337,7 +337,7 @@
   <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="change_class_description">Cambia tu clase y reembolsa tus puntos de estadística por 3 gemas.</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>
@@ -363,8 +363,10 @@
   <string name="market">Mercado</string>
   <string name="timeTravelers">Viajeros del tiempo</string>
   <string name="seasonalShop">Tienda estacional</string>
-  <string name="empty_inbox">No tienes ningún mensaje en la bandeja de entrada. Puedes enviar un mensaje a un usuario desde los mensajes de chat públicos que hayan enviado.</string>
+  <string name="empty_inbox">No tienes ningún mensaje. ¡Puedes enviar un mensaje nuevo a un usuario desde los mensajes de chat públicos que hayan enviado!</string>
   <string name="party_invite">Desbloquéala invitando a tus amigos</string>
+  <string name="login_incentive">Desbloquear iniciando sesión en Habitica regularmente</string>
+  <string name="create_account">Desbloquear creando una cuenta</string>
   <string name="no_gold">No tienes suficiente oro</string>
   <string name="no_potion">No necesitas comprar una poción de salud</string>
   <string name="successful_purchase">Has comprado %1$s</string>
@@ -492,7 +494,7 @@
   <string name="warning">Aviso</string>
   <string name="open_settings">Abrir Ajustes</string>
   <string name="dont_keep_activities_warning">Parece que tienes la opción de Desarrollador \ \"No mantener actividades \\" activa. Actualmente, esta opción causa problemas con la aplicación habitica, por lo que sugerimos desactivarla.</string>
-  <string name="inbox">Bandeja de entrada</string>
+  <string name="inbox">Mensajes</string>
   <string name="FAQ">Preguntas Frecuentes</string>
   <string name="special">Especial</string>
   <string name="gem_for_gold_description">Por estar suscrito a Habitica, puedes comprar cierta cantidad de Gemas cada mes utilizando Oro.</string>
@@ -518,7 +520,6 @@
   <string name="login_btn_fb">Iniciar sesión con Facebook</string>
   <string name="login_btn_google">Iniciar sesión con Google</string>
   <string name="action_back">Atrás</string>
-  <string name="welcome_text">Oh, debes ser nuevo aquí. Soy Justin, seré tu guía en Habitica. Para empezar, necesitarás crear un avatar.</string>
   <string name="randomize">Aleatorizar</string>
   <string name="avatar_extras">Extras</string>
   <string name="avatar_skin_color">Color de piel</string>
@@ -530,7 +531,7 @@
   <string name="weak">Débil</string>
   <string name="strong">Fuerte</string>
   <string name="gray">Gris</string>
-  <string name="dated">Fechado</string>
+  <string name="dated">Programado</string>
   <string name="completed">Completado</string>
   <string name="setuP_group_other">Otro</string>
   <string name="clear">Borrar</string>
@@ -552,14 +553,8 @@
   <string name="no_billing_subscriptions">Tu dispositivo no tiene ninguno de los métodos de pago compatibles. Por favor utilice el sitio web de habitica si quieres comprar una suscripción.</string>
   <string name="save">Guardar</string>
   <string name="location">Sitio</string>
-  <string name="gem_reward">Premio de Gema</string>
   <string name="tasks">Tareas</string>
-  <string name="create_challenge">Crear Reto</string>
-  <string name="edit_challenge">Editar Reto</string>
-  <string name="challenge_create_error_tavern_one_gem">Necesitas al menos 1 Gema para crear un Reto en la Taberna.</string>
   <string name="challenge_create_error_enough_gems">No tienes Gemas suficientes para crear un Reto.</string>
-  <string name="identify_your_challenge_with_a_tag">Identifica tu reto con una etiqueta.</string>
-  <string name="challenge_create_error_tag">Necesitas una etiqueta para crear este Reto.</string>
   <string name="challenge_create_error_no_tasks">Necesitas añadir al menos una tarea para crear este Reto.</string>
   <string name="challenge_create_error_title">Necesitas un título para crear este Reto.</string>
   <string name="description_optional">Descripción (opcional)</string>
@@ -585,7 +580,6 @@
   <string name="invitations">Invitaciones</string>
   <string name="quest_leader_header" formatted="false">Comenzado por %s</string>
   <string name="quest_abort_message">¿Estás seguro de que quieres abortar esta misión? Se abortará para todos en su partido y todo el progreso se perderá. El rollo de búsqueda se devolverá al propietario de la búsqueda.</string>
-  <string name="loading">Cargando...</string>
   <string name="reloading_content">Recargando Contenido</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
@@ -603,6 +597,10 @@
   <string name="experience_reward" formatted="false">%d Puntos de Experiencia</string>
   <string name="gold_reward" formatted="false">%d Oro</string>
   <string name="quest_owner_rewards">Premios de Propietario de la Búsqueda</string>
+  <string name="str_abbrv">Fue</string>
+  <string name="per_abbrv">Per</string>
+  <string name="int_abbrv">Int</string>
+  <string name="con_abbrv">Con</string>
   <string name="reset_account">Restablecer Cuenta</string>
   <string name="reset_account_description">¡ADVERTENCIA! Esta opción restablece muchas partes de tu cuenta. Esto es extremadamente desalentado, pero algunas personas lo encuentran útil al principio después de jugar con el sitio por un corto período de tiempo. Perderás todos sus niveles, oro y puntos de experiencia. Todas tus tareas (con la excepción de las de Retos) se eliminarán permanentemente y perderá todos sus datos históricos. Perderás todo tu equipo pero podrás comprarlo todo de nuevo, incluyendo todo el equipo de edición limitada o artículos Misteriosos abonado que ya posee (tendrá que estar en la clase correcta para volver a comprar equipo específico de la clase). Mantendrás tu clase actual y tus mascotas y monturas. Es posible que prefieras usar el Orbe de Renacimiento en su lugar, que es una opción mucho más segura y que preservará sus tareas y equipos.</string>
   <string name="delete_account">Borrar Cuenta</string>
@@ -613,4 +611,125 @@
   <string name="nevermind">No importa</string>
   <string name="resetting_account">Reestableciendo cuenta</string>
   <string name="deleting_account">Borrando cuenta</string>
+  <string name="insufficientGold">¡Debes completar más tareas antes de poder pagar este artículo!</string>
+  <string name="insufficientGems">¡Necesitarás más gemas para comprar este objeto!</string>
+  <string name="purchase_gems">Comprar gemas</string>
+  <string name="insufficientHourglasses">¡Necesitarás más Relojes de Arena Místicos para comprar este objeto!</string>
+  <string name="get_hourglasses">Conseguir Relojes de Arena</string>
+  <string name="subscribe_for_hourglasses">Suscribir para conseguir Relojes de Arena</string>
+  <string name="timetravelers_closed_description">Consigue un Reloj de arena Místico por cada tres meses seguidos de suscripción. Podrás usarlo para desbloquear objetos exclusivos, mascotas o monturas del pasado... ¡y del futuro!</string>
+  <string name="want_to_subscribe">Quiero Suscribirme</string>
+  <string name="seasonal_closed_description">Las Grandes Galas ocurren cerca de los solsticios y equinoccios, ¡así que vuelve de vez en cuando para encontrar una interesante variedad de artículos especiales de temporada!</string>
+  <string name="come_back_soon">¡Vuelve pronto!</string>
+  <string name="level">Nivel</string>
+  <string name="streak_label">Racha de 21 Días</string>
+  <string name="stats">Estadísticas</string>
+  <string name="fix_character_description">Si has encontrado un error o has cometido un error que cambió a tu personaje injustamente, puedes corregir manualmente esos valores aquí.</string>
+  <string name="fix_character_values">Arreglar Valores del Personaje</string>
+  <string name="saving">Guardando</string>
+  <string name="forgot_password_title">Enviar un correo electrónico con un enlace para restablecer la contraseña</string>
+  <string name="forgot_password_description">Introduce la dirección de correo electrónico que usaste para registrarte en Habitica.</string>
+  <string name="forgot_password_confirmation">Si tenemos tu correo electrónico en el archivo, las instrucciones para establecer una nueva contraseña se han enviado al correo electrónico.</string>
+  <string name="ok">Vale</string>
+  <string name="profile">Perfil</string>
+  <string name="profile_summary">Editar tu perfil público.</string>
+  <string name="display_name">Mostrar Nombre</string>
+  <string name="photo_url">URL de foto</string>
+  <string name="login_name">Nombre de Inicio de sesión</string>
+  <string name="about">Información</string>
+  <string name="app_settings">Ajustes de la Aplicación</string>
+  <string name="authentication">Autentificación</string>
+  <string name="authentication_summary">Cambia tus opciones de autentificación</string>
+  <string name="change_password">Cambia la contraseña</string>
+  <string name="change_email">Cambia dirección de correo</string>
+  <string name="change_login_name">Cambiar Nombre de Inicio de sesión</string>
+  <string name="change">Cambiar</string>
+  <string name="character_level">Nivel de Personaje</string>
+  <string name="auto_allocate_points">Asignar Puntos Automáticamente</string>
+  <string name="stat_guide">Guía de Inicio</string>
+  <string name="character_build">Selección de Personaje</string>
+  <string name="character_build_description">Cada nivel te otorga un punto para asignar a un atributo a tu elección. Puedes hacerlo manualmente o dejar que el juego decida por ti usando la opción de Distribución Automática.</string>
+  <string name="strength">Fuerza</string>
+  <string name="strength_description">Incrementa la posibilidad de asestar golpes críticos al sumar puntos en una tarea. También aumenta el daño que reciben los Jefes.</string>
+  <string name="intelligence">Inteligencia</string>
+  <string name="intelligence_description">Aumenta la exp ganada por completar tareas. También aumenta tu capacidad de maná y lo rápido que se regenera el maná al cabo del tiempo.</string>
+  <string name="constitution">Constitución</string>
+  <string name="constitution_description">Disminuye la cantidad de daño recibido de tus tareas. No disminuye el daño recibido de los jefes.</string>
+  <string name="perception">Percepción</string>
+  <string name="perception_description">Aumenta la probabilidad de encontrar recompensas al completar Tareas, el límite máximo diario, las Bonificaciones de Racha y la cantidad de oro otorgada por las Tareas.</string>
+  <string name="buffs">Apoyos</string>
+  <string name="allocated">Asignado</string>
+  <string name="distribute_evenly">Distribuir uniformemente</string>
+  <string name="distribute_class">Distribuir según la clase</string>
+  <string name="distribute_task">Distribuir según la actividad de las tareas</string>
+  <string name="no_points_to_allocate">No hay puntos que asignar</string>
+  <string name="points_to_allocate" formatted="false">%d puntos por asignar</string>
+  <string name="distribute_evenly_help">Asigna el mismo número de puntos a cada atributo.</string>
+  <string name="distribute_class_help">Asigna más puntos a los atributos importantes para tu clase</string>
+  <string name="distribute_task_help">Asigna puntos según las categorías de Fuerza, Inteligencia, Constitución y Percepción asociadas con las tareas que cumples.</string>
+  <string name="allocating_points">Asignación de Puntos</string>
+  <string name="class_equipment">Equipamiento</string>
+  <string name="equipment_empty">¡Ya tienes todo el equipamiento! Se sacarán más durante las Grand Galas, cerca de los solsticios y equinoccios.</string>
+  <string name="classless">Sin Clase</string>
+  <string name="class_equipment_shop_dialog">Este objeto solo está disponible para una clase específica.\nPuedes cambiar tu clase desde Ajustes.</string>
+  <string name="class_gear_disclaimer">Solo puedes comprar equipo para tu clase actual</string>
+  <string name="available_stats" formatted="false">%d puntos</string>
+  <string name="toogle_emojis">Activar/desactivar Emojis</string>
+  <string name="tavern_description">¡Bienvenido a la posada! Trae una silla para conversar, o toma un descanso de sus tareas.</string>
+  <string name="check_into_inn">Entrar en la Posada</string>
+  <string name="community_guidelines">Normas de la comunidad</string>
+  <string name="view_community_guidelines">Ver las Normas de la comunidad</string>
+  <string name="guidelines_description">Habitica intenta crear un ambiente acogedor para usuarios de todas las edades y entornos, especialmente en espacios públicos como la Taberna. Si tienes alguna pregunta, consulta nuestras pautas, por favor.</string>
+  <string name="helpful_links">Enlaces útiles</string>
+  <string name="view_faq">Ver Preguntas Frecuentes</string>
+  <string name="report_bug">Notificar un error</string>
+  <string name="player_tiers">Rangos de Jugador</string>
+  <string name="staff_moderators">Miembros del personal y Moderadores</string>
+  <string name="tiers_descriptions">Los nombres de usuario coloreados que ves en el chat representan el escalafón de colaborador de una persona. ¡Cuanto más alto sea el escalafón, más ha contribuido la persona a habitica a través de arte, codificación, la comunidad o incluso más!</string>
+  <string name="navigation_drawer_open">Abrir panel de navegación</string>
+  <string name="navigation_drawer_close">Cerrar panel de navegación</string>
+  <string name="world_boss">Jefe mundial</string>
+  <string name="world_boss_art">Imagen del jefe</string>
+  <string name="boss_art">Imagen del jefe</string>
+  <string name="world_boss_description">Descripción del jefe mundial</string>
+  <string name="rage_strike_count" formatted="false">Ataque de ira: %d/%d</string>
+  <string name="pending_strike_description">¡Este ataque aún no ha ocurrido!\nEl Jefe Mundial arremeterá y atacará a uno de nuestros amigables tenderos una vez que su barra de ira se llene. ¡Mantente al día con tus Tareas Diarias para evitar que suceda!</string>
+  <string name="pending_strike_title">Ataque pendiente</string>
+  <string name="strike_description_title">¿Qué es un Ataque de Ira?</string>
+  <string name="strike_description_subtitle">Hay 3 posibles Ataques de Ira</string>
+  <string name="strike_description_description">Este indicador se llena cuando los Habiticanos fallan en sus Tareas Diarias. Si se llena, el Descorazonador desencadenará su ataque Congoja Devastadora sobre uno de los tenderos de Habitica, ¡así que asegúrate de hacer tus tareas!</string>
+  <string name="pending_strike_subtitle">¡Todavía no ha ocurrido ningún ataque!</string>
+  <string name="strike_active_title" formatted="false">¡El %s ha sido atacado!</string>
+  <string name="strike_active_subtitle" formatted="false">¡A %s se le ha roto el corazón!</string>
+  <string name="strike_active_description" formatted="false">Nuestro querido %s fue destrozado cuando el %s desmenuzó el %s. ¡¡Rápido, enfréntate a tus tareas para derrotar al monstruo y ayudar con la reconstrucción!!</string>
+  <string name="questShop">Tienda de Misiones</string>
+  <string name="market_owner_long">Alex el Mercader</string>
+  <string name="tavern_owner_long">Daniel el posadero</string>
+  <string name="stable_owner_long">Matt el maestro de las bestias</string>
+  <string name="hide_boss_art">Ocultar la Imagen del Jefe</string>
+  <string name="active_world_boss">Jefe Mundial Activo</string>
+  <string name="no_party_description">Realiza misiones con amigos o por tu cuenta. Combate monstruos, crea retos y ayúdate a ser responsable a través de los Equipos.</string>
+  <string name="no_party_title">Juega a Habitica en un Equipo</string>
+  <string name="join_party_title">¿Quieres unirte a un equipo?</string>
+  <string name="create_party_website">Abrir página web para crear un equipo</string>
+  <string name="id_copied">ID copiada en el portapapeles</string>
+  <string name="insufficientSubscriberGems">Has comprado todas las gemas que puedes este mes. Habrá más disponibles durante los primeros tres días de cada mes. ¡Gracias por suscribirte!</string>
+  <string name="insufficientSubscriberGemsTitle">Alcanzada la capacidad mensual de gemas</string>
+  <string name="chat_message">Mensaje de chat</string>
+  <string name="world_boss_description_title">¿Qué es un Jefe Mundial?</string>
+  <string name="world_boss_description_description">¡Un Jefe Mundial es un evento especial donde toda la comunidad trabaja en conjunto para derrotar a un poderoso monstruo con sus tareas!\nCompleta tareas para hacer daño al Jefe\nEl Jefe no te hará daño por tareas sin hacer, pero su medidor de Ira aumentará. ¡Si la barra se llena, el Jefe atacará a uno de los tenderos!\nPuedes continuar enfrentándote a Jefes de misión normales, el daño se aplicará a ambos\nComprueba la Taberna para ver el progreso del Jefe y los ataques de Ira</string>
+  <string name="world_boss_description_intro">¡Un Jefe Mundial es un evento especial donde toda la comunidad trabaja en conjunto para derrotar a un poderoso monstruo con sus tareas!</string>
+  <string name="world_boss_description_1">Completa tareas para hacer daño al Jefe</string>
+  <string name="world_boss_description_2">El Jefe no te hará daño por tareas sin hacer, pero su medidor de Ira aumentará. ¡Si la barra se llena, el Jefe atacará a uno de los tenderos!</string>
+  <string name="world_boss_description_3">Puedes continuar enfrentándote a Jefes de misión normales, el daño se aplicará a ambos</string>
+  <string name="world_boss_description_4">Comprueba la Taberna para ver el progreso del Jefe y los ataques de Ira</string>
+  <string name="world_boss_action_prompt" formatted="false">¡Derrota al Jefe para ganar recompensas especiales y salvar a Habitica del terror de %s!</string>
+  <string name="world_boss_description_subtitle">¡ %s ataca!</string>
+  <string name="questShop_owner_long">Ian el guía de misiones</string>
+  <string name="seasonalShop_owner_long">Hechicera de Temporada</string>
+  <string name="rage_attack">Ataque de ira:</string>
+  <string name="report">Reportar</string>
+  <string name="like">Me gusta</string>
+  <string name="reply">Contestar</string>
+  <string name="cancel">Cancelar</string>
 </resources>
diff --git a/Habitica/res/values-fr/strings.profile.xml b/Habitica/res/values-fr/strings.profile.xml
index 5d540a19c..a2a34cc2c 100644
--- a/Habitica/res/values-fr/strings.profile.xml
+++ b/Habitica/res/values-fr/strings.profile.xml
@@ -3,6 +3,7 @@
     <string name="profile_pets_and_mounts">Familiers &amp; montures</string>
     <string name="profile_pets_found">Familiers trouvés</string>
     <string name="profile_mounts_tamed">Montures dressées</string>
+    <string name="profile_loading_data">Chargement des données de membre...</string>
     <string name="profile_send_message_to">Envoyer un message à %s</string>
     <string name="profile_message_sent_to">Message envoyé à %s</string>
     <string name="profile_level">Niveau:</string>
diff --git a/Habitica/res/values-fr/strings.sidebar.xml b/Habitica/res/values-fr/strings.sidebar.xml
index b78a37e09..b757c2ad3 100644
--- a/Habitica/res/values-fr/strings.sidebar.xml
+++ b/Habitica/res/values-fr/strings.sidebar.xml
@@ -3,7 +3,7 @@
   <string name="sidebar.tasks">Tâches</string>
   <string name="sidebar.skills">Compétences</string>
   <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Boîte de réception</string>
+  <string name="sidebar.inbox">Messages</string>
   <string name="sidebar.tavern">Auberge</string>
   <string name="sidebar.party">Équipe</string>
   <string name="sidebar.purchaseGems">Gemmes et abonnement</string>
@@ -12,7 +12,7 @@
   <string name="sidebar.section.inventory">Inventaire</string>
   <string name="sidebar.avatar">Avatar</string>
   <string name="sidebar.equipment">Équipement</string>
-  <string name="sidebar.stable">Étable</string>
+  <string name="sidebar.stable">Écurie</string>
   <string name="sidebar.news">Nouveautés</string>
   <string name="sidebar.settings">Paramètres</string>
   <string name="sidebar.about">À propos</string>
diff --git a/Habitica/res/values-fr/strings.tutorial.xml b/Habitica/res/values-fr/strings.tutorial.xml
index c8b81f621..e8841f209 100644
--- a/Habitica/res/values-fr/strings.tutorial.xml
+++ b/Habitica/res/values-fr/strings.tutorial.xml
@@ -19,4 +19,5 @@
   <string name="tutorial_party">Voici l\'endroit où vos amis et vous pouvez vous tenir mutuellement responsables de vos buts et combattre des monstres grâce à vos tâches !</string>
   <string name="tutorial_tavern">Bienvenue à la Taverne, un salon de discussion public pour tous les âges ! Ici, vous pouvez discuter de productivité et poser des questions. Amusez-vous bien !</string>
   <string name="tutorial_classes">Devenez, au choix, Guerrier, Mage, Guérisseur ou Voleur ! Chaque classe possède des équipements et des compétences uniques. Tapez sur (?) pour en savoir plus !</string>
+  <string name="tutorial_stats">Utilisez le bouton gris pour allouer plusieurs points à la fois, ou utilisez les flèches pour en ajouter un à la fois.</string>
 </resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index 7bb9c0791..b73896c29 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -115,12 +115,9 @@
   <string name="friday">Vendredi</string>
   <string name="saturday">Samedi</string>
   <string name="sunday">Dimanche</string>
-  <string name="levelup_header">Vous avez gagné un niveau !</string>
-  <string name="levelup_detail">En atteignant vos buts dans la vie réelle, vous avez atteint le Niveau %1$d !</string>
-  <string name="levelup_health">Vous avez été guéri·e complètement !</string>
   <string name="levelup_button">Bravo !</string>
   <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_penalty_body">Vous avez perdu un niveau, votre 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">Reprendre des forces &amp; réessayer</string>
   <string name="filter">Filtrer</string>
@@ -130,7 +127,7 @@
   <string name="used_skill_without_mana">Vous avez utilisé %1$s.</string>
   <string name="new_checklist_item">Nouvelle vérification</string>
   <string name="add_checklist_item">Ajouter</string>
-  <string name="reminder_title">N\'oubliez pas de cocher vos tâches Quotidiennes !</string>
+  <string name="reminder_title">Rappelez-vous de cocher vos tâches quotidiennes</string>
   <string name="skill_progress_title">Utiliser une compétence</string>
   <string name="coming_soon">Bientôt disponible</string>
   <string name="chat_flag_confirmation">Confirmez-vous vouloir signaler ce message pour infraction ?</string>
@@ -270,13 +267,14 @@
   <string name="equipped">Équipé</string>
   <string name="quest_cancel_message">Êtes-vous sûr·e de vouloir annuler cette quête ? Toutes les invitations ayant été acceptées seront perdues. Le lanceur de la quête gardera le parchemin de la quête en sa possession.</string>
   <string name="quest.invitation">Invitation à une quête</string>
+  <string name="quest_begin_message">Voulez-vous commencer ? Seuls %1$d de vos %2$d partenaires d\'aventure on rejoint cette quête ! La quête démarre automatiquement une fois que tout le monde a accepté ou refusé l\'invitation.</string>
   <string name="quest.invitation.text">Vous avez été invité·e à participer à une quête !</string>
-  <string name="ago_1day">il y a 1 jour</string>
-  <string name="ago_days">il y a %d jours</string>
-  <string name="ago_1Minute">il y a 1 minute</string>
-  <string name="ago_minutes">il y a %d minutes</string>
-  <string name="ago_hours">il y a %d heures</string>
-  <string name="ago_1hour">il y a 1 heure</string>
+  <string name="ago_1day">Il y a 1j</string>
+  <string name="ago_days">Il y a %dj</string>
+  <string name="ago_1Minute">Il y a 1m</string>
+  <string name="ago_minutes">Il y a %dm</string>
+  <string name="ago_hours">Il y a %dh</string>
+  <string name="ago_1hour">Il y a 1h</string>
   <string name="today">Aujourd\'hui</string>
   <string name="sidebar_items">Objets</string>
   <string name="eggs">Œufs</string>
@@ -301,22 +299,26 @@
   <string name="feed">Nourrir</string>
   <string name="hatch_with">Faire éclore le familier avec %s</string>
   <string name="hatched_pet_title">Votre %1$s %2$s a éclos !</string>
-  <string name="evolved_pet_title">Votre %1$s %2$s a grandi, baladez-vous dessus !</string>
+  <string name="evolved_pet_title">Vous avez dompté %2$s%1$s, partez en promenade ensemble !</string>
   <string name="close">Fermer</string>
   <string name="share">Partager</string>
   <string name="notification_pet_fed">Vous avez nourri votre %1$s %2$s !</string>
   <string name="notification_purchase">Vous avez acheté %s</string>
   <string name="notification_purchase_reward">Vous avez acheté une récompense</string>
-  <string name="sectionpets">Familiers basiques</string>
-  <string name="sectionpremiumPets">Familiers magiques</string>
-  <string name="sectionquestPets">Familiers de quête</string>
-  <string name="sectionspecialPets">Familiers rares</string>
-  <string name="sectionmounts">Montures basiques</string>
-  <string name="sectionpremiumMounts">Montures magiques</string>
-  <string name="sectionquestMounts">Montures de quête</string>
-  <string name="sectionspecialMounts">Montures rares</string>
+  <string name="sectionpets">Standard</string>
+  <string name="sectionpremiumPets">Potion magique</string>
+  <string name="sectionquestPets">Quête</string>
+  <string name="sectionspecialPets">Rare</string>
+  <string name="sectionmounts">Standard</string>
+  <string name="sectionpremiumMounts">Potion magique</string>
+  <string name="sectionquestMounts">Quête</string>
+  <string name="sectionspecialMounts">Rare</string>
   <string name="world_quest">Quête mondiale</string>
-  <string name="inn_description">Reposez-vous à l\'auberge pour éviter les dégâts causés par les quotidiennes que vous n\'avez pas réalisées ! (Note : cela ne vous immunise pas contre les dégâts causés par les boss.)</string>
+  <string name="inn_description">Besoin de repos ? Reposez vous à l\'Auberge de Daniel pour faire une pause des effets de jeu les plus compliqués :\n\n
+• Les quotidiennes manquées ne vous infligeront pas de dégâts\n
+• Les tâches ne perdront pas de combo ni ne changeront de couleur\n
+• Les boss ne vous infligeront pas de dégâts pour vos quotidiennes manquées\n
+• Vos dégâts de boss ou objets de quêtes collectés resteront en cours jusqu\'à ce que vous quittiez l\'auberge.</string>
   <string name="empty_items">Vous n\'avez pas de %s</string>
   <string name="user_level">Niv %d</string>
   <string name="user_level_with_class">Niv %1$d - %2$s</string>
@@ -324,7 +326,7 @@
   <string name="rogue">Voleur</string>
   <string name="mage">Mage</string>
   <string name="healer">Guérisseur</string>
-  <string name="warrior_description">Les Guerriers font plus de \"coups critiques\" et ils sont plus puissants, tandis qu\'ils reçoivent aléatoirement des bonus d\'or, d\'expérience, et de chance d\'obtenir du butin en achevant une tâche. Ils infligent également de lourds dommages aux boss. Jouez un Guerrier si vous êtes motivé par des récompenses aléatoires de style jackpot, ou si vous voulez distribuez des gnons dans les quêtes de boss !</string>
+  <string name="warrior_description">Les Guerriers font plus de \\"coups critiques\\" et ils sont plus puissants, tandis qu\'ils reçoivent aléatoirement des bonus d\'or, d\'expérience, et de chance d\'obtenir du butin en achevant une tâche. Ils infligent également de lourds dommages aux boss. Jouez un Guerrier si vous êtes motivé par des récompenses aléatoires de style jackpot, ou si vous voulez distribuez des gnons dans les quêtes de boss !</string>
   <string name="mage_description">Les Mages apprennent vite, gagnant expérience et niveaux plus rapidement que les autres classes. Ils reçoivent également de grandes réserves de mana pour utiliser les capacités spéciales. Jouez un Mage si vous aimez l\'aspect tactique du jeu, ou si vous êtes très motivé à monter beaucoup de niveaux et débloquer des options avancées !</string>
   <string name="rogue_description">Les Voleurs adorent amasser des richesses, récupérant plus d\'or que qui que ce soit d\'autre, et sont doués pour trouver des objets par hasard. Leur légendaire capacité de Furtivité leur permet d\'esquiver les conséquences des Quotidiennes manquées. Jouez un Voleur si vous êtes fortement motivé par les récompenses et les succès, à la recherche de butin et de badges !</string>
   <string name="healer_description">Les Guérisseurs sont imperméable aux dégâts et étendent cette protection aux autres. Les Quotidiennes manquées et les mauvaises habitudes ne les affectent pas tant que ça, et ils ont des moyens pour retrouver la santé après un échec. Jouez un Guérisseur si vous aimez assister les membres de votre équipe, ou si l\'idée de tromper la mort par le dur labeur vous inspire !</string>
@@ -338,7 +340,7 @@
   <string name="dialog_go_back">Revenir</string>
   <string name="opt_out_confirmation">Confirmez-vous vouloir désactiver votre compte ?</string>
   <string name="change_class">Changez votre classe</string>
-  <string name="change_class_description">Changez de classe et remboursez les points d\'attribut en échange de 3 gemmes. Vous pourrez attribuer vos points sur le site web</string>
+  <string name="change_class_description">Changez de classe et ré-attribuez vos points d\'attribut pour 3 gemmes.</string>
   <string name="enable_class">Activer le système de classe</string>
   <string name="changing_class_progress">Changer de classe</string>
   <string name="by_email">Par email</string>
@@ -346,6 +348,7 @@
   <string name="send">Envoyer</string>
   <string name="invite">Inviter des proches</string>
   <string name="invite_id_description">Si vous avez des proches qui jouent déjà à Habitica, invitez-les en utilisant leurs ID d\'utilisateur.</string>
+  <string name="invite_username_description">Si vous avez des amis qui utilisent déjà Habitica, invitez les ici avec leur nom d\'utilisateur.</string>
   <string name="invite_email_description">Si un•e ami•e rejoint Habitica via votre email, il ou elle sera automatiquement invité•e à rejoindre votre équipe !</string>
   <string name="add_invites">Ajouter des invitations</string>
   <string name="user_id">ID d\'utilisateur</string>
@@ -364,8 +367,10 @@
   <string name="market">Marché</string>
   <string name="timeTravelers">Voyageurs temporels</string>
   <string name="seasonalShop">Boutique saisonnière</string>
-  <string name="empty_inbox">Vous n\'avez pas de messages dans votre boîte de réception. Vous pouvez envoyer un nouveau message à partir des messages de discussion publics de chaque personne.</string>
+  <string name="empty_inbox">Vous n\'avez pas de message. Vous pouvez envoyer un nouveau message à quelqu\'un à partir de ses message de discussion publics.</string>
   <string name="party_invite">Débloquer en invitant des ami•e•s</string>
+  <string name="login_incentive">Débloquez en vous connectant régulièrement à Habitica</string>
+  <string name="create_account">Débloquez en créant un compte</string>
   <string name="no_gold">Pas assez d\'or</string>
   <string name="no_potion">Vous n\'avez pas besoin d\'acheter une potion de santé</string>
   <string name="successful_purchase">%1$s acheté</string>
@@ -441,7 +446,7 @@
   <string name="subscribe.listitem1.description">Alexander le marchand vous vendra des gemmes au prix de 20 pièces d\'or par gemme.\n\nSes commandes mensuelles sont plafonnées initialement à 25 gemmes par mois mais peut augmenter en fonction de la durée de votre abonnement\n\n. Ce plafond augmente de 5 gemmes pour chaque période de trois mois consécutif d\'abonnement, jusqu\'à un maximum de 50 gemmes par mois !</string>
   <string name="subscribe.listitem2.description">Chaque mois vous recevrez un objet cosmétique unique pour votre avatar !\n\nEn plus, pour chaque période de trois mois d\'abonnement consécutif, les voyageurs temporels vous donneront accès à des objets cosmétiques passés (ou futurs).</string>
   <string name="subscribe.listitem3.description">Rend l\'historique des tâches disponible plus longtemps.</string>
-  <string name="subscribe.listitem4.description">Doubler le plafond de butin vous permettra de recevoir plus d\'objets pour avoir rempli des tâches chaque jour, vous aidant ainsi à compléter votre étable plus rapidement !</string>
+  <string name="subscribe.listitem4.description">Doubler le plafond de butin vous permettra de recevoir plus d\'objets pour avoir rempli des tâches chaque jour, vous aidant ainsi à compléter votre écurie plus rapidement !</string>
   <string name="subscribe1month.gemcap">La limite de gemmes commence à 25</string>
   <string name="subscribe3month.gemcap">La limite de gemmes est augmentée à 30</string>
   <string name="subscribe6month.gemcap">La limite de gemmes est augmentée à 35</string>
@@ -493,7 +498,7 @@
   <string name="warning">Attention</string>
   <string name="open_settings">Ouvrir les paramètres</string>
   <string name="dont_keep_activities_warning">Il semblerait que vous ayez l\'option développeur \\"Ne pas conserver les activités\\" activées. Actuellement, cette option provoque des problèmes avec l\'application Habitica, nous vous suggérons de la désactiver.</string>
-  <string name="inbox">Boîte de réception</string>
+  <string name="inbox">Messages</string>
   <string name="FAQ">Questions fréquentes (FAQ)</string>
   <string name="special">Spécial</string>
   <string name="gem_for_gold_description">Grâce à votre abonnement, vous pouvez acheter des gemmes chaque mois en utilisant de l\'or.</string>
@@ -507,7 +512,7 @@
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Votre prochain prix sera débloqué à %1$d connexions</string>
   <string name="pending_approval">En attente de validation</string>
   <string name="filters">Filtres</string>
-  <string name="done">Réalisées</string>
+  <string name="done">Terminer</string>
   <string name="group_tasks_edit_description">Les tâches de groupe ne peuvent pas être modifiées.</string>
   <string name="group_tasks_edit_title">Tâche non modifiable</string>
   <string name="groups">Groupes</string>
@@ -519,7 +524,7 @@
   <string name="login_btn_fb">Se connecter via Facebook</string>
   <string name="login_btn_google">Se connecter via Google</string>
   <string name="action_back">Retour</string>
-  <string name="welcome_text">Oh, vous devez débuter. Je m\'appelle Justin et je vais vous guider dans Habitica.\n\nPour commencer, vous devez créer un avatar.</string>
+  <string name="welcome_text">Oh, vous devez débuter. Je m\'appelle Justin et je vais vous guider dans Habitica.\n\nPour commencer, comment devons-nous vous appeler? Sentez-vous libre de changer ce que j\'ai choisi. Quand vous êtes prêt, créons votre avatar!</string>
   <string name="randomize">Aléatoire</string>
   <string name="avatar_extras">Bonus</string>
   <string name="avatar_skin_color">Couleur de peau</string>
@@ -531,7 +536,7 @@
   <string name="weak">Faibles</string>
   <string name="strong">Fortes</string>
   <string name="gray">Grisées</string>
-  <string name="dated">Datées</string>
+  <string name="dated">Planifiées</string>
   <string name="completed">Terminé</string>
   <string name="setuP_group_other">Autre</string>
   <string name="clear">Effacer</string>
@@ -556,11 +561,11 @@
   <string name="gem_reward">Récompense en gemmes</string>
   <string name="tasks">Tâches</string>
   <string name="create_challenge">Créer un défi</string>
-  <string name="edit_challenge">Modifier un défi</string>
-  <string name="challenge_create_error_tavern_one_gem">Il vous faut au moins 1 gemmes pour créer un défi de la taverne.</string>
+  <string name="edit_challenge">Modifier</string>
+  <string name="challenge_create_error_tavern_one_gem">Il vous faut au moins 1 gemme pour créer un défi public.</string>
   <string name="challenge_create_error_enough_gems">Vous ne possédez pas assez de gemmes pour créer un défi.</string>
-  <string name="identify_your_challenge_with_a_tag">Identifier votre défi avec une étiquette ..</string>
-  <string name="challenge_create_error_tag">Il vous faut une étiquette pour créer ce défi.</string>
+  <string name="identify_your_challenge_with_a_tag">Identifiez votre défi avec une étiquette ..</string>
+  <string name="challenge_create_error_tag">Il vous faut un nom nom court pour créer ce défi</string>
   <string name="challenge_create_error_no_tasks">Vous devez ajouter au moins une tâche pour créer ce défi.</string>
   <string name="challenge_create_error_title">Il vous faut un titre pour créer ce défi.</string>
   <string name="description_optional">Description (optionnel)</string>
@@ -604,6 +609,10 @@
   <string name="experience_reward" formatted="false">%d points d\'expérience</string>
   <string name="gold_reward" formatted="false">%d pièces d\'or</string>
   <string name="quest_owner_rewards">Récompenses du propriétaire de la quête</string>
+  <string name="str_abbrv">For</string>
+  <string name="per_abbrv">Per</string>
+  <string name="int_abbrv">Int</string>
+  <string name="con_abbrv">Con</string>
   <string name="reset_account">Réinitialiser le compte</string>
   <string name="reset_account_description">ATTENTION ! Cette action va réinitialiser de nombreux aspects de votre compte. Cela est hautement déconseillé, mais certaines personnes peuvent trouver utile de le faire après avoir joué un peu avec le site.\n\nVous perdrez tous vos niveau, votre or et vos points d\'expérience. Toutes vos tâches (à l\'exception de celles des défis) seront détruites de façon permanente et vous perdrez leur historique. Vous perdrez tout votre équipement, mais vous pourrez le racheter, y compris l\'équipement en édition limité et les objets mystères d\'abonnement que vous possédez déjà (vous aurez besoin d\'être de la classe correspondant à l\'équipement spécifique à une classe). Vous conserverez votre classe actuelle ainsi que vos familiers et montures. Vous voudrez peut-être utiliser l\'orbe de renaissance à la place, qui est une option plus sûre et conservera vos tâches et votre équipement.</string>
   <string name="delete_account">Supprimer le compte</string>
@@ -646,6 +655,7 @@
   <string name="change_password">Changer le mot de passe</string>
   <string name="change_email">Changer votre adresse de courriel</string>
   <string name="change_login_name">Changer votre pseudo de connexion </string>
+  <string name="change_username">Changer son Nom d\'Utilisateur</string>
   <string name="change">Changer</string>
   <string name="character_level">Niveau du personnage</string>
   <string name="auto_allocate_points">Attribuer automatiquement les points</string>
@@ -667,4 +677,124 @@
   <string name="distribute_task">Répartir suivant l\'activité des tâches</string>
   <string name="no_points_to_allocate">Aucun point à répartir</string>
   <string name="points_to_allocate" formatted="false">%d points à répartir</string>
+  <string name="distribute_evenly_help">Assigner le même nombre de point à chaque attribut.</string>
+  <string name="distribute_class_help">Assigner plus de points aux attributs importants pour votre classe.</string>
+  <string name="distribute_task_help">Assigner les points en fonction des catégories de force, intelligence, constitution et perception associées aux tâches que vous réalisez.</string>
+  <string name="allocating_points">Allocation des points</string>
+  <string name="class_equipment">Équipement</string>
+  <string name="equipment_empty">Vous avez déjà tout l\'équipement ! D\'autre objets seront disponibles pendant les Grand Galas, lors des solstices et des équinoxes.</string>
+  <string name="classless">Sans classe</string>
+  <string name="class_equipment_shop_dialog">Cet objet n\'est disponible que pour une classe spécifique.\nVous pouvez changer de classe depuis les paramètres.</string>
+  <string name="class_gear_disclaimer">Vous ne pouvez acheter de l\'équipement que pour votre classe actuelle</string>
+  <string name="available_stats" formatted="false">%d points</string>
+  <string name="toogle_emojis">Activer les émojis</string>
+  <string name="tavern_description">Bienvenu à l\'auberge ! Prenez une chaise pour vous joindre à la conversation, ou faite une pause de vos tâches.</string>
+  <string name="check_into_inn">Se reposer à l\'auberge</string>
+  <string name="community_guidelines">Règles de vie en communauté</string>
+  <string name="view_community_guidelines">Voir les règles de vie en communauté</string>
+  <string name="guidelines_description">Habitica essaye de créer un environnement bienveillant pour les personnes de tout âge et de toute origine qui y participent, en particulier dans les espaces publics comme la taverne. Si vous avez une question, veuillez consulter nos règles.</string>
+  <string name="helpful_links">Liens utiles</string>
+  <string name="view_faq">Voir la FAQ</string>
+  <string name="report_bug">Rapporter un bug</string>
+  <string name="player_tiers">Paliers de contribution</string>
+  <string name="staff_moderators">Équipe d\'administration</string>
+  <string name="tiers_descriptions">Les pseudos de couleur que vous pouvez voir dans les discussion représentent le palier de contribution d\'une personne. Plus le palier est élevé, plus la personne a contribué à Habitica avec de l\'art, du code, du temps ou plus !</string>
+  <string name="navigation_drawer_open">Ouvrir le volet de navigation</string>
+  <string name="navigation_drawer_close">Fermer le volet de navigation</string>
+  <string name="world_boss">Boss mondial</string>
+  <string name="world_boss_art">Représentation du boss</string>
+  <string name="boss_art">Représentation du boss</string>
+  <string name="world_boss_description">Description du boss mondial</string>
+  <string name="rage_strike_count" formatted="false">Attaques de rage : %d/%d</string>
+  <string name="pending_strike_description">Cette attaque n\'a pas encore eu lieu !\nLe boss mondial se déchaînera et attaquera un de nos bons commerçants lorsque sa jauge de rage sera remplie. Restez à jour avec vos quotidiennes pour empêcher que cela se produise !</string>
+  <string name="pending_strike_title">Attaque en cours</string>
+  <string name="strike_description_title">Qu\'est-ce qu\'une attaque de rage ?</string>
+  <string name="strike_description_subtitle">Il y a potentiellement 3 attaques de rage</string>
+  <string name="strike_description_description">La jauge se remplit lorsque quelqu\'un rate ses quotidiennes. Si la jauge est pleine, la Décœurageante lancera son attaque Coup de cœur fracassant sur un des commerçants d\'Habitica, alors faites attention à bien réaliser vos tâches !</string>
+  <string name="pending_strike_subtitle">Cette attaque n\'a pas encore eu lieu !</string>
+  <string name="strike_active_title" formatted="false">%s a été attaqué !</string>
+  <string name="strike_active_subtitle" formatted="false">%s a reçu un coup de cœur !</string>
+  <string name="strike_active_description" formatted="false">Notre %s a eu le cœur brisé lorsque %s a fracassé %s. Vite, réalisez vos quotidiennes pour vaincre le monstre et aider à reconstruire !!</string>
+  <string name="questShop">Magasin de quêtes</string>
+  <string name="market_owner_long">Alex le marchand</string>
+  <string name="tavern_owner_long">Daniel l\'aubergiste</string>
+  <string name="stable_owner_long">Matt le maître des bêtes</string>
+  <string name="hide_boss_art">Cacher l\'image du boss</string>
+  <string name="active_world_boss">Boss mondial actif</string>
+  <string name="no_party_description">Partez en quête avec des amis ou en solitaire. combattez des monstres, créez des défis et rendez vous responsable dans une équipe.</string>
+  <string name="no_party_title">Jouer à Habitica dans une équipe</string>
+  <string name="join_party_description">Donnez le nom d\'utilisateur ci-dessous à un membre de l\'équipe pour pouvoir recevoir l\'invitation</string>
+  <string name="join_party_description_id">Donnez leur votre identifiant utilisateur ou faites leur scanner votre QR code pour vous inviter</string>
+  <string name="join_party_title">Vous voulez rejoindre une équipe ?</string>
+  <string name="create_party_website">Ouvrir le site pour créer une équipe</string>
+  <string name="id_copied">ID copié dans le presse-papier</string>
+  <string name="insufficientSubscriberGems">Vous avez acheté toutes les gemmes possibles de ce mois. D\'autres seront disponibles dans les trois premiers jours de chaque mois. Merci pour votre abonnement !</string>
+  <string name="insufficientSubscriberGemsTitle">Limite de gemmes mensuelle atteinte</string>
+  <string name="chat_message">Discussion</string>
+  <string name="world_boss_description_title">Qu\'est-ce qu\'un boss mondial ?</string>
+  <string name="world_boss_description_description">Un boss mondial est un événement spécial où toute la communauté travaille ensemble pour combattre avec ses tâches un puissant monstre !\nRéalisez vos tâches pour infliger des dégâts au boss.\nLe boss ne vous infligera pas de dégâts pour les tâches non réalisées, mais sa jauge de rage augmentera. Lorsque la barre se remplit, le boss attaquera l\'un des marchands !\nVous pouvez continuer à faire vos quêtes de boss habituelles, vos dégâts s\'appliqueront aux deux.\nVisitez la taverne pour voir l\'avancée du combat et la jauge de rage.</string>
+  <string name="world_boss_description_intro">Un boss mondial est un événement spécial où toute la communauté travaille ensemble pour combattre avec ses tâches un puissant monstre !</string>
+  <string name="world_boss_description_1">Réalisez vos tâches pour infliger des dégâts au boss.</string>
+  <string name="world_boss_description_2">Le boss ne vous infligera pas de dégâts pour les tâches non réalisées, mais sa jauge de rage augmentera. Si la barre se remplit, le boss attaquera l\'un des marchands !</string>
+  <string name="world_boss_description_3">Vous pouvez continuer à faire vos quêtes de boss habituelles, vos dégâts s\'appliqueront aux deux.</string>
+  <string name="world_boss_description_4">Visitez la taverne pour voir l\'avancée du combat et la jauge de rage.</string>
+  <string name="world_boss_action_prompt" formatted="false">Combattez le boss pour obtenir une récompense spéciale et sauver Habitica de la terreur de %s !</string>
+  <string name="world_boss_description_subtitle">%s attaque !</string>
+  <string name="questShop_owner_long">Ian le guide des quêtes</string>
+  <string name="seasonalShop_owner_long">Sorcière saisonnière</string>
+  <string name="rage_attack">Attaque de rage :</string>
+  <string name="tavern_description_world_boss">Oh, ne faites pas attention au monstre ci-dessous -- c\'est toujours un endroit sûr pour discuter pendant vos pauses.</string>
+  <string name="report">Signaler</string>
+  <string name="like">Apprécier</string>
+  <string name="reply">Répondre</string>
+  <string name="challenge_prize">Récompense du défi</string>
+  <string name="challenge_categories">Catégories du défi</string>
+  <string name="created_challenge">Défi créé</string>
+  <string name="joined">Rejoint</string>
+  <string name="public_challenge">Défi publique</string>
+  <string name="short_name">Nom court</string>
+  <string name="unlock_attribute_points">L\'allocation de points d\'attributs se déverrouille au niveau 10</string>
+  <string name="same_day_reminder_title">Avez-vous déjà ajouté vos tâches ?</string>
+  <string name="same_day_reminder_text">Le plus vous en ajoutez, le plus vous aurez de récompenses. Même les petites habitudes mènent à de grands changements.</string>
+  <string name="next_day_reminder_title">Avez-vous validé vos tâches quotidiennes aujourd\'hui ?</string>
+  <string name="next_day_reminder_text">Il y a beaucoup à découvrir en gagnant des niveaux, alors continuez avec vos tâches et amusez-vous !</string>
+  <string name="daily_tip_0">Vous voulez essayer quelque chose de nouveau ? Rejoignez un défi pour augmenter votre liste de tâches et gagnez des gemmes !</string>
+  <string name="daily_tip_1">Ajoutez des listes de vérifications à vos taches à faire pour augmenter vos récompenses!</string>
+  <string name="daily_tip_2">Vous pouvez modifier la périodicité des tâches quotidiennes. Même les tâches les moins fréquentes peuvent être planifiées.</string>
+  <string name="daily_tip_3">Vous pouvez également planifier des rappels pour vos tâches quotidiennes.</string>
+  <string name="daily_tip_4">Refaire occasionnellement le point sur vos tâches vous aidera à rester sur le droit chemin.</string>
+  <string name="daily_tip_5">Respirez profondément pour vous aider à vous concentrer. Vous pouvez le faire !</string>
+  <string name="daily_tip_6">Réglez un chronomètre sur 10 minutes et regardez combien vous pouvez en faire dans ce temps !</string>
+  <string name="daily_tip_7">Essayez d\'épingler des objets depuis le marché dans vos récompenses pour vous aider à vous motiver à les obtenir !</string>
+  <string name="daily_tip_8">Vous pouvez changer la difficulté de votre tâche pour vous récompenser un peu plus pour les tâches difficiles !</string>
+  <string name="daily_tip_9">Si vous rencontrez des difficultés, essayez de diviser vos tâches en plus petites tâches.</string>
+  <string name="moderator">Modérateur</string>
+  <string name="staff">Administrateur</string>
+  <string name="expand_notes">Lire plus</string>
+  <string name="collapse_notes">Montrer moins</string>
+  <string name="reset_streak">Réinitialiser le combo</string>
+  <string name="week_reminder_title">Comment se passent vos tâches ?</string>
+  <string name="week_reminder_text">Les pauses sont bonnes pour la santé, mais vous pouvez toujours gagner des points pour les activités simples, afin de gagner des niveaux et recevoir de l\'équipement !</string>
+  <string name="last_login">Dernière connexion</string>
+  <string name="total_checkins">Total de connexions</string>
+  <string name="two_handed">Deux mains</string>
+  <string name="usernamePromptTitle">Il est temps de choisir votre nom d\'utilisateur !</string>
+  <string name="usernamePromptBody">Les noms de connexion sont maintenant uniques, seront visibles à côté de votre nom affiché, et seront utilisés pour les invitations, les @mentions et les discussions.</string>
+  <string name="usernamePromptWiki">Si vous souhaitez en savoir plus sur ce changement, <a href="https://habitica.wikia.com/wiki/Player_Names">visitez notre wiki.</a></string>
+  <string name="confirmUsername">Confirmer le Nom d\'Utilisateur</string>
+  <string name="usernamePromptDisclaimer">Les Noms d\'Utilisateurs doivent respecter nos <a href="https://habitica.com/static/terms">Conditions d\'Utilisation</a> et nos <a href="https://habitica.com/static/community-guidelines">règles de vie en communauté</a>. Si vous n\'avez pas choisi un pseudo de connexion précédemment, votre nom d\'utilisateur a été généré automatiquement.</string>
+  <string name="confirm_username_title">Êtes-vous sûr(e) de vouloir confirmer votre nom d\'utilisateur actuel ?</string>
+  <string name="confirm_username_description">Confirmer votre nom d\'utilisateur le rendra public pour les invitations, les @mentions et les messages. Vous pouvez changer votre nom d\'utilisateur depuis les paramètres à n\'importe quel moment.</string>
+  <string name="cancel">Annuler</string>
+  <string name="confirm_username">Confirmer le Nom d\'Utilisateur</string>
+  <string name="username_not_confirmed">Nom d\'Utilisateur non confirmé</string>
+  <string name="username_confirmed">Nom d\'utilisateur confirmé</string>
+  <string name="username_level">\@%s ・Niv %d</string>
+  <string name="enter_recipient_username">Entrez le nom d\'utilisateur du destinataire</string>
+  <string name="username_copied">Nom d\'utilisateur copié dans le presse papier</string>
+  <string name="verification_pet">Un de ces Familiers Vétérans vous attendra une fois la confirmation effectuée!</string>
+  <string name="welcomeNameTitle">Comment devrions-nous vous appeler?</string>
+  <string name="display_name_length_error">Les noms affichés doivent comporter entre 1 et 30 caractères</string>
+  <string name="setup_task_join_habitica">Rejoindre Habitica (Cochez-moi!)</string>
+  <string name="setup_task_join_habitica_notes">Vous pouvez réaliser cette tâche, l\'éditer ou la supprimer.</string>
 </resources>
diff --git a/Habitica/res/values-hr-rHR/strings.profile.xml b/Habitica/res/values-hr-rHR/strings.profile.xml
index 4a4cb755f..2c5685c8a 100644
--- a/Habitica/res/values-hr-rHR/strings.profile.xml
+++ b/Habitica/res/values-hr-rHR/strings.profile.xml
@@ -1,3 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    </resources>
+    <string name="profile_pets_and_mounts">Ljubimci &amp; Jahače životinje</string>
+    <string name="profile_pets_found">Ljubimaca pronađeno</string>
+    <string name="profile_mounts_tamed">jahačih životinja pripitomljeno</string>
+    <string name="profile_loading_data">Učitavanje podataka o članu...</string>
+    <string name="profile_send_message_to">Pošalji poruku %s</string>
+    <string name="profile_message_sent_to">Poruka poslana %s</string>
+    <string name="profile_level">Level:</string>
+    <string name="profile_class_bonus">Bonus klase</string>
+    <string name="profile_allocated">Raspodijeljeno:</string>
+    <string name="profile_boosts">Ojačanja:</string>
+    <string name="profile_private_message">Privatna poruka</string>
+    <string name="profile_achievements">Postignuća</string>
+    <string name="profile_achievement_ok">OK</string>
+    <string name="profile_qrcode_close">Zatvori</string>
+
+</resources>
diff --git a/Habitica/res/values-hr-rHR/strings.sidebar.xml b/Habitica/res/values-hr-rHR/strings.sidebar.xml
index 675bebe87..ef42b6fef 100644
--- a/Habitica/res/values-hr-rHR/strings.sidebar.xml
+++ b/Habitica/res/values-hr-rHR/strings.sidebar.xml
@@ -3,16 +3,19 @@
   <string name="sidebar.tasks">Zadaci</string>
   <string name="sidebar.skills">Vještine</string>
   <string name="sidebar.section.social">Društvo</string>
+  <string name="sidebar.inbox">Poruke</string>
   <string name="sidebar.tavern">Krčma</string>
-  <string name="sidebar.party">Partija</string>
-  <string name="sidebar.purchaseGems">Kupi dragulje</string>
-  <string name="sidebar.guilds">Udruge</string>
+  <string name="sidebar.party">Družina</string>
+  <string name="sidebar.purchaseGems">Dragulji &amp; Pretplata</string>
+  <string name="sidebar.guilds">Cehovi</string>
   <string name="sidebar.challenges">Izazovi</string>
   <string name="sidebar.section.inventory">Inventar</string>
   <string name="sidebar.avatar">Avatar</string>
   <string name="sidebar.equipment">Oprema</string>
-  <string name="sidebar.stable">Staja</string>
+  <string name="sidebar.stable">Štala</string>
   <string name="sidebar.news">Vijesti</string>
   <string name="sidebar.settings">Postavke</string>
   <string name="sidebar.about">O nama</string>
+  <string name="sidebar_shops">Dućani</string>
+  <string name="sidebar_stats">Statistika</string>
 </resources>
diff --git a/Habitica/res/values-hr-rHR/strings.tutorial.xml b/Habitica/res/values-hr-rHR/strings.tutorial.xml
index 7a37728b9..c27679da4 100644
--- a/Habitica/res/values-hr-rHR/strings.tutorial.xml
+++ b/Habitica/res/values-hr-rHR/strings.tutorial.xml
@@ -1,10 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_equipment">Kada kupiš opremu, pojavit će se ovdje. Tvoja Ratna oprema utječe na tvoje statistike, a tvoj kostim (ako je uključen) utječe na ono što tvoj avatar nosi.</string>
-  <string name="tutorial_items">Zaradi predmete izvršavanjem zadataka i prelaženjem na višu razinu. Klikni na predmet da ga iskoristiš!</string>
-  <string name="tutorial_pets">Kako izvršavaš zadatke u stvarnom svijetu, sada imaš nasumičnu šansu za pronalazak jaja i napitaka. Kombiniraj ih te izlegni ljubimce</string>
-  <string name="tutorial_skills">Vještine su posebne sposobnosti koje imaju jake učinke! Klikni na sposobnost kako bi ju iskoristio. Koštat će te mane (plava traka), koju zaradiš prijavljujući se svaki dan i izvršavajući svoje zadatke u stvarnom životu. Provjeri Često Postavljena Pitanja u meniju za više informacija!</string>
-  <string name="tutorial_party">Ovo je mjesto gdje se ti i tvoji prijatelji možete držati svojih ciljeva i boriti protiv čudovišta preko svojih zadataka!</string>
-  <string name="tutorial_tavern">Dobrodošao u Krčmu, javni, svegodišnji chat! Ovdje možeš razgovarati o produktivnosti i postavljati pitanja. Dobru zabavu!</string>
-  <string name="tutorial_classes">Izaberi hoćeš li poatati Ratnik, Čarobnjak, Iscjelitelj ili Odmetnik! Svaka klasa ima jedinstvenu opremu i vještine. Klikni na (?) i saznaj više!</string>
+  <string name="tutorial_overview">Eto nas! Ispunio sam nekoliko zadataka za tebe na osnovu tvojih interesa. Pokušaj dodati nekoliko vlastitih. Možeš urediti bilo koji zadatak klikom na njegov naziv.</string>
+  <string name="tutorial_habits_1">Prve na redu su Navike. To mogu biti pozitivne Navike koje želiš poboljšati ili loše Navike koje želiš prekinuti.</string>
+  <string name="tutorial_habits_2">Svaki put kad napraviš pozitivnu Naviku, klikni na + kako bi dobio/la iskustvo i zlatnike!</string>
+  <string name="tutorial_habits_3">Ako popustiš i napraviš lošu Naviku, klikom na - ćeš umanjiti zdravlje svog avatara i time pomoći sebi da ostaneš odgovoran/na.</string>
+  <string name="tutorial_habits_4">Pokušaj! Možeš istražiti druge vrste zadataka u navigaciji ispod.</string>
+  <string name="tutorial_dailies_1">Stvori Svakodnevne zadatke za one zadatke koji imaju rokove i koje trebaš izvršavati prema redovnom rasporedu.</string>
+  <string name="tutorial_dailies_2">Pripazi — ako propustiš jedan, tvoj avatar će podnijeti štetu preko noći. Ali njihovo dosljedno križanje s popisa donosi velike nagrade!</string>
+  <string name="tutorial_todos_1">Koristi Zadatke kako bi vodio/la računa o zadaćama koje trebaš obaviti samo jednom.</string>
+  <string name="tutorial_todos_2">Ako trebaš obaviti svoj Zadatak unutar određenog vremena, postavi rok. Izgleda da možeš jedan prekrižiti — samo naprijed!</string>
+  <string name="tutorial_rewards_1">Kupuj opremu za svoj avatar zlatnicima koje zaradiš!</string>
+  <string name="tutorial_rewards_2">Također možeš stvarati stvarne Prilagođene Nagrade na osnovu onog što te motivira.</string>
+  <string name="tutorial_tasks_complete">To je to za sada. Ako ti treba podsjetnik, pogledaj odjeljak Često postavljenih pitanja.</string>
+  <string name="tutorial_equipment">Kada kupiš opremu, pojavi se ovdje. Tvoja Ratna oprema utječe na tvoje statistike, a tvoj kostim (ako je omogućen) utječe na ono što tvoj avatar nosi.</string>
+  <string name="tutorial_items">Zaradi predmete izvršavanjem zadataka i podizanjem levela. Klikni na predmet da ga iskoristiš!</string>
+  <string name="tutorial_pets">Kako izvršavaš zadatke u stvarnom svijetu, tako imaš nasumičnu šansu za pronalazak jaja i napitaka. Kombiniraj ih kako bi izlegao/la ljubimce.</string>
+  <string name="tutorial_skills">Vještine su posebne sposobnosti koje imaju jake učinke! Klikni na sposobnost kako bi ju iskoristio/la. Koštat će te mane (plava traka), koju zaradiš prijavljujući se svaki dan i izvršavajući svoje zadatke u stvarnom životu. Provjeri Često Postavljena Pitanja u meniju za više informacija!</string>
+  <string name="tutorial_party">Ovo je mjesto gdje se ti i tvoji prijatelji možete držati svojih ciljeva i boriti protiv čudovišta pomoću svojih zadataka!</string>
+  <string name="tutorial_tavern">Dobrodošao/la u Krčmu, javni chat za ljude svih dobi! Ovdje možeš razgovarati o produktivnosti i postavljati pitanja. Zabavi se!</string>
+  <string name="tutorial_classes">OdmetnikOdmetnikIzaberi hoćeš li postati Ratnik, Čarobnjak, Iscjelitelj ili Lupež! Svaka klasa ima jedinstvenu opremu i vještine. Klikni na (?) da bi saznao/la više!</string>
+  <string name="tutorial_stats">Klikni na sivi gumb kako bi raspodijelio/la mnoštvo svojih statističkih bodova odjednom, ili klikni na strelice kako bi ih dodavao/la jednog po jednog.</string>
 </resources>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 9f2f7e4ab..4435f12d7 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -2,73 +2,112 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">Osvježi</string>
   <string name="XP_default">Iskustvo</string>
-  <string name="HP_default">Život</string>
+  <string name="HP_default">Zdravlje</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Opcije nisu mogle biti učitane bez barkoda</string>
+  <string name="ERR_pb_barcode">Opcije nisu mogle biti učitane iz barkoda</string>
   <!--Prefs-->
   <string name="PS_settings_title">Postavke</string>
-  <string name="SP_address_hint">Tvoj ručno namješteni server</string>
-  <string name="SP_userID_title">Korisnički ID</string>
+  <string name="SP_address_hint">Tvoj prilagođeni server</string>
+  <string name="SP_userID_title">Korisnikov ID</string>
   <string name="SP_userID_summary">Tvoj Korisnički ID</string>
-  <string name="SP_APIToken_title">API Token</string>
-  <string name="SP_APIToken_summary">Tvoj API Token</string>
+  <string name="SP_APIToken_title">SPA token</string>
+  <string name="SP_APIToken_summary">Tvoj SPA token</string>
+  <string name="Language_title">Jezik</string>
+  <string name="Language_summary">Promijeni jezik na Habitici</string>
+  <string name="SP_user_qr_code">Tvoj QR kod</string>
   <string name="PS_contact_title">Kontaktiraj me</string>
+  <string name="unknown_error">Došlo je do greške...</string>
   <string name="pref_account_header">Račun</string>
-  <string name="pref_reminder_header">Svakodnevni Podsjetnik</string>
-  <string name="pref_reminder_checkbox">Aktiviraj Podsjetnik</string>
-  <string name="pref_reminder_picker">Postavi Vrijeme Podsjetnika</string>
+  <string name="pref_first_day_of_the_week_title">Prvi dan u tjednu</string>
+  <string name="pref_first_day_of_the_week_summary">Prvi dan u tjednu u svim kalendarima</string>
+  <string name="pref_reminder_header">Dnevni podsjetnik</string>
+  <string name="pref_reminder_checkbox">Aktiviraj podsjetnik</string>
+  <string name="pref_reminder_picker">Postavi vrijeme podsjetnika</string>
+  <string name="pref_cds_header">Prilagođeni početak dana</string>
+  <string name="pref_cds_picker">Postavi vrijeme Prilagođenog početka dana</string>
+  <string name="pref_push_notifications_checkbox">Push notifikacije korisnika</string>
+  <string name="push_notifications">Push notifikacije</string>
+  <string name="push_notifications_sum">Uredi postavke svojih push notifikacija</string>
+  <string name="preference_push_you_won_challenge">Pobijedio/la si u Izazovu!</string>
+  <string name="preference_push_received_a_private_message">Primljena Privatna poruka</string>
+  <string name="preference_push_gifted_gems">Poklonjeni Dragulji</string>
+  <string name="preference_push_gifted_subscription">Poklonjena Pretplata</string>
+  <string name="preference_push_invited_to_party">Pozvan/a u Družinu</string>
+  <string name="preference_push_invited_to_guild">Pozvan/a u Ceh</string>
+  <string name="preference_push_your_quest_has_begun">Tvoja Pustolovina je započela</string>
+  <string name="preference_push_invited_to_quest">Pozvan/a na Pustolovinu</string>
   <!--Adding tasks-->
   <string name="task_value">Vrijednost</string>
+  <string name="new_todo">Novi Zadatak</string>
+  <string name="new_reward">Nova Nagrada</string>
+  <string name="new_daily">Novi Svakodnevni zadatak</string>
+  <string name="new_habit">Nova Navika</string>
   <string name="action_edit">Uredi</string>
   <string name="action_delete">Izbriši</string>
   <string name="action_cancel">Otkaži</string>
   <string name="login_btn">Prijavi se</string>
   <string name="register_btn">Registriraj se</string>
   <string name="username">Korisničko ime</string>
-  <string name="email_username">Email ili Korisničko ime</string>
+  <string name="email_username">E-mail ili Korisničko ime</string>
   <string name="password">Lozinka</string>
-  <string name="emailAddress">Email adresa</string>
+  <string name="emailAddress">E-mail adresa</string>
   <string name="confirmpassword">Potvrdi lozinku</string>
   <string name="logout">Odjavi se</string>
   <string name="logout_description">Odjavi se iz svog računa</string>
   <string name="account_details">Detalji o računu</string>
-  <string name="LoginActivityName">Dobrodošli</string>
+  <string name="LoginActivityName">Dobrodošao/la</string>
   <string name="string_revive">Oživi</string>
-  <string name="please_connect">Molimo spojite se kroz aplikaciju prije korištenja widgeta</string>
+  <string name="please_connect">Molimo te da se spojiš putem aplikacije prije korištenja widgeta</string>
   <string name="about.title">O nama</string>
   <string name="about.libraries">Knjižnice</string>
   <string name="about.versionhistory">Povijest verzija</string>
   <string name="about.habitica_open_source">Habitica je dostupna u obliku otvorenog izvora na Githubu</string>
   <string name="about.rate_our_app">Ocijeni našu Aplikaciju</string>
-  <string name="about.give_us_feedback">Pošalji nam povratnu informaciju</string>
+  <string name="about.give_us_feedback">Pošalji nam povratnu informaciju!</string>
   <string name="about.bugreport">Prijavi grešku</string>
-  <string name="about.source_code">Izvorni Kod</string>
+  <string name="about.source_code">Izvorni kod</string>
+  <string name="repeatEvery">Ponavljaj svaka/ih</string>
   <!--Network Errors-->
-  <string name="network_error_title">Greška u vezi</string>
-  <string name="network_error_no_network_body">Niste spojeni s Internetom</string>
-  <string name="internal_error_api">Čini se da postoji problem sa serverom. Pokušajte ponovno kasnije.</string>
-  <string name="authentication_error_title">Autentikacijska Greška</string>
-  <string name="authentication_error_body">Tvoje Korisničko ime i/ili Lozinku nisu točni.</string>
-  <string name="login_validation_error_title">Greška u potvrdi</string>
-  <string name="login_validation_error_fieldsmissing">Morate ispuniti sva polja</string>
+  <string name="network_error_title">Greška u povezivanju</string>
+  <string name="network_error_no_network_body">Niste spojeni na Internet.</string>
+  <string name="internal_error_api">Čini se da postoji problem sa serverom. Pokušaj ponovno kasnije.</string>
+  <string name="authentication_error_title">Greška u provjeri autentičnosti</string>
+  <string name="authentication_error_body">Tvoje Korisničko ime i/ili Lozinku nisu ispravni.</string>
+  <string name="login_validation_error_title">Greška provjere valjanosti</string>
+  <string name="login_validation_error_fieldsmissing">Morate ispuniti sva polja.</string>
   <string name="save_changes">Spremi</string>
+  <string name="copy">Kopiraj</string>
   <string name="notes">Bilješke</string>
   <string name="text">Tekst</string>
   <string name="difficulty">Težina</string>
   <string name="tags">Oznake</string>
   <string name="trivial">Jako lagano</string>
   <string name="easy">Lagano</string>
-  <string name="medium">Srednje</string>
+  <string name="medium">Srednje teško</string>
   <string name="hard">Teško</string>
-  <string name="start_date">Početni Datum</string>
+  <string name="start_date">Datum početka</string>
   <string name="positive_habit_form">Pozitivno ( + )</string>
   <string name="negative_habit_form">Negativno ( - )</string>
-  <string name="checklist">Spisak</string>
-  <string name="actions">Akcije</string>
+  <string name="checklist">Lista</string>
+  <string name="reminders">Podsjetnici</string>
+  <string name="actions">Radnje</string>
   <string name="attributes">Atributi</string>
+  <string name="physical">Snaga</string>
+  <string name="mental">Inteligencija</string>
+  <string name="social">Konstitucija</string>
+  <string name="other">Percepcija</string>
   <string name="frequency">Učestalost</string>
-  <string name="frequency_weekly">Na Određene dane u tjednu</string>
+  <string name="frequency_weekly">Na određene dane u tjednu</string>
   <string name="frequency_daily">Svakih X dana</string>
+  <string name="repeatables_summary_title">Sažetak</string>
+  <string name="repeatables_title">Ponavlja se</string>
+  <string name="repeatables_on_title">Ponavlja se na</string>
+  <string name="repeatables_frequency_daily">Dnevno</string>
+  <string name="repeatables_frequency_weekly">Tjedno</string>
+  <string name="repeatables_frequency_monthly">Mjesečno</string>
+  <string name="repeatables_frequency_yearly">Godišnje</string>
+  <string name="repeatables_frequency_day_of_month">Dan u mjesecu</string>
+  <string name="repeatables_frequency_day_of_week">Dan u tjednu</string>
   <string name="monday">Ponedjeljak</string>
   <string name="tuesday">Utorak</string>
   <string name="wednesday">Srijeda</string>
@@ -76,54 +115,56 @@
   <string name="friday">Petak</string>
   <string name="saturday">Subota</string>
   <string name="sunday">Nedjelja</string>
-  <string name="levelup_header">Prešao/la si na višu razinu!</string>
-  <string name="levelup_detail">Postizajući svoje ciljeve, došao/la si na razinu %1$d!</string>
-  <string name="levelup_health">Izliječen/a si!</string>
   <string name="levelup_button">Hura!</string>
   <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_penalty_body">Izgubio/la si level, svoje Zlatnike i komad opreme, ali ih možeš vratiti marljivim radom! Sretno - ići će te sjajno.</string>
+  <string name="faint_header">Ostao/la si bez Zdravlja!</string>
+  <string name="faint_button">Obnovi Zdravlje &amp; Pokušaj ponovno
+ 
+ </string>
   <string name="filter">Filtriraj</string>
-  <string name="profile_image">Profilna Slika</string>
+  <string name="profile_image">Profilna slika</string>
   <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Iskoristio si %1$s za %2$d mane.</string>
-  <string name="new_checklist_item">Novi predmet na spisku</string>
+  <string name="used_skill">Upotrijebio/la si %1$s za %2$d mane.</string>
+  <string name="used_skill_without_mana">Upotrijebio/la si %1$s.</string>
+  <string name="new_checklist_item">Nova stavka na listi</string>
   <string name="add_checklist_item">Dodaj</string>
-  <string name="reminder_title">Sjeti se označiti Dailiese</string>
-  <string name="skill_progress_title">Koristeći Vještinu</string>
-  <string name="coming_soon">Dolazi Uskoro</string>
-  <string name="chat_flag_confirmation">Jeste li sigurni da želite prijaviti ovu poruku kao neprikladnu?</string>
-  <string name="flag_confirm">Označi Poruku</string>
-  <string name="unlock_lvl_11">Otključano na razini 11</string>
-  <string name="no_party_message">Nisi u grupi. Za pridruživanje grupi, posjetite stranicu.</string>
-  <string name="forgot_pw_btn">Zaboravili Lozinku</string>
-  <string name="tavern.inn.checkOut">Reaktiviraj svoje Dailies-e</string>
-  <string name="tavern.inn.rest">Pauziraj svoje Dailies-e</string>
+  <string name="reminder_title">Ne zaboravi prekrižiti svoje zadatke</string>
+  <string name="skill_progress_title">Koristi Vještinu</string>
+  <string name="coming_soon">Dolazi uskoro</string>
+  <string name="chat_flag_confirmation">Jesi li sugran/na da želiš prijaviti ovu poruku kao neprikladnu?</string>
+  <string name="flag_confirm">Označi poruku zastavom</string>
+  <string name="unlock_lvl_11">Otključava se na levelu 11</string>
+  <string name="no_party_message">Nisi u Družini. Kako bi se pridružio/la nekoj družini, podsjeti našu web stranicu.</string>
+  <string name="forgot_pw_btn">Zaboravio/la sam lozinku</string>
+  <string name="tavern.inn.checkOut">Reaktiviraj svoje Svakodnevne zadatke</string>
+  <string name="tavern.inn.rest">Pauziraj svoje Svakodnevne zadatke</string>
   <string name="reward.dialog.buy">Kupi</string>
   <string name="reward.dialog.dismiss">Zanemari</string>
-  <string name="party">Partija</string>
+  <string name="party">Družina</string>
   <string name="chat">Chat</string>
   <string name="members">Članovi</string>
   <string name="habits">Navike</string>
-  <string name="dailies">Dailies</string>
+  <string name="dailies">Svakodnevni zadaci</string>
+  <string name="todos">Zadaci</string>
   <string name="rewards">Nagrade </string>
-  <string name="taskform.delete.title">Jeste li sigurni?</string>
-  <string name="taskform.delete.message">Želite li stvarno izbrisati?</string>
+  <string name="taskform.delete.title">Jesi li siguran/na?</string>
+  <string name="taskform.delete.message">Želite li ovo stvarno izbrisati?</string>
   <string name="yes">Da</string>
   <string name="no">Ne</string>
-  <string name="quest">Pothvat</string>
+  <string name="quest">Pustolovina</string>
   <string name="avatar_body">Tijelo</string>
   <string name="avatar_hair">Kosa</string>
   <string name="avatar_shirt">Majica</string>
   <string name="avatar_skin">Koža</string>
-  <string name="avatar_ears">Životinjske Uši</string>
+  <string name="avatar_ears">Životinjske uši</string>
   <string name="avatar_base">Baza</string>
   <string name="avatar_color">Boja</string>
   <string name="avatar_beard">Brada</string>
   <string name="avatar_mustache">Brkovi</string>
   <string name="avatar_flower">Cvijet</string>
   <string name="avatar_bangs">Šiške</string>
-  <string name="avatar_nothing">Ništa</string>
+  <string name="avatar_nothing">Ništa nije postavljeno</string>
   <string name="avatar_size">Veličina</string>
   <string name="avatar_size_slim">Vitko</string>
   <string name="avatar_size_broad">Široko</string>
@@ -132,13 +173,13 @@
   <string name="purchase_set_button">Otključaj set za %d dragulja</string>
   <string name="purchase_button">Kupi</string>
   <string name="purchase_set_title">Kupi set %s</string>
-  <string name="due_date">Do Dana</string>
+  <string name="due_date">Rok</string>
   <string name="quest.accept">Prihvati </string>
   <string name="quest.reject">Odbij</string>
-  <string name="quest.begin">Započni Pothvat</string>
-  <string name="quest.cancel">Otkaži Pozivnicu</string>
-  <string name="quest.abort">Otkaži Pothvat</string>
-  <string name="quest.leave">Otkaži Pothvat</string>
+  <string name="quest.begin">Započni Pustolovinu</string>
+  <string name="quest.cancel">Otkaži Poziv</string>
+  <string name="quest.abort">Otkaži Pustolovinu</string>
+  <string name="quest.leave">Napusti Pustolovinu</string>
   <string name="quest.pending">Čeka se</string>
   <string name="quest.accepted">Prihvaćeno</string>
   <string name="quest.rejected">Odbijeno</string>
@@ -147,62 +188,77 @@
   <string name="sidebar_help">Pomoć &amp; Često Postavljena Pitanja</string>
   <string name="complete_tutorial">Razumijem!</string>
   <string name="dismiss_tutorial">Podsjeti me ponovno</string>
-  <string name="intro_3_description">Drži svoje ciljeve na stazi uz pomoć prijatelja. Podržavajte se u bitci i životu te tako napredujte zajedno!</string>
+  <string name="intro_1_subtitle">Dobrodošao/la na</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Vrijeme je za zabavljati se dok obavljaš stvari! Pridruži se preko %s ljudi koji poboljšavaju svoj život jednim po jednim zadatkom.</string>
+  <string name="intro_2_subtitle">Napredak u igri</string>
+  <string name="intro_2_title">Napredak u životu</string>
+  <string name="intro_2_description">Otključaj mogućnosti u igri obavljanjem zadataka u stvarnom životu. Zaradi ratnu opremu, ljubimce i još mnogo toga kao nagrade za postizanje svojih ciljeva.</string>
+  <string name="intro_3_subtitle">Bori se protiv čudovišta</string>
+  <string name="intro_3_title">Postani društven/a</string>
+  <string name="intro_3_description">Postiži svoje ciljeve prema planu uz pomoć prijatelja. Podržavajte se međusobno u životu kao u bitci i tako napredujte zajedno!</string>
+  <string name="intro_finish_button">Počnimo!</string>
   <string name="previous_button">Prijašnje</string>
-  <string name="next_button">Dalje</string>
+  <string name="next_button">Sljedeće</string>
   <string name="skip_button">Preskoči</string>
-  <string name="setup_welcome_description">Dobrodošli u Habiticu, gdje će napredak u igri poboljšati tvoj stvarni život! Kako postižeš ciljeve u stvarnom svijetu, otključat ćeš opremu, ljubimce, pothvate i više.</string>
-  <string name="setup_welcome_title">Dobrodošli </string>
+  <string name="setup_welcome_description">Dobrodošao/la u Habiticu, gdje će napredak u igri poboljšati tvoj stvarni život! Kako postižeš ciljeve u stvarnom svijetu, otključavat ćeš opremu, ljubimce, pustolovine i još mnogo toga.</string>
+  <string name="setup_welcome_title">Dobrodošao/la</string>
+  <string name="avatar_setup_description">Onda, kako bi htio/la izgledati? Ne boj se, ovo možeš mijenjati kasnije.</string>
+  <string name="task_setup_description">Odlično! Sad, na čemu želiiš raditi tijekom ovog putovanja?</string>
   <string name="setup_group_work">Posao</string>
-  <string name="setup_group_exercise">Vježbanje</string>
-  <string name="setup_group_school">Školu</string>
-  <string name="setup_group_teams">Timove </string>
-  <string name="setup_group_chores">Kućanske poslove</string>
+  <string name="setup_group_exercise">Tjelovježba</string>
+  <string name="setup_group_health">Zdravlje</string>
+  <string name="setup_group_school">Škola</string>
+  <string name="setup_group_teams">Timovi </string>
+  <string name="setup_group_chores">Sitni zadaci</string>
   <string name="setup_group_creativity">Kreativnost</string>
-  <string name="setup_task_work_1">Obradi email</string>
+  <string name="setup_task_work_1">Procesuiraj e-mail</string>
   <string name="setup_task_work_2">Najvažniji zadatak</string>
-  <string name="setup_task_work_3">Radni Projekt</string>
-  <string name="setup_task_exercise_1">10 min. cardio</string>
+  <string name="setup_task_work_3">Radni projekt</string>
+  <string name="setup_task_exercise_1">10 min. kardia</string>
   <string name="setup_task_exercise_2">Istezanje</string>
   <string name="setup_task_exercise_3">Namjesti raspored vježbanja </string>
   <string name="setup_task_healthWellness_1">Jedi zdravu / nezdravu hranu</string>
   <string name="setup_task_healthWellness_2">Očisti zube koncem</string>
-  <string name="setup_task_healthWellness_3">Provjeri raspored </string>
+  <string name="setup_task_healthWellness_3">Zakaži pregled</string>
   <string name="setup_task_school_1">Uči/Odugovlači</string>
-  <string name="setup_task_school_2">Napravi Zadaću</string>
-  <string name="setup_task_school_3">Završi zadatak za razred</string>
-  <string name="setup_task_teams_1">Prijavi se u tim</string>
-  <string name="setup_task_teams_2">Ažuriraj tim na statusu </string>
+  <string name="setup_task_school_2">Napiši domaću zadaću</string>
+  <string name="setup_task_school_3">Završi zadatak za školu</string>
+  <string name="setup_task_teams_1">Javi se timu</string>
+  <string name="setup_task_teams_2">Obavijesti tim o statusu</string>
   <string name="setup_task_teams_3">Završi timski projekt</string>
   <string name="setup_task_chores_1">10 minuta čišćenja</string>
-  <string name="setup_task_chores_2">Operi Suđe</string>
+  <string name="setup_task_chores_2">Operi posuđe</string>
   <string name="setup_task_chores_3">Organiziraj ormar</string>
-  <string name="setup_task_creativity_1">Uči majstora vještine</string>
+  <string name="setup_task_creativity_1">Uči od majstora vještine</string>
   <string name="setup_task_creativity_2">Radi na kreativnom projektu </string>
   <string name="setup_task_creativity_3">Završi kreativni projekt</string>
-  <string name="gem.purchase.support">Želiš nam pomoći u razvoju Habitice? Možeš podržati razvijače kupujući dragulje!\n\nDragulji ti dopuštaju da kupiš zabavne dodatke za svoj račun, uključujući: \n\n - Kul kostimebza svog avatara\n - Zakon pozadine\n - Zabavne pothvate koji te nagrade s jajima ljubimaca\n - Sposobnost da promijeniš klasu prije razine 100\n\nHvala ti puno za pomaganje da Habiticu učinimo najboljom što može biti. Tvoja potpora nam znači puno!</string>
+  <string name="gem.purchase.support">Želiš nam pomoći u održavanju Habitice? Možeš podržati razvojne programere kupujući dragulje!\n\nDragulji ti omogućuju kupovinu zabavnih dodataka za tvoj račun, uključujući: \n\n - Kul kostime za tvog avatara\n - Zakon pozadine\n - Zabavne pustolovine koje te nagrađuju jajima ljubimaca\n - Sposobnost da promijeniš klasu prije levela 100\n\nHvala ti puno što pomažeš da Habiticu učinimo najboljom što može biti. Tvoja potpora nam znači puno!</string>
   <string name="my_guilds">Moji Cehovi</string>
   <string name="public_guilds">Javni Cehovi</string>
   <string name="guild">Ceh</string>
-  <string name="leave">Otiđi</string>
+  <string name="leave">Napusti</string>
   <string name="join">Pridruži se</string>
   <string name="leader">Vođa</string>
   <string name="gems">Dragulji</string>
-  <string name="send_pm">Pošalji PM</string>
-  <string name="flag">Označi</string>
+  <string name="copy_as_todo">Kopiraj kao Zadatak</string>
+  <string name="send_pm">Pošalji privatnu poruku</string>
+  <string name="flag">Označi zastavom</string>
   <string name="delete">Izbriši</string>
   <string name="name">Ime</string>
   <string name="description">Opis</string>
+  <string name="add_tag">Dodaj novu oznaku</string>
   <string name="privacy">Privatnost </string>
-  <string name="write_message">Napiši Poruku</string>
+  <string name="write_message">Napiši poruku</string>
   <string name="post">Objavi</string>
-  <string name="todo_due">Do: %s</string>
-  <string name="daily_streak">Trenutni niz: %d</string>
-  <string name="todo_has_duedate">Zadatak ima Rok Do</string>
+  <string name="guild_search_hint">Pretraži cehove</string>
+  <string name="todo_due">Rok: %s</string>
+  <string name="daily_streak">trenutni niz: %d</string>
+  <string name="todo_has_duedate">Zadatak ima rok</string>
   <string name="battle_gear">Borbena Oprema</string>
   <string name="costume">Kostim</string>
   <string name="outfit_head">Glava</string>
-  <string name="outfit_headAccessory">Odjeća za glavu</string>
+  <string name="outfit_headAccessory">Dodatak za glavu</string>
   <string name="outfit_eyewear">Naočale</string>
   <string name="outfit_armor">Oklop </string>
   <string name="outfit_back">Natrag</string>
@@ -211,87 +267,536 @@
   <string name="outfit_weapon">Oružje</string>
   <string name="wear_costume">Nosi Kostim </string>
   <string name="equipped">Opremljeno</string>
-  <string name="quest_cancel_message">Jesi li siguran da želiš otkazati ovaj pothvat? Svi prihvati pozivnica će biti izgubljeni. Vlasnik pothvata će dobiti natrag svitak Pothvata</string>
-  <string name="quest.invitation">Pozivnica za Pothvat</string>
-    <string name="quest.invitation.text">Pozvani ste na sudjelovanje u pothvatu!</string>
-  <string name="ago_1day">Prije 1 dan</string>
-  <string name="ago_days">Prije %d dana </string>
-  <string name="ago_1Minute">Prije 1 minute </string>
-  <string name="ago_minutes">Prije %d minuta</string>
-  <string name="ago_hours">Prije %d sati</string>
-  <string name="ago_1hour">Prije 1 sat</string>
+  <string name="quest_cancel_message">Jesi li siguran/na da želiš otkazati ovu pustolovinu? Svi prihvaćeni pozivi će biti izgubljeni. Vlasnik pustolovine će zadržati pustolovni svitak u svom posjedu.</string>
+  <string name="quest.invitation">Poziv u Pustolovinu</string>
+  <string name="quest_begin_message">Jesi li siguran/na? Samo %1$d od ukupno %2$d članova tvoje družine se pridružilo ovoj pustolovini! Pustolovine počinju automatski kad su se svi igrači pridružili ili pak odbili poziv.</string>
+  <string name="quest.invitation.text">Pozvan/a si za sudjelovanje u pustolovini!</string>
+  <string name="ago_1day">Prije 1 d</string>
+  <string name="ago_days">Prije %d d</string>
+  <string name="ago_1Minute">Prije 1 m</string>
+  <string name="ago_minutes">Prije %d m</string>
+  <string name="ago_hours">Prije %d h</string>
+  <string name="ago_1hour">Prije 1 h</string>
   <string name="today">Danas</string>
   <string name="sidebar_items">Predmeti</string>
   <string name="eggs">Jaja</string>
-  <string name="hatching_potions">Napitci za jaja</string>
+  <string name="hatching_potions">Čarobni napitci za izlijeganje</string>
   <string name="food">Hrana</string>
-  <string name="quests">Pothvati </string>
+  <string name="quests">Pustolovine</string>
   <string name="pets">Ljubimci</string>
-  <string name="mounts">Životinje za jahanje</string>
-  <string name="armoireEquipment">Našao si komad rijetke Opreme u Ormaru: %s!! Zakon!</string>
-  <string name="armoireFood">Premećeš po Ormaru i nalaziš %1$s %2$s. Što to radi ovdje?</string>
-  <string name="armoireExp">Hrvaš se s Ormarom i zarađuješ iskustvo. Evo ti ovo!</string>
-  <string name="armoireNotesFull">Otvori Ormar za nasumično dobivanje Opreme, Iskustva ili hrane! Ostalo komada opreme: %d</string>
+  <string name="mounts">Jahače životinje</string>
+  <string name="armoireEquipment">Našao/la si komad rijetke Opreme u Ormaru: %s! Zakon!</string>
+  <string name="armoireFood">Pretražuješ po ormaru i nađeš %1$s %2$s. Što to radi tu?</string>
+  <string name="armoireExp">Hrvaš se s ormarom i dobivaš na iskustvu. Neka mu!</string>
+  <string name="armoireNotesFull">Otvori Ormar kako bi nasumično dobio/la posebnu Opremu, Iskustvo, ili hranu! Preostalo komada opreme: %d</string>
   <string name="armoireLastItem">Našao si zadnji komad rijetke Opreme u Začaranom Ormaru.</string>
-  <string name="armoireNotesEmpty">Ormar će dobiti novu opremu u prvom tjednu svakog mjeseca. Do tada, nastavi klikati za Iskustvo i Hranu!</string>
-  <string name="sell">Prodaj(%d Zlata) </string>
+  <string name="armoireNotesEmpty">Ormar će imati novu Opremu u prvom tjednu svakog mjeseca. Do tada, nastavi klikati za Iskustvo i Hranu!</string>
+  <string name="sell">Prodaj(%d Zlatnika) </string>
   <string name="hatch_with_potion">Izlegni s napitkom</string>
   <string name="feed_to_pet">Nahrani ljubimca</string>
   <string name="hatch_egg">Izlegni s jajetom</string>
-  <string name="invite_party">Pozovi grupu</string>
+  <string name="invite_party">Pozovi družinu</string>
   <string name="dialog_feeding">Nahrani %1$s %2$s s:</string>
   <string name="use_animal">Koristi</string>
   <string name="feed">Nahrani</string>
-  <string name="hatch_with">Izlegni ljubimca sa %s</string>
+  <string name="hatch_with">Izlegni ljubimca s %s</string>
   <string name="hatched_pet_title">%1$s %2$s se izlegao/la!</string>
+  <string name="evolved_pet_title">Pripitomio/la si %1$s %2$s, hajdemo jahati!</string>
   <string name="close">Zatvori</string>
   <string name="share">Podijeli</string>
   <string name="notification_pet_fed">Nahranio/la si svoju/ga %1$s %2$s!</string>
-  <string name="sectionpets">Bazni Ljubimci</string>
-  <string name="sectionpremiumPets">Ljubimci Čarobnog Napitka</string>
-  <string name="sectionquestPets">Ljubimci s Pothvata</string>
-  <string name="sectionspecialPets">Rijetki Ljubimci</string>
-  <string name="sectionmounts">Životinje za jahanje</string>
-  <string name="sectionpremiumMounts">Životinje za jahanje Čarobnog Napitka </string>
-  <string name="sectionquestMounts">Životinje za jahanje s Pothvata</string>
-  <string name="sectionspecialMounts">Rijetke Životinje za jahanje</string>
-  <string name="world_quest">Svjetski Pothvat</string>
-  <string name="inn_description">Odmori se u Krčmi da spriječiš prekonoćnu ozljedu od neizvršenih Dailies-a! (Napomena: ne sprječava od primanja ozljeda od Šefova.)</string>
+  <string name="notification_purchase">Kupio/la si %s</string>
+  <string name="notification_purchase_reward">Kupio/la si nagradu</string>
+  <string name="sectionpets">Standardni</string>
+  <string name="sectionpremiumPets">Čarobnih napitaka</string>
+  <string name="sectionquestPets">Pustolovni</string>
+  <string name="sectionspecialPets">Rijetki</string>
+  <string name="sectionmounts">Standardne</string>
+  <string name="sectionpremiumMounts">Čarobnih napitaka</string>
+  <string name="sectionquestMounts">Pustolovne</string>
+  <string name="sectionspecialMounts">Rijetke</string>
+  <string name="world_quest">Svjetska Pustolovina</string>
+  <string name="inn_description">Treba ti odmor? Prijavi se u Danijelovo Svratište kako bi pauzirao/la neke od težih mehaničkih aspekata igre:\n\n
+• Propušteni Svakodnevni zadaci ti neće nauditi\n
+• Zadacima se neće resetirati nizovi niti će im se pogoršati boja\n
+• Bosovi ti neće nauditi zbog propuštenih Svakodnevnih zadatakai\n
+• Šteta koju naneseš bosu i sakupljeni Pustolovni Predmeti će stati na čekanju dok se ne odjaviš</string>
   <string name="empty_items">Nemaš %s</string>
+  <string name="user_level">Lvl %d</string>
+  <string name="user_level_with_class">Lvl %1$d %2$s</string>
   <string name="warrior">Ratnik</string>
   <string name="rogue">Odmetnik</string>
   <string name="mage">Čarobnjak</string>
   <string name="healer">Iscjelitelj</string>
-  <string name="warrior_description">Ratnici postižu veće rezultate i bolje \"kritične udarce\", koji nasumično daju bonus Zlato, Iskustvo i šansu za dobivanje predmeta za obavljanje zadataka. Isto tako jače naštete Šefovima. Odaberi Ratnika ako te motiviraju nasumične nagrade u stilu jackpota ili ako želiš brže uništiti Šefove u Pothvatima!</string>
-  <string name="mage_description">Čarobnjaci uče brzo, dobivajući Iskustvo i Razine brže od ostalih klasa. Isto tako imaju više Mane za korištenje posebnih sposobnosti. Odaberi Čarobnjaka ako voliš taktičku igru ili ako te motivira brzo dobivanje Razina i otključavanje naprednih značajki!</string>
-  <string name="rogue_description">Odmetnici vole steći bogatstvo, dobivajući više Zlata nego svi drugi te su dobri u pronalaženju nasumičnih predmeta. Njihova jedinstvena sposobnost Potajnost dopušta im da izbjegnu posljedice propuštenih Dailiesi. Odaberi Odmetnika ako te motiviraju nagrade i Postignuća, dobivanje plijena i značaka!</string>
-  <string name="healer_description">Iscjelitelji se ističu u zaštiti protiv ozljeda te šire tu zaštitu na ostale. Propušteni Dailiesi i loše Navike ne ozljeđuju ih puno i imaju načine da vrate Zdravlje iz pogrešaka. Odaberi iscjelitelja ako voliš pomagati drugima u tvojoj Grupi ili ako te inspirira ideja varanja Smrti kroz naporan rad!</string>
+  <string name="warrior_description">Ratnici postižu više i k tome bolje \“kritične udarce\” koji nasumično donose dodatne Zlatnike, Iskustvo i veće šanse za dobivanje poklona prilikom izvršavanja zadatka. Također nanose veliku štetu u borbi protiv glavnih čudovišta. Igraj u ulozi Ratnika ako te motiviraju nagrade u stilu nepredvidivih dobitaka na jackpotu ili ako se želiš iskaliti na glavnim čudovištima!</string>
+  <string name="mage_description">Čarobnjaci brzo uče te dobivajući na Iskustvu i Levelima brže od ostalih klasa. Također dobivaju jako puno Mane za korištenje svojih posebnih vještina. Igraj ulogu Čarobnjaka ako uživaš u taktičkim igračim aspektima Habitice ili ako ti podizanje levela i otključavanje naprednih mogućnosti daje jaku motivaciju!</string>
+  <string name="rogue_description">Lupeži vole skupljati bogatstvo, dobivaju više Zlatnika od bilo koga drugog, a uz to su vještiji u nalaženju nasumičnih predmeta. Njihova znamenita sposobnost tajnovitosti daje im mogućnost da izbjegnu posljedice neispunjenih Svakodnevnih zadataka. Igraj Lupeža ako ti jaku motivaciju pružaju Nagrade i Postignuća i ako težiš za plijenom i značkama!</string>
+  <string name="healer_description">Liječnici su zaštićeni od štetnih utjecaja i pružaju zaštitu tebi i drugima. Propušteni svakodnevni zadaci i loše navike ih ne uznemiravaju u tolikoj mjeri jer znaju kako nadoknaditi izgubljeno zdravlje. Igraj kao Iscjelitelj ako želite pomagati drugima u grupi ili ako te motivira ideja varanja Smrti marljivim radom!</string>
   <string name="select_class">Odaberi Klasu</string>
-  <string name="opt_out_class">Isključi se</string>
-  <string name="opt_out_description">Ne želiš da te gnjave klase? Želiš odabrati kasnije? Isključi se - bit ćeš Ratnik bez posebnih sposobnosti. Možeš pročitati sve o sustavu klasa kasnije na wikiju i uključiti klase u bilo kojem trenutku.</string>
-  <string name="class_confirmation">Jeste li sigurni da želite biti %s?</string>
+  <string name="opt_out_class">Izaberi kasnije</string>
+  <string name="opt_out_description">Ne da ti se baviti klasama? Želiš odabrati kasnije? I možeš odabrati kasnije - do tad ćeš biti Ratnik bez posebnih vještina. Možeš čitati o klasnom sustavu kasnije na wiki stranici Habitice i omogućiti klase bilo kada.</string>
+  <string name="class_confirmation">Jesi li siguran/na da želiš biti %s?</string>
+  <string name="class_changed">Sada si %s!</string>
+  <string name="class_changed_description">Imaš novu zadanu Ratnu Opremu koju možeš promijeniti pod Opremom!</string>
   <string name="choose_class">Odaberi Klasu </string>
   <string name="dialog_go_back">Idi natrag</string>
-  <string name="opt_out_confirmation">Jeste li sigurni da želite isključiti?</string>
+  <string name="opt_out_confirmation">Jesi li siguran/na da želiš izabrati kasnije?</string>
   <string name="change_class">Promijeni svoju klasu</string>
-  <string name="change_class_description">Promijeni svoju klasu i vrati svoje atributne bodove za 3 dragulja. Možeš dodijeliti atributne bodove na stranici.</string>
-  <string name="enable_class">Uključi Sustav Klasa</string>
+  <string name="change_class_description">Promijeni svoju klasu i vrati bodove statistike za 3 dragulja.</string>
+  <string name="enable_class">Omogući Sustav Klasa</string>
   <string name="changing_class_progress">Mijenjanje Klase</string>
-  <string name="by_email">Preko Emaila</string>
-  <string name="invite_existing_users">Pozovi Postojeće Korisnike</string>
+  <string name="by_email">Putem e-maila</string>
+  <string name="invite_existing_users">Pozovi postojeće korisnike</string>
   <string name="send">Pošalji</string>
-  <string name="invite">Pozovi Prijatelje</string>
-  <string name="invite_id_description">Ako imaš prijatelje koji već koriste Habiticu, pozovi ih preko Korisničkog ID-a ovdje.</string>
-  <string name="invite_email_description">Ako se prijatelj pridruži Habitici preko tvog emaila, automatski će biti pozvani u tvoju grupu!</string>
+  <string name="invite">Pozovi prijatelje</string>
+  <string name="invite_id_description">Ako već imaš prijatelje koji koriste Habiticu, pozovi ih preko Korisničkog ID-a ovdje.</string>
+  <string name="invite_username_description">Ako već imaš prijatelje koji koriste Habiticu, pozovi ih putem korisničkog imena ovdje.</string>
+  <string name="invite_email_description">Ako se tvoj prijatelj pridruži Habitici preko tvog e-maila, onda će automatski biti pozvani u tvoju družinu!</string>
   <string name="add_invites">Dodaj Pozivnice</string>
-  <string name="user_id">Korisnički ID</string>
-  <string name="email">Email</string>
-  <string name="invite_users">Pozovi u Grupu</string>
+  <string name="user_id">Korisnikov ID</string>
+  <string name="email">E-mail</string>
+  <string name="invite_users">Pozovi u Družinu</string>
   <string name="share_using">Podijeli koristeći</string>
-  <string name="share_hatched">Upravo sam izlegao %1$s %2$s ljubimca u Habitici izvršavajući svoje zadatke u stvarnom životu!</string>
-  <string name="share_raised">Upravo sam dobio %1$s %2$s životinju za jahanje u Habitici izvršavanjem svojih zadataka u stvarnom životu!</string>
-  <string name="open_in_store">Otvori u Trgovini Play</string>
-  <string name="change_class_confirmation">Jeste li sigurni da želite promijeniti svoju Klasu? Ovo će te koštati 3 dragulja.</string>
+  <string name="share_levelup">Došao/la sam do levela %d u Habitici poboljšavajući svoje navike u stvarnom životu! </string>
+  <string name="share_hatched">Upravo sam izlegao/la %1$s %2$s ljubimca u Habitici izvršavajući svoje zadatke u stvarnom životu!</string>
+  <string name="share_raised">Upravo sam dobio/la %1$s %2$s životinju za jahanje u Habitici izvršavanjem svojih zadataka u stvarnom životu!</string>
+  <string name="open_in_store">Otvori u Google Play trgovini</string>
+  <string name="change_class_confirmation">Jesi li siguran/na da želiš promijeniti svoju klasu? Ovo će te koštati 3 dragulja.</string>
+  <string name="change_class_equipment_warning">Upozorenje: više nećeš moći kupovati opremu iz klase %s.</string>
+  <string name="leaderMessage">Poruka od %1$s</string>
+  <string name="leaderName">Vođa: %1$s</string>
+  <string name="confirm">Potvrdi</string>
+  <string name="market">Tržnica</string>
+  <string name="timeTravelers">Vremenski putnici</string>
+  <string name="seasonalShop">Sezonski dućan</string>
+  <string name="empty_inbox">Nemaš novih poruka. Možeš poslati korisniku novu poruku iz njihovih javnih poruka u chatu!</string>
+  <string name="party_invite">Otključaj pozivanjem prijatelja</string>
+  <string name="login_incentive">Otključaj redovitim prijavljivanjem u Habiticu</string>
+  <string name="create_account">Otključaj stvaranjem računa</string>
+  <string name="no_gold">Nema dovoljno Zlatnika</string>
+  <string name="no_potion">Ne trebaš kupiti čarobni napitak za izlijeganje</string>
+  <string name="successful_purchase">Kupljen %1$s</string>
+  <string name="purchase_confirmation_title">Potvrdi kupnju</string>
+  <string name="confirm_purchase_text">Kupi %1$s za %2$s %3$s</string>
+  <string name="gem">dragulj</string>
+  <string name="hourglass">pješčani sat</string>
+  <string name="hourglasses">pješčanih satova</string>
+  <string name="gold_singular">zlatnik</string>
+  <string name="gold_plural">zlatnika</string>
+  <string name="chat_message_copied">Poruka je kopirana u međuspremnik</string>
+  <string name="copy_chat_message">Kopiraj u međuspremnik</string>
+  <string name="edit_tag_title">Uredi Oznaku</string>
+  <string name="edit_tag_btn_edit">Uredi</string>
+  <string name="edit_tag_btn_done">Gotovo</string>
+  <string name="edit_tag_btn_delete">Izbriši</string>
+  <string name="confirm_delete_tag_title">Jesi li siguran/na?</string>
+  <string name="confirm_delete_tag_message">Žiliš li ovo stvarno izbrisati?</string>
+  <string name="filter_drawer_edit_tags">Uredi Oznake</string>
+  <string name="filter_drawer_filter_tags">Filtriraj po oznakama</string>
   <!--QR Strings-->
+  <string name="qr_section_title">Neka te netko pozove s ovim QR kodom</string>
+  <string name="qr_save_message">QR kod spremljen na</string>
+  <string name="qr_dialogue_title">Tvoj QR kod</string>
+  <string name="download">Preuzmi</string>
+  <string name="send_new_message">Pošalji novu poruku</string>
+  <string name="choose_recipient_title">Odaberi primatelja poruke</string>
+  <string name="action_continue">Nastavi</string>
+  <string name="scan_qr_code">Skeniraj QR kod</string>
+  <string name="enter_recipient_uuid">Unesi Korisnički ID primatelja</string>
+  <string name="invited_to_party">Pozvan/a si pridružiti se družini!</string>
+  <string name="stats_widget_label">Statistike Habitice</string>
+  <string name="add_task">Dodaj Zadatak</string>
+  <string name="add_habit">Dodaj Naviku</string>
+  <string name="add_daily">Dodaj Svakodnevni zadatak</string>
+  <string name="add_todo">Dodaj Zadatak</string>
+  <string name="add_reward">Dodaj Nagradu</string>
+  <string name="all_dailies_completed">Izvršio/la si sve svoje svakodnevne zadatke. Bravo!</string>
+  <string name="widget_habit_button">Habitica Učvrsti Naviku</string>
+  <string name="widget_dailies">Habitica Svakodnevni zadaci</string>
+  <string name="widget_todo_list">Habitica Popis Zadataka</string>
+  <string name="widget_add_task">Habitica Dodaj Zadatak</string>
+  <string name="google_services_missing">Nije bilo moguće pronaći usluge Google Playa.</string>
+  <string name="gem.purchase.toolbartitle">Kupi</string>
+  <string name="gem.purchase.title">Kupovina Dragulja podržava razvojne programere i pomaže u održavanju Habitice</string>
+  <string name="gem.purchase.subtitle">Dragulji ti omogućuju kupovinu zabavnih dodataka za svoj račun, uključujući:</string>
+  <string name="gem.purchase.listitem1">Kul kostime za svog avatara</string>
+  <string name="gem.purchase.listitem2">Zakon pozadine</string>
+  <string name="gem.purchase.listitem3">Pustolovine koje te nagrađuju jajima ljubimaca</string>
+  <string name="gem.purchase.listitem4">Mogućnost promjene klase prije levela 100</string>
+  <string name="support_habitica">Podrži Habiticu</string>
+  <string name="skill_transformation_use">koristi</string>
+  <string name="hatching_market_info">Ne dobivaš prave poklone? Poviri u Tržnicu!</string>
+  <string name="feeding_market_info">Treba ti drukčija hrana? Kupi je još u tržnici!</string>
+  <string name="open_market">Otvori Tržnicu</string>
+  <string name="cds_description">Tvoji svakodnevni zadaci će se resetirati po prvom korištenju Habitice iza %1$s. Vodi računa da obaviš svoje svakodnevne zadatke prije toga!</string>
+  <string name="AudioTheme_title">Audio tema</string>
+  <string name="AudioTheme_summary">Promijeni audio temu Habitice</string>
   <!--Login Incentives-->
+  <string name="see_you_tomorrow">Vidimo se sutra!</string>
+  <string name="belongs_to_challenge">Pripada Izazovu</string>
+  <string name="has_reminder">Ima podsjetnik</string>
+  <string name="has_tag">Ima oznaku</string>
+  <string name="subscribe.title">Pretplatama se podržavaju razvojni programeri i pomaže se u održavanju Habitice</string>
+  <string name="subscribe_prompt">Postani pretplatnik i dobit ćeš ove korisne prednosti:</string>
+  <string name="subscribe.listitem1">Kupovinu dragulja zlatnicima</string>
+  <string name="subscribe.listitem2">Ekskluzivne mjesečne predmete</string>
+  <string name="subscribe.listitem3">Zadržavanje dodatne povijesti unosa</string>
+  <string name="subscribe.listitem4">Udvostručen dnevni limit poklona</string>
+  <string name="subscriptions">Pretplate</string>
+  <string name="subscription_duration">Ponavlja se svaku %s</string>
+  <string name="subscribe">Pretplati se</string>
+  <string name="subscribe.listitem1.description">Trgovac Aleksandar će ti sada prodavati dragulje po cijeni od 20 zlatnika po dragulju!\n\nNjegove mjesečne pošiljke su ispočetka ograničene na 25 Dragulja po mjesecu, ali se ovaj broj može povećati na osnovu duljine tvoje pretplate.\n\nLimit se povećava za 5 Dragulja za svaka tri mjeseca uzastopne pretplate i tako sve do maksimuma od 50 Dragulja po mjesecu!</string>
+  <string name="subscribe.listitem2.description">Svaki mjesec ćeš dobiti jedinstveni kozmetički predmet za svog avatara!n\nUz to, za svaka tri mjeseca uzastopne pretplate, Mistični Vremenski Putnici će ti dozvoliti pristup povijesnim (i futurističkim) kozmetičkim predmetima.</string>
+  <string name="subscribe.listitem3.description">Čini izvršene Zadatke i povijest zadataka duže dostupnima.</string>
+  <string name="subscribe.listitem4.description">Udvostručeni limit poklona će ti omogućiti da dobivaš više predmeta za zadatke koje izvršiš svaki dan, što će ti pomoći upotpuniti tvoju štalu prije!</string>
+  <string name="subscribe1month.gemcap">Limit poklona počinje od 25</string>
+  <string name="subscribe3month.gemcap">Limit poklona je povišen na 30</string>
+  <string name="subscribe6month.gemcap">Limit poklona je povišen na 35</string>
+  <string name="subscribe12month.gemcap">Limit poklona je povišen na 45</string>
+  <string name="subscription_hourglasses">+%d Mistični Pješčani sat</string>
+  <string name="payment_method">Način plaćanja</string>
+  <string name="subscription">Pretplata</string>
+  <string name="active">Aktivno</string>
+  <string name="cancel_subscription">Otkaži pretplatu</string>
+  <string name="cancel_subscription_google.description">Više ne želiš biti pretplaćen/a? Možeš pronaći opciju za otkazivanje pretplate u sekciji \"Moje aplikacije\" Google Play trgovine.</string>
+  <string name="cancel_subscription_notgoogle.description">Više ne želiš biti pretplaćen/a? Zbog tvog odabranog načina plaćanja, možeš otkazati pretplatu samo na našoj web stranici. Klikni na gumb ispod za otvoriti stranicu u svom pregledniku!</string>
+  <string name="visit_habitica_website">Posjeti web stranicu Habitice</string>
+  <string name="current_bonuses">Trenutni broj bonusa</string>
+  <string name="months_subscribed">Broj mjeseci pretplate</string>
+  <string name="current_hourclasses">Trenutni broj Mističnih pješčanih satova</string>
+  <string name="monthly_gem_cap">Mjesečni limit dragulja</string>
+  <string name="inactive">Neaktivno</string>
+  <string name="one_month">1 mjesec</string>
+  <string name="months">%d mjeseci</string>
+  <string name="month">mjesec</string>
+  <string name="three_months">3 mjeseca</string>
+  <string name="six_months">6 mjeseci</string>
+  <string name="twelve_months">12 mjeseci</string>
+  <string name="subscribe_prompt_thanks">Za Pretplatu dobivaš ove korisne prednosti:</string>
+  <string name="subscription_status">Status Pretplate</string>
+  <string name="byLeader">za %s</string>
+  <string name="challenge_details">Detalji Izazova</string>
+  <string name="challenge_leave_title">Napusti Izazov</string>
+  <string name="challenge_leave_text">Jesi li siguran/na da želiš napustiti Izazov \"%s\"?</string>
+  <string name="challenge_remove_tasks_title">Ukloni zadatke</string>
+  <string name="challenge_remove_tasks_text">Želiš li ukloniti zadatke?</string>
+  <string name="remove_tasks">Ukloni</string>
+  <string name="keep_tasks">Zadrži</string>
+  <string name="my_challenges">Moji Izazovi</string>
+  <string name="public_challenges">Javni</string>
+  <string name="challenges">Zadaci</string>
+  <string name="daily">Svakodnevni zadatak</string>
+  <string name="habit">Navika</string>
+  <string name="reward">Nagrada</string>
+  <string name="todo">Zadatak</string>
+  <string name="official">Službeni</string>
+  <string name="participating">U kojima sudjeluješ</string>
+  <string name="challenge">U sklopu Izazova</string>
+  <string name="go_to_challenge">Idi do Izazova</string>
+  <string name="not_part_of_a_challenge">Ne sudjeluješ u nijednom Izazovu trenutno!</string>
+  <string name="join_a_challenge">Pridruži se Izazovu kako bi dodao/la uređen niz izazova tvom popisu i onda se natječi protiv drugih Habitičana kako bi osvojio/la postignuća pa čak i dragulje!</string>
+  <string name="check_the_public_challenge_tab">Klikni na karticu \"Javni\" kako bi pronašao/la Zadatke kreirane od strane drugih korisnika koji ti najbolje odgovaraju!</string>
+  <string name="add_reminder">Dodaj Podsjetnik</string>
+  <string name="warning">Upozorenje</string>
+  <string name="open_settings">Otvori Postavke</string>
+  <string name="dont_keep_activities_warning">Izgleda da ti je opcija Razvojnih programera \“Nemoj zadržati aktivnosti\” aktivna. Ova opcija trenutno uzrokuje probleme s aplikacijom Habitice pa preporučamo da je deaktiviraš.</string>
+  <string name="inbox">Poruke</string>
+  <string name="FAQ">Često postavljena pitanja</string>
+  <string name="special">Posebni</string>
+  <string name="gem_for_gold_description">Jer si se pretplatio/la na Habiticu, svaki mjesec možeš kupiti određen broj Dragulja u zamjenu za Zlatnike.</string>
+  <string name="limited_count">%d preostalo</string>
+  <string name="gem_shop">Dragulj</string>
+  <string name="mystery_item">Tajni artikal</string>
+  <string name="myster_item_notes">Pretplatnici će svaki mjesec dobiti tajni artikal, obično jedan tjedan prije kraja mjeseca.</string>
+  <string name="open">Otvori</string>
+  <string name="notification_mystery_item">Otvoriš kutiju i nađeš %s!</string>
+  <string name="checkInRewardEarned">Dobio/la si %1$s kao nagradu za tvoju predanost poboljšanju svog života.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Sljedeću nagradu dobivaš za %1$d prijava.</string>
+  <string name="pending_approval">čeka odobrenje</string>
+  <string name="filters">Filteri</string>
+  <string name="done">Gotovo</string>
+  <string name="group_tasks_edit_description">Grupni zadaci se ne mogu uređivati.</string>
+  <string name="group_tasks_edit_title">Nije moguće urediti ovaj zadatak.</string>
+  <string name="groups">Grupe</string>
+  <string name="all">Sve</string>
+  <string name="none">Nijedna</string>
+  <string name="owned">Posjeduješ</string>
+  <string name="not_owned">Ne posjeduješ</string>
+  <string name="new_game">Nova\nigra</string>
+  <string name="login_btn_fb">Prijavi se putem Facebook profila</string>
+  <string name="login_btn_google">Prijavi se preko Google računa</string>
+  <string name="action_back">Natrag</string>
+  <string name="welcome_text">Bok! Vjerojatno si nov/a ovdje. Ja sam Justin i bit ću tvoj vodič po Habitici.\n\nZa početak, kako da te zovemo? Slobodno promijeni ono što sam ja odabrao. Kad si spreman/na, hajdemo napraviti tvog avatara!</string>
+  <string name="randomize">Nasumce</string>
+  <string name="avatar_extras">Dodaci</string>
+  <string name="avatar_skin_color">Boja kože</string>
+  <string name="avatar_hair_color">Boja kose</string>
+  <string name="avatar_hair_bangs">Šiške</string>
+  <string name="avatar_hair_ponytail">Rep</string>
+  <string name="avatar_glasses">Naočale</string>
+  <string name="avatar_wheelchair">Invalidska kolica</string>
+  <string name="weak">Slabe</string>
+  <string name="strong">Jake</string>
+  <string name="gray">Sivi</string>
+  <string name="dated">Zakazano</string>
+  <string name="completed">Izvršeni</string>
+  <string name="setuP_group_other">Ostali</string>
+  <string name="clear">Očisti </string>
+  <string name="empty_title_habits">Nemaš Navika</string>
+  <string name="empty_description_habits">Navike su zadaci koji nemaju strogi raspored. Možeš ih označiti više puta na dan ili nijednom.</string>
+  <string name="empty_title_dailies">Nemaš Svakodnevnih zadataka</string>
+  <string name="empty_description_dailies">Svakodnevni zadaci su zadaci koji se ponavljaju na redovnoj bazi. Odaberi raspored koji za tebe najbolje funkcionira!</string>
+  <string name="empty_title_todos">Nemaš Zadataka</string>
+  <string name="empty_description_todos">Zadaci su obveze koje se trebaju samo jednom izvršiti. Dodaj liste za provjeru svojim Zadacima kako bi im povećao/la vrijednost.</string>
+  <string name="empty_title_rewards">Nemaš Nagrada</string>
+  <string name="reset_walkthrough">Resetiraj Justinovo vodstvo</string>
+  <string name="read_community_guidelines">Molimo te da pročitaš naše Smjernice za zajednicu prije objavljivanja poruka</string>
+  <string name="maintenance">Održavanje sustava</string>
+  <string name="reload_content">Ponovno učitaj sadržaj</string>
+  <string name="dailyDueDefaultView">Automatski stavljaj Svakodnevne zadatke pod karticu \"Neizvršeni\"</string>
+  <string name="dailyDueDefaultViewDescription">Kad je ova opcija odabrana, bit će prikazani svakodnevni zadaci koji su \"neizvršeni\" umjesto \"svi\".</string>
+  <string name="repeat_summary">Ponavlja se %1$s svaku %2$s %3$s %4$s</string>
+  <string name="no_billing_gems">Tvoj uređaj ne sadrži nijedan od podržanih načina plaćanja. Molimo te da odeš na web stranicu Habitice ako želiš kupiti dragulje.</string>
+  <string name="no_billing_subscriptions">Tvoj uređaj ne sadrži nijedan od podržanih načina plaćanja. Molimo te da odeš na web stranicu Habitice ako želiš kupiti pretplatu.</string>
+  <string name="save">Spremi</string>
+  <string name="location">Lokacija</string>
+  <string name="gem_reward">Nagrada Dragulja</string>
+  <string name="tasks">Zadaci</string>
+  <string name="create_challenge">Kreiraj Izazov</string>
+  <string name="edit_challenge">Uredi</string>
+  <string name="challenge_create_error_tavern_one_gem">Treba ti barem 1 dragulj kako bi kreirao/la javni izazov.</string>
+  <string name="challenge_create_error_enough_gems">Nemaš dovoljno dragulja za kreirati izazov.</string>
+  <string name="identify_your_challenge_with_a_tag">Identificiraj svoj izazov kratkim nazivom</string>
+  <string name="challenge_create_error_tag">Treba ti kratki naziv da bi kreirao/la ovaj Izazov.</string>
+  <string name="challenge_create_error_no_tasks">Trebaš dodati barem jedan zadatak kako bi kreirao/la ovaj Izazov.</string>
+  <string name="challenge_create_error_title">Treba bi naslov za kreiranje ovog Izazova.</string>
+  <string name="description_optional">Opis (neobavezno)</string>
+  <string name="new_challenge_title">Novi naslov izazova</string>
+  <string name="ownership">Vlasništvo</string>
+  <string name="inn">Svratište</string>
+  <string name="system">Sistem</string>
+  <string name="start_quest">Započni novu Pustolovinu</string>
+  <string name="leave_party">Napusti Družinu</string>
+  <string name="party_description">Opis Družine</string>
+  <string name="abort_confirmation">Jesi li siguran/na da želiš otkazati ovu pustolovinu? Ovo će je otkazati za sve u tvojoj družini i sav napredak će biti izgubljen. Pustolovni svitak će biti vraćen vlasniku pustolovine.</string>
+  <string name="leave_quest_confirmation">Jesi li siguran/na da želiš napustiti aktivnu pustolovinu? Sav tvoj napredak u pustolovini će biti izgubljen.</string>
+  <string name="number_participants">%1$d sudionika</string>
+  <string name="welcome_back">Dobrodošao/la natrag</string>
+  <string name="yesterdaililes_prompt">Jesi li jučer obavio/la ikoji od ovih Svakodnevnih zadataka?</string>
+  <string name="start_day">Započni dan</string>
+  <string name="leave_party_confirmation">Jesi li siguran/na da želiš napustiti Družinu?</string>
+  <string name="nextPrizeUnlocksIn" formatted="false">Sljedeća nagrada stiže za %d prijava</string>
+  <string name="pending">Na čekanju</string>
+  <string name="accepted">Prihvaćeno</string>
+  <string name="declined">Odbijeno</string>
+  <string name="participants">Sudionici</string>
+  <string name="invitations">Pozivi</string>
+  <string name="quest_leader_header" formatted="false">Započeo/la %s</string>
+  <string name="quest_abort_message">Jesi li siguran/na da želiš otkazati ovu pustolovinu? Ovo će je otkazati za sve u tvojoj družini i sav napredak će biti izgubljen. Pustolovni svitak će biti vraćen vlasniku pustolovine.</string>
+  <string name="loading">Učitavanje...</string>
+  <string name="reloading_content">Sadržaj se ponovno učitava</string>
+  <string name="thousand_abbrev">k</string>
+  <string name="million_abbrev">m</string>
+  <string name="billion_abbrev">b</string>
+  <string name="your_balance">Tvoj saldo:</string>
+  <string name="available_until" formatted="false">Dostupno do %s</string>
+  <string name="gems_left_max" formatted="false">Mjesečni Dragulji: %1$d/%2$d preostalo</string>
+  <string name="gems_left_nomax" formatted="false">Mjesečni Dragulji: %d preostalo</string>
+  <string name="health">Zdravlje</string>
+  <string name="collect">Skupi</string>
+  <string name="rage_meter">Razina Bijesa</string>
+  <string name="boss_quest">Pustolovina potjere Bosa</string>
+  <string name="collection_quest">Pustolovina prikupljanja</string>
+  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+  <string name="experience_reward" formatted="false">%d bodova Iskustva</string>
+  <string name="gold_reward" formatted="false">%d Zlatnika</string>
+  <string name="quest_owner_rewards">Nagrade za Vlasnika Pustolovine</string>
+  <string name="str_abbrv">SNA</string>
+  <string name="per_abbrv">PER</string>
+  <string name="int_abbrv">INT</string>
+  <string name="con_abbrv">KON</string>
+  <string name="reset_account">Resetiraj račun</string>
+  <string name="reset_account_description">UPOZORENJE! Ovo resetira velik dio tvog računa. Zaista se ne predlaže, ali je nekima korisno u početku nakon što se malo poigraju sa stranicom.\n\nIzgubit ćeš sve svoje levele, zlatnike i bodove iskustva. Svi tvoji zadaci (osim onih iz izazova) bit će trajno izbrisani i izgubit ćeš svu njihovu povijest. Izgubit ćeš svu svoju opremu, ali ćeš je moći ponovno kupiti, uključujući i sve komade opreme ograničenih izdanja ili pretplatničke Tajne Artikle koje već posjeduješ (morat ćeš biti u odgovarajućoj klasi kako bi mogao/la ponovno kupiti komade opreme specifične za neku klasu). Zadržat ćeš trenutnu klasu i svoje ljubimce te jahače životinje. Možda ćeš radije htjeti iskoristiti Kuglu Preporoda, što je mnogo sigurnija opcija koja će ti sačuvati sve zadatke i opremu.</string>
+  <string name="delete_account">Izbriši račun</string>
+  <string name="delete_account_description">Jesi li siguran/na? Ovo će zauvijek izbrisati tvoj račun i on nikad neće moći biti vraćen! Morat ćeš registrirati novi račun kako bi ponovno koristio/la Habiticu. Ušteđeni ili potrošeni Dragulji neće biti refundirani. Ako si apsolutno siguran/na, upiši svoju lozinku u tekstni okvir ispod.</string>
+  <string name="reset_account_confirmation">resetiraj moj račun</string>
+  <string name="delete_account_confirmation">izbriši moj račun</string>
+  <string name="danger_zone">Zona Opasnosti</string>
+  <string name="nevermind">Nema veze</string>
+  <string name="resetting_account">Resetiranje računa</string>
+  <string name="deleting_account">Brisanje računa</string>
+  <string name="insufficientGold">Trebaš izvršiti više zadataka prije nego što ćeš moći sebi priuštiti ovaj predmet!</string>
+  <string name="insufficientGems">Trebat će ti više Dragulja kako bi kupio/la ovaj predmet!</string>
+  <string name="purchase_gems">Kupi dragulje</string>
+  <string name="insufficientHourglasses">Trebat će ti više Mističnih pješčanih satova kako bi kupio/la ovaj predmet!</string>
+  <string name="get_hourglasses">Nabavi pješčane satove</string>
+  <string name="subscribe_for_hourglasses">Pretplati se za Pješčane satove</string>
+  <string name="timetravelers_closed_description">Zaradi jedan Mistični pješčani sat za svaka tri mjeseca uzastopne pretplate, onda ih koristi za otključavanje predmeta, ljubimaca i jahačih životinja ograničenih izdanja iz prošlosti... i budućnosti!</string>
+  <string name="want_to_subscribe">Želim se pretplatiti</string>
+  <string name="seasonal_closed_description">Četiri Velike gale se održavaju oko vremena suncostaja i ravnodnevnica, pa se vrati tada kako bi otkrio/la zabavan izbor posebnih sezonskih predmeta!</string>
+  <string name="come_back_soon">Vrati se brzo!</string>
+  <string name="level">Level</string>
+  <string name="streak_label">21-dnevni Nizovi</string>
+  <string name="stats">Statistike</string>
+  <string name="fix_character_description">Ako si naišao/la na grešku ili napravio/la grešku koja je nepravedno promijenila tvog lika,  možeš ručno ispraviti te vrijednosti ovdje.</string>
+  <string name="fix_character_values">Popravi Vrijednosti Lika</string>
+  <string name="saving">Spremanje</string>
+  <string name="forgot_password_title">Pošalji Poveznicu za Resetiranje Lozinke putem e-maila</string>
+  <string name="forgot_password_description">Unesi e-mail adresu koju si koristio/la pri registraciiji svog računa na Habitici.</string>
+  <string name="forgot_password_confirmation">Ako imamo spremljen tvoj e-mail, upute za postavljanje nove lozinke su ti poslane na e-mail adresu.</string>
+  <string name="ok">OK</string>
+  <string name="profile">Profil</string>
+  <string name="profile_summary">Uredi svoj javni profil</string>
+  <string name="display_name">Ime za prikaz</string>
+  <string name="photo_url">URL fotografije</string>
+  <string name="login_name">Korisničko ime</string>
+  <string name="about">Više o</string>
+  <string name="app_settings">Aplikacije</string>
+  <string name="authentication">Provjera autentičnosti</string>
+  <string name="authentication_summary">Promijeni svoje postavke provjere autentičnosti.</string>
+  <string name="change_password">Promijeni Lozinku</string>
+  <string name="change_email">Promijeni e-mail adresu</string>
+  <string name="change_login_name">Promijeni korisničko ime</string>
+  <string name="change_username">Promijeni korisničko ime</string>
+  <string name="change">Promijeni</string>
+  <string name="character_level">Level lika</string>
+  <string name="auto_allocate_points">Automatska raspodjela bodova</string>
+  <string name="stat_guide">Vodič kroz statistiku</string>
+  <string name="character_build">Izgradnja lika</string>
+  <string name="character_build_description">Svaki level ti nosi jedan bod kojeg možeš dodijeliti atributu po vlastitom izboru. Možeš to učiniti ručno ili omogućiti igri da odluči umjesto tebe koristeći jednu od mogućnosti Automatske Raspodjele.</string>
+  <string name="strength">Snaga</string>
+  <string name="strength_description">Povećava bonus kritičnih udaraca i čini ih vjerojatnijima prilikom izvršavanja zadatka. Također povećava štetu koju nanosiš bosovima.</string>
+  <string name="intelligence">Inteligencija</string>
+  <string name="intelligence_description">Povećava Iskustvo koje zaradiš izvršavanjem zadataka. Također povećava tvoj limit mane i brzinu kojom se mana obnavlja s vremenom.</string>
+  <string name="constitution">Konstitucija</string>
+  <string name="constitution_description">Smanjuje količinu štete koju ti zadaci mogu nanijeti. Ne umanjuje štetu nanesenu od strane bosova.</string>
+  <string name="perception">Percepcija</string>
+  <string name="perception_description">Povećava vjerojatnost pronalaženja poklona prilikom izvršavanja Zadataka, dnevni limit dobivenih poklona, bonuse za redovno izvršavanje zadataka i količinu zlatnika koju ti donose Zadaci.</string>
+  <string name="buffs">Ojačanja</string>
+  <string name="allocated">Raspodijeljeno</string>
+  <string name="distribute_evenly">Raspodijeli ravnomjerno</string>
+  <string name="distribute_class">Raspodijeli na osnovu klase</string>
+  <string name="distribute_task">Raspodijeli na osnovu aktivnost zadataka</string>
+  <string name="no_points_to_allocate">Nema bodova za raspodjelu</string>
+  <string name="points_to_allocate" formatted="false">%d bodova za raspodjelu</string>
+  <string name="distribute_evenly_help">Dodijeli svakom atributu jednak broj bodova.</string>
+  <string name="distribute_class_help">Dodjeljuje više bodova atributima koji su bitni za tvoju Klasu.</string>
+  <string name="distribute_task_help">Dodjeljuje bodove na osnovu kategorija Snage, Inteligencije, Konstitucije i Percepcije koje su povezane sa zadacima koje obaviš.</string>
+  <string name="allocating_points">Bodovi se raspodjeljuju</string>
+  <string name="class_equipment">Oprema</string>
+  <string name="equipment_empty">Već imaš svu opremu! Više opreme će biti izbačeno za vrijeme Velikih gala oko suncostaja i ravnodnevnica.</string>
+  <string name="classless">Bez klase</string>
+  <string name="class_equipment_shop_dialog">Ovaj artikal je dostupan samo određenoj klasi.\nMožeš promijeniti svoju klasu u Postavkama.</string>
+  <string name="class_gear_disclaimer">Možeš kupovati opremu samo za svoju trenutnu klasu</string>
+  <string name="available_stats" formatted="false">%d bodova</string>
+  <string name="toogle_emojis">Aktiviraj emotikone</string>
+  <string name="tavern_description">Dobrodošao/la u Svratište! Dovuci stolicu i priključi se chatu, ili se malo odmori od svojih zadataka.</string>
+  <string name="check_into_inn">Prijavi se u Svratište</string>
+  <string name="community_guidelines">Smjernice za zajednicu</string>
+  <string name="view_community_guidelines">Pogledaj Smjernice za zajednicu</string>
+  <string name="guidelines_description">Habitica pokušava stvoriti uključivo okruženje za korisnike svih godina i životnih okolnosti, i to posebice u prostorima kao što je Krčma. Ako imaš ikakvih pitanja, molimo te da pogledaš naše smjernice.</string>
+  <string name="helpful_links">Korisne poveznice</string>
+  <string name="view_faq">Pogledaj ČPP</string>
+  <string name="report_bug">Prijavi grešku</string>
+  <string name="player_tiers">Rangovi igrača</string>
+  <string name="staff_moderators">Osoblje i Moderatori</string>
+  <string name="tiers_descriptions">Obojana korisnička imena koja vidite u chatu predstavljaju doprinositeljski rang osobe. Što je viši rang, to je osoba više doprinjela Habitici svojim umjetničkim kreacijama, kodiranjem, u zajednici, i na druge načine!</string>
+  <string name="navigation_drawer_open">Otvori navigacijsku traku</string>
+  <string name="navigation_drawer_close">Zatvori navigacijsku traku</string>
+  <string name="world_boss">Svjetski Bos</string>
+  <string name="world_boss_art">Umjetnički prikazi Bosa</string>
+  <string name="boss_art">Umjetnički prikazi Bosa</string>
+  <string name="world_boss_description">Opis Svjetskog Bosa</string>
+  <string name="rage_strike_count" formatted="false">Udari Bijesa: %d/%d</string>
+  <string name="pending_strike_description">Ovaj Udarac još nije zadan!\nSvjetski bos će napasti i ispucati svoj bijes na jednom od naših prijateljskih trgovaca kad mu se napuni traka bijesa. Drži korak sa svojim Svakodnevnim zadacima kako bi pokušao/la spriječiti da dođe do ovoga!</string>
+  <string name="pending_strike_title">U iščekivanju Udarca</string>
+  <string name="strike_description_title">Što je Udar Bijesa?</string>
+  <string name="strike_description_subtitle">Postoje 3 potencijalna Udara Bijesa</string>
+  <string name="strike_description_description">Ova traka se napuni kad Habitičani propuste svoje Svakodnevne zadatke. Ako se napuni, Srceparatelj će izvršiti svoj napad Razaranja Srca na jednom od Habitičinih trgovaca. Stoga pripazi da obaviš svoje zadatke!</string>
+  <string name="pending_strike_subtitle">Ovaj Udarac još nije zadan!</string>
+  <string name="strike_active_title" formatted="false">%s je bio napadnut!</string>
+  <string name="strike_active_subtitle" formatted="false">%s ima slomljeno srce!</string>
+  <string name="strike_active_description" formatted="false">Naš dragi %s je bio razoren kad je %s razbio %s. Brzo, navali na svoje zadatke kako bi porazio/la čudovište i pomogao/la u obnovi!!</string>
+  <string name="questShop">Dućan pustolovina</string>
+  <string name="market_owner_long">Alex Trgovac</string>
+  <string name="tavern_owner_long">Danijel Gostioničar</string>
+  <string name="stable_owner_long">Matt gospodar zvijeri</string>
+  <string name="hide_boss_art">Sakrij umjetničke prikaze Bosa</string>
+  <string name="active_world_boss">Aktivni Svjetski Bos</string>
+  <string name="no_party_description">Idi na pustolovine s prijateljima ili samostalno. Bori se protiv čudovišta, kreiraj Izazove i pomogni sebi zadržati odgovornost pomoću Družina.</string>
+  <string name="no_party_title">Igraj Habiticu u Družini</string>
+  <string name="join_party_description">Daj članu Družine korisničko ime ispod koje se nalazi ispod i oni će ti moći poslati pozivnicu</string>
+  <string name="join_party_description_id">Daj im svoj Korisnički ID ili da im daj da skeniraju tvoj QR kod prilikom slanja pozivnice</string>
+  <string name="join_party_title">Želiš se priključiti Družini?</string>
+  <string name="create_party_website">Otvori web stranicu kako bi napravio/la družinu</string>
+  <string name="id_copied">ID je kopiran u međuspremnik</string>
+  <string name="insufficientSubscriberGems">Kupio/la si sve Dragulje koje možeš za ovaj mjesec. Više ih postane dostupno unutar prva tri dana svakog mjeseca. Hvala na pretplati!</string>
+  <string name="insufficientSubscriberGemsTitle">Došao/la si do mjesečnog limita Dragulja</string>
+  <string name="chat_message">Poruka u chatu</string>
+  <string name="world_boss_description_title">Što je Svjetski Bos?</string>
+  <string name="world_boss_description_description">Svjetski Bos je posebni događaj u kojem cijela zajednica surađuje kako bi porazila moćno čudovište pomoću svojih zadataka!\nIzvršavaj zadatke kako bi nanio/la štetu Bosu\nBos neće tebi nanijeti štetu za propuštene zadatke, ali će se njegova traka Bijesapuniti. Ako se traka napuni, Bos će napasti jednog od trgovaca!\nMožeš se nastaviti boriti protiv normalnih Bosova Pustolovina i šteta će biti nanesena obojici\nPoviri u Krčmu kako bi vidio/la napredak u borbi protiv Bosa i broj Udara bijesa.</string>
+  <string name="world_boss_description_intro">Svjetski Bos je posebni događaj u kojem cijela zajednica surađuje kako bi porazila moćno čudovište pomoću svojih zadataka!</string>
+  <string name="world_boss_description_1">Izvršavaj zadatke kako bi nano/la štetu Bosu</string>
+  <string name="world_boss_description_2">Bos neće tebi nanijeti štetu za propuštene zadatke, ali će se njegova traka Bijesa puniti. Ako se traka napuni, Bos će napasti jednog od trgovaca!</string>
+  <string name="world_boss_description_3">Možeš se nastaviti boriti protiv normalnih Bosova Pustolovina i šteta će biti nanesena obojici</string>
+  <string name="world_boss_description_4">Poviri u Krčmu kako bi vidio/la napredak u borbi protiv Bosa i broj udara Bijesa</string>
+  <string name="world_boss_action_prompt" formatted="false">Porazi Bosa kako bi dobio/la posebne nagrade i spasio/la Habiticu od terora %s.</string>
+  <string name="world_boss_description_subtitle">%s napada!</string>
+  <string name="questShop_owner_long">Ian, Vodič kroz Pustolovine</string>
+  <string name="seasonalShop_owner_long">Sezonska Čarobnica</string>
+  <string name="rage_attack">Napad Bijesa:</string>
+  <string name="tavern_description_world_boss">Ajoj, ne obračaj pozornost na čudovište ispod - ovo je i dalje sigurno utočište za čavrljanje u pauzama.</string>
+  <string name="report">Prijavi</string>
+  <string name="like">Lajkaj</string>
+  <string name="reply">Odgovori</string>
+  <string name="challenge_prize">Nagrada za Izazov</string>
+  <string name="challenge_categories">Kategorije Izazova</string>
+  <string name="created_challenge">Napravljen Izazov</string>
+  <string name="joined">Pridružio/la se</string>
+  <string name="public_challenge">Javni Izazov</string>
+  <string name="short_name">Kratki naziv</string>
+  <string name="unlock_attribute_points">Raspodjela bodova atributa se otključava na levelu 10</string>
+  <string name="same_day_reminder_title">Jesi li dodao/la svoje zadatke?</string>
+  <string name="same_day_reminder_text">Što ih više dodaš, to ćeš dobivati više nagrada. Čak se i malene navike mogu zbrojiti i pokrenuti veliku promjenu.</string>
+  <string name="next_day_reminder_title">Jesi li prekrižio/la svoje zadatke danas?</string>
+  <string name="next_day_reminder_text">Postoji puno toga što se može otključati i otkriti kako napreduješ s levelima. Stoga drži korak sa svojim zadacima i zabavi se!</string>
+  <string name="daily_tip_0">Želiš li probati nešto novo? Pridruži se Izazovu kako bi proširio/la svoj popis zadataka i zaradio/la nešto Dragulja!</string>
+  <string name="daily_tip_1">Dodaji liste svojim Zadacima kako bi umnožio/la svoje nagrade!</string>
+  <string name="daily_tip_2">Možeš mijenjati koliko se često neki Svakodnevni zadatak ponavlja. Čak se i rijeki zadati mogu zakazati.</string>
+  <string name="daily_tip_3">Možeš postaviti i podsjetnike za Svakodnevne zadatke.</string>
+  <string name="daily_tip_4">Povremeno reevaluiranje svojih zadataka ti može pomoći da ne zalutaš s puta.</string>
+  <string name="daily_tip_5">Duboko udahni nekoliko puta - to će ti pomoći da se fokusiraš. Možeš ti to!</string>
+  <string name="daily_tip_6">Pokušaj postaviti alarm za 10 minuta i vidi koliko toga možeš obaviti u tom vremenu!</string>
+  <string name="daily_tip_7">Pokušaj zakačiti artikel s Tržnice pod svoje Nagrade. Ovo bi te moglo motivirati da ih zaradiš!</string>
+  <string name="daily_tip_8">Možeš mijenjati težinu svojih zadataka kako bi se nagradio/la za obavljanje težih zadataka!</string>
+  <string name="daily_tip_9">Ako ti ide malo teže, pokušaj razbiti svoje zadatke na manje dijelove.</string>
+  <string name="moderator">Moderator</string>
+  <string name="staff">Osoblje</string>
+  <string name="expand_notes">Pročitaj više</string>
+  <string name="collapse_notes">Prikaži manje</string>
+  <string name="reset_streak">Resetiraj niz</string>
+  <string name="week_reminder_title">Kako te ide sa zadacima?</string>
+  <string name="week_reminder_text">Pauze su zdrave, ali i dalje možeš zarađivati bodove za jednostavne aktivnosti i time podizati levele i dobivati kul opremu!</string>
+  <string name="last_login">Posljednja prijava</string>
+  <string name="total_checkins">Ukupni broj prijava</string>
+  <string name="two_handed">Dvoručni</string>
+  <string name="usernamePromptTitle">Vrijeme je za postaviti tvoje korisničko ime!</string>
+  <string name="usernamePromptBody">Imena za prijavljivanje su sada jedinstvena korisnička imena koja će biti vidljiva pokraj tvog imena za prikazivanje i koja će biti korištena u pozivnicama, @spomenima u chatu i porukama.</string>
+  <string name="usernamePromptWiki">Ako želiš naučiti više o ovoj promjeni, <a href="https://habitica.wikia.com/wiki/Player_Names">posjeti našu wiki stranicu.</a></string>
+  <string name="confirmUsername">Potvrdi korisničko ime</string>
+  <string name="usernamePromptDisclaimer">Korisnička imena se trebaju pridržavati naših <a href="https://habitica.com/static/terms">Uvjeta pružanja usluga</a> i <a href="https://habitica.com/static/community-guidelines">Smjernica za zajednicu</a>. Ako prethodno nisi postavio/la svoje korisničko ime, ono je automatski generirano.</string>
+  <string name="confirm_username_title">Jesi li siguran/na da želiš potvrditi svoje trenutno korisničko ime?</string>
+  <string name="confirm_username_description">Potvrđivanje tvog korisničkog imena će ga učiniti javnim za pozivnice, @spomene i poruke. Možeš promijeniti svoje korisničko ime u postavkama bilo kada.</string>
+  <string name="cancel">Otkaži</string>
+  <string name="confirm_username">Potvrdi korisničko ime</string>
+  <string name="username_not_confirmed">Korisničko ime nije potvrđeno</string>
+  <string name="username_confirmed">Korisničko ime je potvrđeno</string>
+  <string name="username_level">\@%s ・Lvl %d</string>
+  <string name="enter_recipient_username">Unesi Korisničko ime primatelja</string>
+  <string name="username_copied">Korisničko ime je kopirano u međuspremnik</string>
+  <string name="verification_pet">Jedan od ovih veteranskih ljubimaca će te čekati nakon što završiš proces potvrđivanja!</string>
+  <string name="welcomeNameTitle">Kako te možemo zvati?</string>
+  <string name="display_name_length_error">Imena za prikazivanje moraju imati između 1 i 30 znakova</string>
+  <string name="setup_task_join_habitica">Pridruži se Habitici (Označi me!)</string>
+  <string name="setup_task_join_habitica_notes">Možeš ili obaviti ovaj Zadatak, urediti ga ili ga ukloniti.</string>
 </resources>
diff --git a/Habitica/res/values-in/strings.sidebar.xml b/Habitica/res/values-in/strings.sidebar.xml
index 2b8e12a82..66bb7a707 100644
--- a/Habitica/res/values-in/strings.sidebar.xml
+++ b/Habitica/res/values-in/strings.sidebar.xml
@@ -1,12 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="sidebar.tasks">Tugas</string>
-  <string name="sidebar.skills">Keahlian</string>
+  <string name="sidebar.skills">Kemampuan</string>
   <string name="sidebar.section.social">Sosial</string>
-  <string name="sidebar.inbox">Kotak Pesan</string>
-  <string name="sidebar.tavern">Kedai</string>
-  <string name="sidebar.party">Teman</string>
-  <string name="sidebar.guilds">Kelompok</string>
+  <string name="sidebar.inbox">Pesan</string>
+  <string name="sidebar.tavern">Kedai Minuman</string>
+  <string name="sidebar.party">Party</string>
+  <string name="sidebar.purchaseGems">Permata &amp; Berlangganan</string>
+  <string name="sidebar.guilds">Guild</string>
   <string name="sidebar.challenges">Tantangan</string>
   <string name="sidebar.section.inventory">Inventori</string>
   <string name="sidebar.avatar">Avatar</string>
@@ -16,4 +17,5 @@
   <string name="sidebar.settings">Pengaturan</string>
   <string name="sidebar.about">Tentang Kami</string>
   <string name="sidebar_shops">Toko</string>
+  <string name="sidebar_stats">Status</string>
 </resources>
diff --git a/Habitica/res/values-in/strings.tutorial.xml b/Habitica/res/values-in/strings.tutorial.xml
index 5e11b34c2..1eceff370 100644
--- a/Habitica/res/values-in/strings.tutorial.xml
+++ b/Habitica/res/values-in/strings.tutorial.xml
@@ -1,10 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya mempengaruhi apa yang avatarmu kenakan.</string>
+  <string name="tutorial_overview">Di sinilah kita! Aku sudah membuatkan beberapa tugas berdasarkan minatmu. Coba kamu tambahkan beberapa tugas lagi. Kamu bisa mengedit tugas dengan mengetuk judulnya.</string>
+  <string name="tutorial_habits_1">Pertama adalah Kebiasaan. Bisa Kebiasaan positif yang ingin kamu tingkatkan atau Kebiasaan negatif yang ingin kamu tinggalkan.</string>
+  <string name="tutorial_habits_2">Setiap kali kamu melakukan Kebiasaan positif, ketuk tanda + untuk memperoleh pengalaman dan koin emas!</string>
+  <string name="tutorial_habits_3">Kalau kamu lalai dan melakukan sebuah Kebiasaan negatif, mengetuk tanda - akan membuat nyawa avatarmu berkurang supaya kamu belajar bertanggung jawab.</string>
+  <string name="tutorial_habits_4">Coba deh! Kamu bisa mengeksplor macam-macam tugas lain melalui tombol navigasi di bawah.</string>
+  <string name="tutorial_dailies_1">Buat Keseharian untuk tugas-tugas yang terikat waktu dan butuh untuk diselesaikan secara berkala.</string>
+  <string name="tutorial_dailies_2">Hati-hati — kalau ada yang terlewat, avatar kamu akan terkena damage besoknya. Menyelesaikan Keseharian secara konsisten memberi banyak keuntungan!</string>
+  <string name="tutorial_todos_1">Gunakan To-do untuk mencatat tugas-tugas yang hanya perlu kamu lakukan sekali.</string>
+  <string name="tutorial_todos_2">Kalau To-do-mu harus diselesaikan pada waktu tertentu, tetapkan tenggat waktunya. Sepertinya ada satu yang bisa kamu centang sekarang — sana!</string>
+  <string name="tutorial_rewards_1">Beli perlengkapan untuk avatarmu menggunakan koin emas yang kamu dapatkan!</string>
+  <string name="tutorial_rewards_2">Kamu juga bisa membuat Hadiah yang benar-benar ada di dunia nyata tergantung apa yang memotivasimu.</string>
+  <string name="tutorial_tasks_complete">Itu dulu untuk sekarang. Kalau kamu butuh pengingat, lihat bagian FAQ.</string>
+  <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya memengaruhi apa yang avatarmu kenakan.</string>
   <string name="tutorial_items">Dapatkan item dengan menyelesaikan tugas dan meningkatkan level. Ketuk pada item untuk menggunakannya!</string>
-  <string name="tutorial_pets">Seiring kamu menyelesaikan tugas dunia-nyata, kamu sekarang memiliki kesempatan acak untuk menemukan telur dan ramuan. Campurkan mereka untuk menetaskan peliharaan</string>
-  <string name="tutorial_skills">Keahlian adalah kemampuan spesial yang memiliki efek yang kuat! Ketuk pada suatu keahlian untuk menggunakannya. Keahlian akan mengurangi Mana (baris biru), di mana kamu bisa mendapatkannya dengan mengecek aplikasi setiap hari dan dengan menyelesaikan tugas dunia-nyatamu. Periksa FAQ pada menu untuk info lebih lanjut!</string>
+  <string name="tutorial_pets">Seiring kamu menyelesaikan tugas dunia-nyata, kamu sekarang memiliki kesempatan untuk menemukan telur dan ramuan. Campurkan mereka untuk menetaskan peliharaan</string>
+  <string name="tutorial_skills">Kemampuan adalah hal spesial yang memiliki efek yang kuat! Ketuk pada kemampuan untuk menggunakannya. Kemampuan akan mengurangi Mana (bar biru), yang bisa kamu dapatkan dengan mengecek aplikasi setiap hari dan dengan menyelesaikan tugas dunia-nyatamu. Periksa FAQ pada menu untuk info lebih lanjut!</string>
   <string name="tutorial_party">Ini adalah bagian dimana kamu dan teman-temanmu dapat menjaga masing-masing agar tetap bertanggung jawab sekaligus melawan monster-monster dengan tugasmu!</string>
-  <string name="tutorial_tavern">Selamat datang di Kedai Minuman, ruang berbincang publik untuk semua umur! Disini kamu dapat berbincang mengenai produktivitas dan menanyakan pertanyaan. Selamat bersenang-senang!</string>
-  <string name="tutorial_classes">Pilih untuk menjadi Prajurit, Penyihir, Penyembuh, atau Perampok! Setiap kelas memiliki perlengkapan dan kemampuan yang unik. Ketuk (?) untuk mengetahui lebih lanjut!</string>
+  <string name="tutorial_tavern">Selamat datang di Kedai Minuman, ruang berbincang publik untuk semua umur! Di sini kamu dapat berbincang mengenai produktivitas dan menanyakan pertanyaan. Selamat bersenang-senang!</string>
+  <string name="tutorial_classes">Pilih untuk menjadi Warrior, Mage, Healer, atau Rogue! Setiap pekerjaan memiliki perlengkapan dan kemampuan yang unik. Ketuk (?) untuk mengetahui lebih lanjut!</string>
+  <string name="tutorial_stats">Ketuk tombol abu-abu untuk mengalokasikan banyak status sekaligus, atau ketuk pada tanda panah untuk menambahkan satu per satu.</string>
 </resources>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index ceb023401..92c74475a 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -2,93 +2,112 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="action_refresh">Muat Ulang</string>
   <string name="XP_default">Pengalaman </string>
-  <string name="HP_default">Kesehatan</string>
+  <string name="HP_default">Nyawa</string>
   <string name="MP_default">Mana</string>
   <string name="ERR_pb_barcode">Pengaturan tidak dapat dimuat dari barkode</string>
   <!--Prefs-->
   <string name="PS_settings_title">Pengaturan</string>
   <string name="SP_address_hint">Server kustom anda</string>
   <string name="SP_userID_title">ID Pengguna</string>
-  <string name="SP_userID_summary">ID Pengguna Anda</string>
+  <string name="SP_userID_summary">ID Penggunamu</string>
   <string name="SP_APIToken_title">Token API</string>
-  <string name="SP_APIToken_summary">Token API Anda</string>
+  <string name="SP_APIToken_summary">Token API-mu</string>
   <string name="Language_title">Bahasa</string>
   <string name="Language_summary">Ganti bahasa dalam Habitica</string>
-  <string name="SP_user_qr_code">QR Kodemu</string>
+  <string name="SP_user_qr_code">Kode QR-mu</string>
   <string name="PS_contact_title">Kontak saya</string>
+  <string name="unknown_error">Terjadi kesalahan...</string>
   <string name="pref_account_header">Akun</string>
   <string name="pref_first_day_of_the_week_title">Hari Pertama dalam Minggu</string>
   <string name="pref_first_day_of_the_week_summary">Hari pertama dalam minggu di semua kalender</string>
-  <string name="pref_reminder_header">Peringatan Harian</string>
-  <string name="pref_reminder_checkbox">Aktifkan Peringatan</string>
-  <string name="pref_reminder_picker">Atur Waktu Peringatan</string>
+  <string name="pref_reminder_header">Pengingat Harian</string>
+  <string name="pref_reminder_checkbox">Aktifkan Pengingat</string>
+  <string name="pref_reminder_picker">Atur Waktu Pengingat</string>
   <string name="pref_cds_header">Awal Hari</string>
   <string name="pref_cds_picker">Atur Awal Hari</string>
-  <string name="pref_push_notifications_checkbox">Notifikasi Tampil Pengguna</string>
-  <string name="push_notifications">Notifikasi Tampil</string>
+  <string name="pref_push_notifications_checkbox">Notifikasi Pengguna</string>
+  <string name="push_notifications">Notifikasi</string>
   <string name="push_notifications_sum">Pengaturan notifikasi</string>
   <string name="preference_push_you_won_challenge">Kamu memenangkan sebuah Tantangan!</string>
   <string name="preference_push_received_a_private_message">Menerima sebuah Pesan Pribadi</string>
-  <string name="preference_push_gifted_gems">Permata terhadiahkan</string>
-  <string name="preference_push_gifted_subscription">Langganan terhadiahkan</string>
-  <string name="preference_push_invited_to_party">Terundang ke Kelompok</string>
-  <string name="preference_push_invited_to_guild">Telah diundang ke dalam Guild</string>
-  <string name="preference_push_your_quest_has_begun">Tugasmu telah Dimulai</string>
-  <string name="preference_push_invited_to_quest">Terundang ke Tugas</string>
+  <string name="preference_push_gifted_gems">Mendapat Hadiah Permata</string>
+  <string name="preference_push_gifted_subscription">Mendapat Hadiah Langganan</string>
+  <string name="preference_push_invited_to_party">Diundang ke Party</string>
+  <string name="preference_push_invited_to_guild">Diundang ke Guild</string>
+  <string name="preference_push_your_quest_has_begun">Misimu telah Dimulai</string>
+  <string name="preference_push_invited_to_quest">Diundang ke dalam Misi</string>
   <!--Adding tasks-->
   <string name="task_value">Nilai</string>
+  <string name="new_todo">To-Do baru</string>
+  <string name="new_reward">Hadiah baru</string>
+  <string name="new_daily">Keseharian baru</string>
+  <string name="new_habit">Kebiasaan baru</string>
   <string name="action_edit">Edit</string>
   <string name="action_delete">Hapus</string>
   <string name="action_cancel">Batal</string>
   <string name="login_btn">Masuk</string>
   <string name="register_btn">Daftar</string>
-  <string name="username">Username</string>
-  <string name="email_username">Email atau Username</string>
+  <string name="username">Nama Pengguna</string>
+  <string name="email_username">Email atau Nama Pengguna</string>
   <string name="password">Kata Sandi</string>
   <string name="emailAddress">Alamat Email</string>
   <string name="confirmpassword">Konfirmasi kata sandi</string>
   <string name="logout">Keluar</string>
-  <string name="logout_description">Keluar dari akun anda</string>
+  <string name="logout_description">Keluar dari akunmu</string>
   <string name="account_details">Detail Akun</string>
   <string name="LoginActivityName">Selamat Datang</string>
   <string name="string_revive">Pulihkan</string>
-  <string name="please_connect">Tolong hubungkan aplikasi sebelum menggunakan widget</string>
+  <string name="please_connect">Silakan hubungkan melalui aplikasi sebelum menggunakan widget</string>
   <string name="about.title">Tentang Kami</string>
   <string name="about.libraries">Pustaka</string>
-  <string name="about.versionhistory">Sejarah Versi</string>
+  <string name="about.versionhistory">Riwayat Versi</string>
   <string name="about.habitica_open_source">Habitica tersedia sebagai perangkat lunak open source pada Github</string>
   <string name="about.rate_our_app">Nilai Aplikasi kami</string>
   <string name="about.give_us_feedback">Kirimkan kami Feedback!</string>
   <string name="about.bugreport">Laporkan Gangguan</string>
   <string name="about.source_code">Kode</string>
+  <string name="repeatEvery">Ulangi Setiap</string>
   <!--Network Errors-->
   <string name="network_error_title">Koneksi Gagal</string>
-  <string name="network_error_no_network_body">Anda tidak terhubung ke internet.</string>
+  <string name="network_error_no_network_body">Kamu tidak terhubung ke internet.</string>
   <string name="internal_error_api">Terdapat masalah pada server. Cobalah beberapa saat lagi.</string>
   <string name="authentication_error_title">Autentikasi Gagal</string>
-  <string name="authentication_error_body">Username Anda dan/atau Kata Sandi salah.</string>
+  <string name="authentication_error_body">Nama Pengguna dan/atau Kata Sandi salah.</string>
   <string name="login_validation_error_title">Validasi Gagal</string>
-  <string name="login_validation_error_fieldsmissing">Anda harus mengisi semua kolom.</string>
+  <string name="login_validation_error_fieldsmissing">Kamu harus mengisi semua kolom.</string>
   <string name="save_changes">Simpan</string>
   <string name="copy">Salin</string>
   <string name="notes">Catatan</string>
   <string name="text">Teks</string>
   <string name="difficulty">Tingkat Kesulitan</string>
   <string name="tags">Label</string>
-  <string name="trivial">Sangat Mudah</string>
+  <string name="trivial">Trivial</string>
   <string name="easy">Mudah</string>
   <string name="medium">Sedang</string>
   <string name="hard">Susah</string>
   <string name="start_date">Tanggal Mulai</string>
   <string name="positive_habit_form">Positif (+)</string>
   <string name="negative_habit_form">Negatif (-)</string>
-  <string name="checklist">Ceklis</string>
+  <string name="checklist">Daftar Cek</string>
   <string name="reminders">Pengingat</string>
   <string name="actions">Aksi</string>
   <string name="attributes">Atribut</string>
+  <string name="physical">Kekuatan</string>
+  <string name="mental">Kecerdasan</string>
+  <string name="social">Ketahanan</string>
+  <string name="other">Persepsi</string>
   <string name="frequency">Frekuensi</string>
   <string name="frequency_weekly">Pada Hari Tertentu dalam Seminggu</string>
   <string name="frequency_daily">Setiap X Hari</string>
+  <string name="repeatables_summary_title">Ringkasan</string>
+  <string name="repeatables_title">Ulangi</string>
+  <string name="repeatables_on_title">Ulangi pada</string>
+  <string name="repeatables_frequency_daily">Harian</string>
+  <string name="repeatables_frequency_weekly">Mingguan</string>
+  <string name="repeatables_frequency_monthly">Bulanan</string>
+  <string name="repeatables_frequency_yearly">Tahunan</string>
+  <string name="repeatables_frequency_day_of_month">Hari pada Bulan</string>
+  <string name="repeatables_frequency_day_of_week">Hari pada Minggu</string>
   <string name="monday">Senin</string>
   <string name="tuesday">Selasa</string>
   <string name="wednesday">Rabu</string>
@@ -96,42 +115,37 @@
   <string name="friday">Jumat</string>
   <string name="saturday">Sabtu</string>
   <string name="sunday">Minggu</string>
-  <string name="levelup_header">Kamu mendapatkan level!</string>
-  <string name="levelup_detail">Dengan menyelesaikan tujuan dunia-nyatamu, kamu meningkat ke Level %1$d!</string>
-  <string name="levelup_health">Kamu telah disembuhkan!</string>
   <string name="levelup_button">Hore!</string>
   <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">Isi ulang Kesehatan &amp; Ulang Lagi</string>
+  <string name="faint_button">Isi ulang Nyawa &amp; Ulang Lagi</string>
   <string name="filter">Filter</string>
   <string name="profile_image">Gambar Profil</string>
   <string name="mana_price_button">%d MP</string>
   <string name="used_skill">Kamu menggunakan %1$s dengan %2$d mana.</string>
   <string name="used_skill_without_mana">Kamu menggunakan %1$s</string>
-  <string name="new_checklist_item">ceklis item baru</string>
+  <string name="new_checklist_item">item cek baru</string>
   <string name="add_checklist_item">Tambahkan</string>
-  <string name="reminder_title">Ingatlah untuk mencentang Keseharianmu!</string>
   <string name="skill_progress_title">Gunakan Kemampuan</string>
   <string name="coming_soon">Akan Datang</string>
   <string name="chat_flag_confirmation">Apakah kamu yakin kamu ingin melaporkan pesan ini sebagai pelanggaran?</string>
   <string name="flag_confirm">Laporkan Pesan</string>
   <string name="unlock_lvl_11">Buka pada lvl 11</string>
-  <string name="no_party_message">Kamu tidak memiliki teman. Untuk mencari teman, tolong kunjungi situs.</string>
+  <string name="no_party_message">Kamu tidak memiliki party. Untuk bergabung dengan party, silakan kunjungi situs.</string>
   <string name="forgot_pw_btn">Lupa Kata Sandi</string>
   <string name="tavern.inn.checkOut">Aktifkan kembali Keseharianmu</string>
   <string name="tavern.inn.rest">Nonaktifkan Keseharianmu</string>
   <string name="reward.dialog.buy">Beli</string>
-  <string name="reward.dialog.dismiss">Hilangkan</string>
-  <string name="party">Teman</string>
+  <string name="reward.dialog.dismiss">Tutup</string>
+  <string name="party">Party</string>
   <string name="chat">Obrolan</string>
   <string name="members">Anggota</string>
   <string name="habits">Kebiasaan</string>
   <string name="dailies">Keseharian</string>
-  <string name="todos">Tugas</string>
+  <string name="todos">To-Do</string>
   <string name="rewards">Hadiah</string>
   <string name="taskform.delete.title">Apakah kamu yakin?</string>
-  <string name="taskform.delete.message">Apakah kamu benar-benar ingin menghapus?</string>
+  <string name="taskform.delete.message">Apakah kamu benar-benar ingin menghapusnya?</string>
   <string name="yes">Ya</string>
   <string name="no">Tidak</string>
   <string name="quest">Misi</string>
@@ -140,7 +154,7 @@
   <string name="avatar_shirt">Baju</string>
   <string name="avatar_skin">Kulit</string>
   <string name="avatar_ears">Telinga Hewan</string>
-  <string name="avatar_base">Dasar</string>
+  <string name="avatar_base">Biasa</string>
   <string name="avatar_color">Warna</string>
   <string name="avatar_beard">Janggut</string>
   <string name="avatar_mustache">Kumis</string>
@@ -151,7 +165,7 @@
   <string name="avatar_size_slim">Kurus</string>
   <string name="avatar_size_broad">Bidang</string>
   <string name="avatar_background">Latar Belakang</string>
-  <string name="purchase_customization">Beli Kustomisasi</string>
+  <string name="purchase_customization">Beli Item</string>
   <string name="purchase_set_button">Buka set seharga %d permata</string>
   <string name="purchase_button">Beli</string>
   <string name="purchase_set_title">Beli set %s</string>
@@ -162,22 +176,34 @@
   <string name="quest.cancel">Batalkan Undangan</string>
   <string name="quest.abort">Batalkan Misi</string>
   <string name="quest.leave">Tinggalkan Misi</string>
-  <string name="quest.pending">Tunda</string>
+  <string name="quest.pending">Menunggu</string>
   <string name="quest.accepted">Diterima</string>
   <string name="quest.rejected">Ditolak</string>
   <string name="quest.participants">Partisipan</string>
   <string name="version_info">Versi %1$s (%2$d)</string>
   <string name="sidebar_help">Bantuan &amp; FAQ</string>
   <string name="complete_tutorial">Aku mengerti!</string>
-  <string name="dismiss_tutorial">Peringatkan aku lagi</string>
+  <string name="dismiss_tutorial">Ingatkan aku lagi</string>
+  <string name="intro_1_subtitle">Selamat datang di</string>
+  <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Ini saatnya untuk bersenang-senang sambil benar-benar menyelesaikan urusan-urusanmu. Bergabunglah dengan lebih dari %s orang yang memperbaiki aspek hidup mereka satu demi satu.</string>
+  <string name="intro_2_subtitle">Berkembang di dalam game</string>
+  <string name="intro_2_title">Berkembang di kehidupan nyata</string>
+  <string name="intro_2_description">Buka fitur dalam game dengan mengerjakan tugasmu di dunia nyata. Dapatkan baju, peliharaan, dan banyak lagi sebagai hadiahmu mencapai tujuan!</string>
+  <string name="intro_3_subtitle">Bertarung dengan monster</string>
+  <string name="intro_3_title">Menjadi lebih sosial</string>
   <string name="intro_3_description">Tetaplah berusaha meraih tujuan dengan bantuan teman-teman. Dukung satu sama lain dalam hidup dan bertarunglah sekaligus meningkatkan kehidupan bersama-sama!</string>
+  <string name="intro_finish_button">Mari mulai!</string>
   <string name="previous_button">Sebelumnya</string>
   <string name="next_button">Berikutnya</string>
   <string name="skip_button">Lewati</string>
   <string name="setup_welcome_description">Selamat datang di Habitica, di mana meningkatkan diri dalam permainan akan meningkatkan kehidupan nyata! Seiring kamu menyelesaikan tujuan dunia-nyata, kamu akan membuka perlengkapan, peliharaan, misi, dan banyak lagi.</string>
   <string name="setup_welcome_title">Selamat Datang</string>
-  <string name="setup_group_work">Kerja</string>
-  <string name="setup_group_exercise">Latihan Fisik</string>
+  <string name="avatar_setup_description">Jadi, kamu mau terlihat seperti apa? Jangan khawatir, kamu bisa mengubahnya lagi nanti.</string>
+  <string name="task_setup_description">Bagus! Sekarang, apa yang menurutmu menarik untuk kamu kembangkan dalam pengembaraan ini?</string>
+  <string name="setup_group_work">Pekerjaan</string>
+  <string name="setup_group_exercise">Olahraga</string>
+  <string name="setup_group_health">Kesehatan</string>
   <string name="setup_group_school">Sekolah</string>
   <string name="setup_group_teams">Tim</string>
   <string name="setup_group_chores">Pekerjaan Rumah Tangga</string>
@@ -186,8 +212,8 @@
   <string name="setup_task_work_2">Tugas paling penting</string>
   <string name="setup_task_work_3">Proyek Kerja</string>
   <string name="setup_task_exercise_1">10 menit cardio</string>
-  <string name="setup_task_exercise_2">Pelemasan</string>
-  <string name="setup_task_exercise_3">Atur jadwan latihan</string>
+  <string name="setup_task_exercise_2">Stretching</string>
+  <string name="setup_task_exercise_3">Atur jadwal olahraga</string>
   <string name="setup_task_healthWellness_1">Makan makanan bergizi / cepat saji</string>
   <string name="setup_task_healthWellness_2">Gunakan Benang Gigi</string>
   <string name="setup_task_healthWellness_3">Periksa Jadwal</string>
@@ -195,38 +221,40 @@
   <string name="setup_task_school_2">Mengerjakan PR</string>
   <string name="setup_task_school_3">Selesaikan tugas</string>
   <string name="setup_task_teams_1">Periksa tim</string>
-  <string name="setup_task_teams_2">Perbaharui tim mengenai status</string>
+  <string name="setup_task_teams_2">Kabari tim mengenai status terbaru</string>
   <string name="setup_task_teams_3">Selesaikan proyek tim</string>
   <string name="setup_task_chores_1">10 menit bersih-bersih</string>
   <string name="setup_task_chores_2">Cuci Piring</string>
   <string name="setup_task_chores_3">Rapikan lemari</string>
-  <string name="setup_task_creativity_1">Belajar menguasai kemampuan</string>
+  <string name="setup_task_creativity_1">Belajar menguasai kerajinan tangan</string>
   <string name="setup_task_creativity_2">Mengerjakan proyek kreatif</string>
   <string name="setup_task_creativity_3">Menyelesaikan proyek kreatif</string>
-  <string name="gem.purchase.support">Ingin membantu kami menjaga Habitica tetap berjalan? Kamu dapat mendukung pengembang dengan membeli permata!\n\nPermata membuatmu dapat membeli aksesoris menarik untuk akunmu, termasuk: \n\n - Kostum keren untuk avatarmu\n - Latar belakang keren\n - Misi menarik yang memberimu hadiah telur peliharaan unik\n - Kemampuan untuk mengganti kelas sebelum level 100\n\nTerima kasih banyak untuk bantuan kepada Habitca untuk menjadi yang terbaik. Dukunganmu sangat berarti bagi kami!</string>
-  <string name="my_guilds">Perkumpulan Saya</string>
-  <string name="public_guilds">Perkumpulan Publik</string>
-  <string name="guild">Perkumpulan</string>
+  <string name="gem.purchase.support">Ingin membantu kami menjaga Habitica tetap berjalan? Kamu dapat mendukung pengembang dengan membeli permata!\n\nDengan permata kamu dapat membeli hal-hal menarik untuk akunmu, termasuk: \n\n - Kostum keren untuk avatarmu\n - Latar belakang keren\n - Misi menarik yang memberimu hadiah telur peliharaan unik\n - Kemampuan untuk mengganti pekerjaan sebelum level 100\n\nTerima kasih banyak untuk bantuan kepada Habitca untuk menjadi yang terbaik. Dukunganmu sangat berarti bagi kami!</string>
+  <string name="my_guilds">Guild-ku</string>
+  <string name="public_guilds">Guild Publik</string>
+  <string name="guild">Guild</string>
   <string name="leave">Tinggalkan</string>
   <string name="join">Gabung</string>
   <string name="leader">Ketua</string>
   <string name="gems">Permata</string>
+  <string name="copy_as_todo">Salin sebagai To-Do</string>
   <string name="send_pm">Kirim PM</string>
-  <string name="flag">Tandai</string>
+  <string name="flag">Laporkan</string>
   <string name="delete">Hapus</string>
   <string name="name">Nama </string>
   <string name="description">Deskripsi</string>
+  <string name="add_tag">Tambahkan Label baru</string>
   <string name="privacy">Privasi</string>
   <string name="write_message">Tulis Pesan</string>
   <string name="post">Kirim</string>
-  <string name="guild_search_hint">Mencari Perserikatan</string>
+  <string name="guild_search_hint">Cari guild</string>
   <string name="todo_due">Tenggat: %s</string>
-  <string name="daily_streak">%d kali berturut-turut</string>
+  <string name="daily_streak">jumlah runtunan: %d</string>
   <string name="todo_has_duedate">Tugas memiliki Tenggat Waktu</string>
   <string name="battle_gear">Perlengkapan Bertarung</string>
   <string name="costume">Kostum</string>
   <string name="outfit_head">Kepala</string>
-  <string name="outfit_headAccessory">Aksesoris Kepala</string>
+  <string name="outfit_headAccessory">Aksesori Kepala</string>
   <string name="outfit_eyewear">Aksesori Mata</string>
   <string name="outfit_armor">Baju Perang</string>
   <string name="outfit_back">Punggung</string>
@@ -237,13 +265,8 @@
   <string name="equipped">Digunakan</string>
   <string name="quest_cancel_message">Apakah kamu yakin kamu ingin membatalkan misi ini? Semua undangan yang disetujui akan hilang. Pemilik misi akan mendapatkan gulungan misi kembali.</string>
   <string name="quest.invitation">Undangan Misi</string>
-    <string name="quest.invitation.text">Kamu telah diundang untuk berpartisipasi dalam misi!</string>
-  <string name="ago_1day">1 hari yang lalu</string>
-  <string name="ago_days">%d hari yang lalu</string>
-  <string name="ago_1Minute">1 menit yang lalu</string>
-  <string name="ago_minutes">%d menit yang lalu</string>
-  <string name="ago_hours">%d jam yang lalu</string>
-  <string name="ago_1hour">1 jam yang lalu</string>
+  <string name="quest_begin_message">Apakah kamu yakin? Hanya %1$d dari %2$d anggota Party-mu yang sudah ikut misi ini! Misi dimulai secara otomatis ketika semua pemain telah ikut atau menolak undangannya.</string>
+  <string name="quest.invitation.text">Kamu telah diundang untuk berpartisipasi dalam misi!</string>
   <string name="today">Hari Ini</string>
   <string name="sidebar_items">Item</string>
   <string name="eggs">Telur</string>
@@ -252,44 +275,48 @@
   <string name="quests">Misi</string>
   <string name="pets">Peliharaan</string>
   <string name="mounts">Tunggangan</string>
-  <string name="armoireEquipment">Kamu menemukan perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
+  <string name="armoireEquipment">Kamu menemukan Perlengkapan langka di dalam Peti Harta Karun: %s! Keren!</string>
   <string name="armoireFood">Kamu mengacak-acak Peti Harta Karun dan menemukan %2$s %1$s. Kenapa berada di dalam sini, ya?</string>
   <string name="armoireExp">Kamu bergulat dengan Peti Harta Karun dan mendapatkan Pengalaman. Rasakan itu!</string>
-  <string name="armoireNotesFull">Buka Peti Harta Karun untuk mendapatkan perlengkapan spesial, Pengalaman, atau makanan secara acak! Perlengkapan yang tersisa: %d</string>
-  <string name="armoireLastItem">Kamu menemukan perlengkapan terakhir di dalam Peti Harta Karun.</string>
-  <string name="armoireNotesEmpty">Peti Harta Karun akan memiliki perlengkapan baru pada minggu pertama setiap bulan. Sementara itu, tetaplah klik untuk mendapatkan Pengalaman dan Makanan!</string>
+  <string name="armoireNotesFull">Buka Peti Harta Karun untuk mendapatkan Perlengkapan spesial, Pengalaman, atau makanan secara acak! Perlengkapan yang tersisa: %d</string>
+  <string name="armoireLastItem">Kamu menemukan Perlengkapan terakhir di dalam Peti Harta Karun.</string>
+  <string name="armoireNotesEmpty">Peti Harta Karun akan memiliki Perlengkapan baru pada minggu pertama setiap bulan. Sementara itu, tetaplah klik untuk mendapatkan Pengalaman dan Makanan!</string>
   <string name="sell">Jual (%d Emas)</string>
   <string name="hatch_with_potion">Tetaskan dengan ramuan</string>
   <string name="feed_to_pet">Beri makan peliharaan</string>
   <string name="hatch_egg">Tetaskan dengan telur</string>
-  <string name="invite_party">Undang teman</string>
+  <string name="invite_party">Undang party</string>
   <string name="dialog_feeding">Beri makan %2$s %1$s dengan:</string>
   <string name="use_animal">Gunakan</string>
   <string name="feed">Beri makan</string>
   <string name="hatch_with">Tetaskan dengan %s</string>
   <string name="hatched_pet_title">Kamu menetaskan seekor %2$s %1$s!</string>
-  <string name="evolved_pet_title">Kamu telah menjinakkan %2$s %1$s, kini kamu dapat menungganginya!</string>
   <string name="close">Tutup</string>
   <string name="share">Bagikan</string>
-  <string name="notification_pet_fed">Kamu memberi makan %2$s %1$s !</string>
-  <string name="sectionpets">Peliharaan Dasar</string>
-  <string name="sectionpremiumPets">Peliharaan Ramuan Ajaib</string>
-  <string name="sectionquestPets">Peliharaan Misi</string>
-  <string name="sectionspecialPets">Peliharaan Langka</string>
-  <string name="sectionmounts">Tunggangan Dasar</string>
-  <string name="sectionpremiumMounts">Tunggangan Ramuan Ajaib</string>
-  <string name="sectionquestMounts">Tunggangan Misi</string>
-  <string name="sectionspecialMounts">Tunggangan Langka</string>
+  <string name="notification_pet_fed">Kamu memberi makan %2$s %1$s!</string>
+  <string name="notification_purchase">%s telah dibeli</string>
+  <string name="notification_purchase_reward">Kamu membeli sebuah hadiah</string>
+  <string name="sectionpets">Standard</string>
+  <string name="sectionpremiumPets">Ramuan Ajaib</string>
+  <string name="sectionquestPets">Misi</string>
+  <string name="sectionspecialPets">Langka</string>
+  <string name="sectionmounts">Standard</string>
+  <string name="sectionpremiumMounts">Ramuan Ajaib</string>
+  <string name="sectionquestMounts">Misi</string>
+  <string name="sectionspecialMounts">Langka</string>
   <string name="world_quest">Misi Dunia</string>
-  <string name="inn_description">Beristirahat di dalam Penginapan untuk mencegah Keseharian yang belum selesai menyakitimu semalaman! (Catatan: tidak dapat mencegahmu mendapatkan serangan Bos Monster.)</string>
+  <string name="inn_description">Perlu istirahat? Masuk ke dalam Penginapan Daniel untuk sementara menghentikan mekanika game Habitica yang lebih susah:\n\n
+• Keseharian yang terlewat tidak akan menyakitimu\n
+• Tugas tidak akan putus runtunannya atau berkurang warnanya\n
+• Boss tidak akan menyerangmu untuk Keseharian yang terlewat\n
+• Damage-mu kepada Boss atau item misi mengumpulkanmu akan tetap menunggu hingga kamu keluar</string>
   <string name="empty_items">Kamu tidak memiliki %s</string>
-  <string name="user_level">LVL %d</string>
-  <string name="user_level_with_class">LVL %1$d - %2$s</string>
-  <string name="warrior">Prajurit</string>
-  <string name="rogue">Perampok</string>
-  <string name="mage">Penyihir</string>
-  <string name="healer">Penyembuh</string>
-  <string name="warrior_description">Prajurit mendapatkan skor lebih dan \'serangan kritis\' lebih baik, yang akan secara acak memberikan bonus Emas, Pengalaman, dan kesempatan menemukan item saat menyelesaikan tugas. Mereka juga memberikan serangan berat kepada bos monster. Mainkan Perampok jika kamu termotivasi dengan hadiah bergaya jackpot yang sulit diprediksi, atau ingin memberikan serangan besar kepada bos misi!</string>
+  <string name="user_level">Lvl %d</string>
+  <string name="user_level_with_class">Lvl %1$d %2$s</string>
+  <string name="warrior">Warrior</string>
+  <string name="rogue">Rogue</string>
+  <string name="mage">Mage</string>
+  <string name="healer">Healer</string>
   <string name="mage_description">Penyihir belajar dengan cepat, mendapatkan Pengalaman dan Level lebih cepat daripada kelas lainnya. Mereka juga mendapatkan Mana yang besar dengan menggunakan kemampuan spesial. Mainkan penyihir jika kamu menyukai aspek taktis dari permainan Kebiasaan, atau jika kamu begitu termotivasi dengan meningkatkan level dan membuka fitur baru!</string>
   <string name="rogue_description">Perampok senang mengumpulkan kekayaan, mendapatkan banyak Emas daripada yang lainnya, dan mahir menemukan item acak. Kemampuan Bersembunyi mereka yang terkenal membuat mereka mampu menghindari konsekuensi dari Keseharian yang terlewat. Mainkan Perampok jika kamu termotivasi dengan Hadiah dan Pencapaian, juga mendapatkan banyak barang jarahan dan lencana!</string>
   <string name="healer_description">Penyembuh tahan terhadap serangan, dan dapat membagi perlindungannya pada sesama. Keseharian yang terlewat dan kebiasaan buruk tidak terlalu banyak mengganggu mereka, dan mereka memiliki cara untuk mengembalikan nyawa dari kesalahan mereka. Mainkan seorang Penyembuh jika kamu senang membantu teman dalam kelompok, atau ide mencurangi kematian dengan kerja keras membuatmu terinspirasi!</string>
@@ -303,7 +330,7 @@
   <string name="dialog_go_back">Kembali</string>
   <string name="opt_out_confirmation">Apakah kamu yakin kamu ingin mematikan fitur?</string>
   <string name="change_class">Ganti profesi</string>
-  <string name="change_class_description">Ubah kelasmu dan terima kembali nilai atribut sebanyak 3 permata. Kamu bisa menempatkan nilai atribut melalui laman web</string>
+  <string name="change_class_description">Ubah kelasmu dan terima kembali poin atribut seharga 3 Permata.</string>
   <string name="enable_class">Aktifkan Sistem Profesi</string>
   <string name="changing_class_progress">Ganti Profesi</string>
   <string name="by_email">Melalui Email</string>
@@ -317,6 +344,7 @@
   <string name="email">Email</string>
   <string name="invite_users">Undang sebagai Teman</string>
   <string name="share_using">Bagikan dengan</string>
+  <string name="share_levelup">Aku mencapai level %d di Habitica dengan memperbaiki kebiasaanku di kehidupan nyata!</string>
   <string name="share_hatched">Saya menetaskan peliharaan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya! </string>
   <string name="share_raised">Saya baru mendapatkan tunggangan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya!</string>
   <string name="open_in_store">Buka di Play Store</string>
@@ -328,10 +356,13 @@
   <string name="market">Pasar</string>
   <string name="timeTravelers">Penjelajah Waktu</string>
   <string name="seasonalShop">Toko Musiman</string>
-  <string name="empty_inbox">Kamu tidak memiliki pesan dalam Kotak Masuk. Kamu bisa mengirim pesan baru ke pengguna lain melalui pesan publik!</string>
+  <string name="empty_inbox">Kamu tidak punya pesan apapun. Kamu bisa mengirim pesan baru ke pengguna lain dari obrolan publik mereka!</string>
   <string name="party_invite">Buka dengan mengundang teman</string>
+  <string name="login_incentive">Buka dengan cara login ke Habitica secara teratur</string>
+  <string name="create_account">Buka dengan membuat sebuah akun</string>
   <string name="no_gold">Koin Emas tidak cukup</string>
   <string name="no_potion">Kamu tidak perlu membeli ramuan kesehatan</string>
+  <string name="successful_purchase">%1$s telah dibeli</string>
   <string name="purchase_confirmation_title">Pastikan belian</string>
   <string name="confirm_purchase_text">Membeli %1$s untuk %2$s %3$s</string>
   <string name="gem">Permata</string>
@@ -369,6 +400,7 @@
   <string name="all_dailies_completed">Anda telah menyelesaikan semua keseharianmu. Selamat!</string>
   <string name="widget_habit_button">Habitica Melakukan Kebiasaan</string>
   <string name="widget_dailies">Keseharian Habitica</string>
+  <string name="widget_todo_list">Daftar To-Do Habitica</string>
   <string name="widget_add_task">Habitica Menambahkan Tugas</string>
   <string name="google_services_missing">Google play services tidak dapat ditemukan.</string>
   <string name="gem.purchase.toolbartitle">Bayar</string>
@@ -391,4 +423,287 @@
   <string name="belongs_to_challenge">Milik Tantangan</string>
   <string name="has_reminder">Memiliki Pengingat</string>
   <string name="has_tag">Memiliki Label</string>
+  <string name="subscribe.title">Berlangganan mendukung para pengembang dan membantu menjaga Habitica terus berjalan</string>
+  <string name="subscribe_prompt">Jadilah seorang pelanggan dan kamu akan mendapat keuntungan berikut:</string>
+  <string name="subscribe.listitem1">Beli permata dengan koin emas</string>
+  <string name="subscribe.listitem2">Item bulanan eksklusif</string>
+  <string name="subscribe.listitem3">Simpan lebih banyak riwayat masukan</string>
+  <string name="subscribe.listitem4">Batas drop harian didobel</string>
+  <string name="subscriptions">Langganan</string>
+  <string name="subscription_duration">Berulang setiap %s</string>
+  <string name="subscribe">Berlangganan</string>
+  <string name="subscribe.listitem1.description">Alexander sang Saudagar akan menjual permata kepadamu masing-masing seharga 20 koin emas!\n\nPengiriman bulanannya dibatasi di 25 Permata per bulan, tapi bisa meningkat berdasarkan lama berlangganan-mu. \n\nBatasnya meningkat sebanyak 5 Permata setiap tiga bulan berturut-turut kamu berlangganan, hingga batas maksimal 50 Permata per bulan!</string>
+  <string name="subscribe.listitem2.description">Setiap bulan kamu akan menerima sebuah item kosmetik unik untuk avatarmu!\n\nPlus, setiap tiga bulan berturut-turut kamu berlangganan, sang Penjelajah Waktu Misterius akan memberimu akses kepada item kosmetik bersejarah (atau futuristik!).</string>
+  <string name="subscribe.listitem3.description">Buat To-Do yang telah diselesaikan dan riwayat tugas tersedia lebih lama.</string>
+  <string name="subscribe.listitem4.description">Dua kali lipat batas drop akan mengizinkanmu mendapat lebih banyak item untuk tugas yang terselesaikan setiap hari, membantumu melengkapi istalmu lebih cepat!</string>
+  <string name="subscribe1month.gemcap">Batas permata dimulai di 25</string>
+  <string name="subscribe3month.gemcap">Batas permata dinaikkan ke 30</string>
+  <string name="subscribe6month.gemcap">Batas permata dinaikkan ke 35</string>
+  <string name="subscribe12month.gemcap">Batas permata dinaikkan ke 45</string>
+  <string name="subscription_hourglasses">+%d Jam Pasir Mistis</string>
+  <string name="payment_method">Metode Pembayaran</string>
+  <string name="subscription">Langganan</string>
+  <string name="active">Aktif</string>
+  <string name="cancel_subscription">Batalkan Langganan</string>
+  <string name="cancel_subscription_google.description">Tidak mau berlangganan lagi? Kamu bisa menemukan opsi untuk berhenti berlangganan di bagin \"Aplikasi Saya\" dari Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle.description">Tidak mau berlangganan lagi? Karena metode pembayaranmu, kamu hanya bisa berhenti berlangganan dari situs Habitica. Klik tombol di bawah, untuk membuka situs Habitica di browsermu!</string>
+  <string name="visit_habitica_website">Kunjungi Situs Habitica</string>
+  <string name="current_bonuses">Bonus Sekarang</string>
+  <string name="months_subscribed">Bulan Berlangganan</string>
+  <string name="current_hourclasses">Jam Pasir Mistis Sekarang</string>
+  <string name="monthly_gem_cap">Batas permata bulanan</string>
+  <string name="inactive">Tidak aktif</string>
+  <string name="one_month">1 Bulan</string>
+  <string name="months">%d Bulan</string>
+  <string name="month">bulan</string>
+  <string name="three_months">3 bulan</string>
+  <string name="six_months">6 bulan</string>
+  <string name="twelve_months">12 bulan</string>
+  <string name="subscribe_prompt_thanks">Dengan Berlangganan kamu menerima keuntungan bermanfaat berikut:</string>
+  <string name="subscription_status">Status Langganan</string>
+  <string name="byLeader">oleh %s</string>
+  <string name="challenge_details">Detail Tantangan</string>
+  <string name="challenge_leave_title">Tinggalkan Tantangan</string>
+  <string name="challenge_leave_text">Apakah kamu yakin ingin meninggalkan Tantangan \"%s\"?</string>
+  <string name="challenge_remove_tasks_title">Hapus tugas</string>
+  <string name="challenge_remove_tasks_text">Apakah kamu mau menghapus tugas ini?</string>
+  <string name="remove_tasks">Hapus</string>
+  <string name="keep_tasks">Simpan</string>
+  <string name="my_challenges">Tantangan Saya</string>
+  <string name="public_challenges">Publik</string>
+  <string name="challenges">Tantangan</string>
+  <string name="daily">Keseharian</string>
+  <string name="habit">Kebiasaan</string>
+  <string name="reward">Hadiah</string>
+  <string name="todo">To-Do</string>
+  <string name="official">Resmi</string>
+  <string name="participating">Berpartisipasi</string>
+  <string name="challenge">Tantangan</string>
+  <string name="go_to_challenge">Pergi ke Tantangan</string>
+  <string name="not_part_of_a_challenge">Kamu tidak mengambil bagian dalam Tantangan apapun saat ini!</string>
+  <string name="join_a_challenge">Ikut sebuah tantangan untuk menambahkan sekumpulan tugas yang telah didesain secara khusus, lalu bersainglah dengan sesama Habitican untuk memenangkan sebuah pencapaian dan bahkan permata!</string>
+  <string name="check_the_public_challenge_tab">Tekan tab \"Publik\" untuk menemukan Tantangan buatan pengguna yang paling cocok untukmu!</string>
+  <string name="add_reminder">Tambahkan Pengingat</string>
+  <string name="warning">Peringatan</string>
+  <string name="open_settings">Buka Pengaturan</string>
+  <string name="dont_keep_activities_warning">Sepertinya kamu mengaktifkan opsi PEngembang \\"Jangan menyimpan Aktifitas\\". Saat ini opsi ini menyebabkan isu dengan aplikasi Habitica, jadi kami sarankan untuk menonaktifkannya.</string>
+  <string name="inbox">Pesan</string>
+  <string name="FAQ">Pertanyaan yang Sering Ditanyakan</string>
+  <string name="special">Spesial</string>
+  <string name="gem_for_gold_description">Karena kamu berlangganan Habitica, kamu bisa membeli sejumlah Permata setiap bulan menggunakan Koin Emas.</string>
+  <string name="limited_count">%d tersisa</string>
+  <string name="gem_shop">Permata</string>
+  <string name="mystery_item">Item Misterius</string>
+  <string name="myster_item_notes">Setiap bulan, pelanggan akan menerima sebuah item misterius. Ini biasanya dirilis sekitar seminggu sebelum akhir bulan.</string>
+  <string name="open">Buka</string>
+  <string name="notification_mystery_item">Kamu membuka kotak ini dan menemukan %s!</string>
+  <string name="checkInRewardEarned">Kamu mendapatkan %1$s sebagai hadiah untuk kesetiaanmu untuk memperbaiki hidupmu.</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Hadiahmu selanjutnya akan terbuka setelah %1$d kali Cek In</string>
+  <string name="pending_approval">menunggu persetujuan</string>
+  <string name="filters">Filter</string>
+  <string name="done">Selesai</string>
+  <string name="group_tasks_edit_description">Tugas grup tidak bisa disunting.</string>
+  <string name="group_tasks_edit_title">Tidak bisa menyunting tugas ini</string>
+  <string name="groups">Grup</string>
+  <string name="all">Semua</string>
+  <string name="none">Tidak Ada</string>
+  <string name="owned">Dimiliki</string>
+  <string name="not_owned">Tidak Dimiliki</string>
+  <string name="new_game">Permainan\nBaru</string>
+  <string name="login_btn_fb">Login dengan Facebook</string>
+  <string name="login_btn_google">Login dengan Google</string>
+  <string name="action_back">Kembali</string>
+  <string name="randomize">Sembarang</string>
+  <string name="avatar_extras">Tambahan</string>
+  <string name="avatar_skin_color">Warna Kulit</string>
+  <string name="avatar_hair_color">Warna Rambut</string>
+  <string name="avatar_hair_bangs">Poni</string>
+  <string name="avatar_hair_ponytail">Kucir</string>
+  <string name="avatar_glasses">Kacamata</string>
+  <string name="avatar_wheelchair">Kursi Roda</string>
+  <string name="weak">Lemah</string>
+  <string name="strong">Kuat</string>
+  <string name="gray">Abu-Abu</string>
+  <string name="dated">Terjadwal</string>
+  <string name="completed">Selesai</string>
+  <string name="setuP_group_other">Lainnya</string>
+  <string name="clear">Hapus</string>
+  <string name="empty_title_habits">Kamu tidak punya Kebiasaan apapun</string>
+  <string name="empty_description_habits">Kebiasaan adalah tugas yang tidak memerlukan jadwal ketat. Kamu bisa menyelesaikannya beberapa kali sehari, atau tidak sama sekali.</string>
+  <string name="empty_title_dailies">Kamu tidak punya Keseharian apapun</string>
+  <string name="empty_description_dailies">Keseharian adalah tugas yang berulang setiap waktu tertentu secara teratur. Pilih jadwal yang bekerja untukmu!</string>
+  <string name="empty_title_todos">Kamu tidak punya To-Do apapun</string>
+  <string name="empty_description_todos">To-Do adalah tugas yang hanya perlu diselesaikan sekali. Tambahkan ceklis kepada To-Do-mu untuk meningkatkan harganya.</string>
+  <string name="empty_title_rewards">Kamu tidak punya Hadiah apapun</string>
+  <string name="reset_walkthrough">Ulang Panduan Justin</string>
+  <string name="read_community_guidelines">Tolong baca Pedoman Komunitas kami sebelum posting</string>
+  <string name="maintenance">Perbaikan</string>
+  <string name="reload_content">Muat Ulang Isi</string>
+  <string name="dailyDueDefaultView">Atur Keseharian secara otomatis di tab \'harus dikerjakan\'</string>
+  <string name="dailyDueDefaultViewDescription">Dengan opsi ini dipilih, tugas Keseharianmu akan secara otomatis di tab \'harus dikerjakan\' dan bukan \'semua\'</string>
+  <string name="repeat_summary">Diulang %1$s setiap %2$s%3$s%4$s</string>
+  <string name="no_billing_gems">Perangkatmu tidak punya metode pembayaran terdukung apapun. Silahkan gunakan situs Habitica jika kamu mau membeli permata.</string>
+  <string name="no_billing_subscriptions">Perangkatmu tidak punya metode pembayaran terdukung apapun. Silahkan gunakan situs Habitica jika kamu mau berlangganan.</string>
+  <string name="save">Simpan</string>
+  <string name="location">Lokasi</string>
+  <string name="tasks">Tugas</string>
+  <string name="challenge_create_error_enough_gems">Kamu tidak punya cukup Permata untuk membuat sebuah Tantangan.</string>
+  <string name="challenge_create_error_no_tasks">Kamu perlu menambah setidaknya sebuah tugas untuk membuat Tantangan ini.</string>
+  <string name="challenge_create_error_title">Kamu perlu sebuah judul untuk membuat Tantangan ini.</string>
+  <string name="description_optional">Deskripsi (tidak wajib)</string>
+  <string name="new_challenge_title">Judul tantangan baru</string>
+  <string name="ownership">Kepemilikan</string>
+  <string name="inn">Penginapan</string>
+  <string name="system">Sistem</string>
+  <string name="start_quest">Mulai Misi Baru</string>
+  <string name="leave_party">Tinggalkan Party</string>
+  <string name="party_description">Deskripsi Party</string>
+  <string name="abort_confirmation">Apakah kamu yakin ingin membatalkan misi ini? Ini akan membatalkannya untuk semua orang di Party dan semua progress akan hilang. Gulungan misi akan dikembalikan kepada pemilik misi tersebut.</string>
+  <string name="leave_quest_confirmation">Apakah kamu yakin ingin meninggalkan misi aktif ini? Semua progres misimu akan hilang.</string>
+  <string name="number_participants">%1$d Partisipan</string>
+  <string name="welcome_back">Selamat Datang Kembali</string>
+  <string name="yesterdaililes_prompt">Apakah kamu melakukan Keseharian berikut ini kemarin?</string>
+  <string name="start_day">Mulai Hariku</string>
+  <string name="leave_party_confirmation">Apakah kamu yakin ingin meninggalkan Party ini?</string>
+  <string name="nextPrizeUnlocksIn" formatted="false">Hadiah selanjutnya setelah %d kali Cek In</string>
+  <string name="pending">Menunggu</string>
+  <string name="accepted">Menerima</string>
+  <string name="declined">Menolak</string>
+  <string name="participants">Partisipan</string>
+  <string name="invitations">Undangan</string>
+  <string name="quest_leader_header" formatted="false">Dimulai oleh %s</string>
+  <string name="quest_abort_message">Apakah kamu yakin ingin membatalkan misi ini? Ini akan membatalkannya untuk semua orang di Party dan semua progress akan hilang. Gulungan misi akan dikembalikan kepada pemilik misi tersebut.</string>
+  <string name="reloading_content">Memuat Ulang Isi</string>
+  <string name="thousand_abbrev">rb</string>
+  <string name="million_abbrev">jt</string>
+  <string name="billion_abbrev">mil</string>
+  <string name="your_balance">Saldomu:</string>
+  <string name="available_until" formatted="false">Tersedia hingga %s</string>
+  <string name="gems_left_max" formatted="false">Permata Bulanan: %1$d/%2$d Tersisa</string>
+  <string name="gems_left_nomax" formatted="false">Permata Bulanan: %d Tersisa</string>
+  <string name="health">Nyawa</string>
+  <string name="collect">Kumpulkan</string>
+  <string name="rage_meter">Tingkat Kemarahan</string>
+  <string name="boss_quest">Misi Boss</string>
+  <string name="collection_quest">Misi Mengumpulkan</string>
+  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+  <string name="experience_reward" formatted="false">%d poin Pengalaman</string>
+  <string name="gold_reward" formatted="false">%d Koin Emas</string>
+  <string name="quest_owner_rewards">Hadiah Pemilik Misi</string>
+  <string name="str_abbrv">Kek</string>
+  <string name="per_abbrv">Per</string>
+  <string name="int_abbrv">Kec</string>
+  <string name="con_abbrv">Ket</string>
+  <string name="reset_account">Reset Akun</string>
+  <string name="delete_account">Hapus Akun</string>
+  <string name="delete_account_description">Apakah kamu yakin? Ini akan menghapus akunmu untuk selamanya, dan tidak akan bisa dikembalikan! Kamu perlu mendaftarkan akun baru untuk menggunakan Habitica lagi. Permata di bank atau yang telah digunakan tidak akan diuangkan kembali. Jika kamu sepenuhnya yakin, ketik kata sandimu di kotak teks di bawah.</string>
+  <string name="reset_account_confirmation">reset akun-ku</string>
+  <string name="delete_account_confirmation">hapus akunku</string>
+  <string name="danger_zone">Zona Berbahaya</string>
+  <string name="nevermind">Tidak jadi</string>
+  <string name="resetting_account">Me-reset Akun</string>
+  <string name="deleting_account">Menghapus Akun</string>
+  <string name="insufficientGold">Kamu perlu menyelesaikan lebih banyak tugas sebelum bisa membeli item ini!</string>
+  <string name="insufficientGems">Kamu perlu lebih banyak Permata untuk membeli item ini!</string>
+  <string name="purchase_gems">Beli permata</string>
+  <string name="insufficientHourglasses">Kamu perlu lebih banyak Jam Pasir Mistis untuk membeli item ini!</string>
+  <string name="get_hourglasses">Dapatkan jam pasir</string>
+  <string name="subscribe_for_hourglasses">Berlangganan untuk Jam Pasir</string>
+  <string name="timetravelers_closed_description">Dapatkan satu Jam Pasir Mistis setiap tiga bulan berturut-turut kamu berlangganan, lalu gunakan untuk membuka item-item edisi terbatas, peliharaan, dan tunggangan dari masa lalu... dan masa depan!</string>
+  <string name="want_to_subscribe">Aku mau Berlangganan</string>
+  <string name="seasonal_closed_description">Grand Gala diadakan dekat dengan titik balik matahari dan ekuinoks, jadi cek kembali nanti untuk menemukan sekumpulan seru item musiman yang spesial!</string>
+  <string name="come_back_soon">Datang kembali nanti!</string>
+  <string name="level">Level</string>
+  <string name="streak_label">Rentetan 21 Hari</string>
+  <string name="stats">Status</string>
+  <string name="fix_character_description">Jika kamu menemukan sebuah gangguan atau melakukan kesalahan yang mengubah karaktermu secara tidak adil, kamu bisa memperbaiki angka-angka tersebut secara manual di sini.</string>
+  <string name="fix_character_values">Atur Angka Karakter</string>
+  <string name="saving">Menyimpan</string>
+  <string name="forgot_password_title">Email sebuah Tautan Mengatur Ulang Kata Sandi</string>
+  <string name="forgot_password_description">Masukan alamat email yang kamu gunakan untuk mendaftarkan akun Habitica-mu.</string>
+  <string name="forgot_password_confirmation">Jika kami punya data email-mu, instruksi untuk mengatur kata sandi baru telah dikirim ke email-mu.</string>
+  <string name="ok">OK</string>
+  <string name="profile">Profil</string>
+  <string name="profile_summary">Sunting profil publikmu.</string>
+  <string name="display_name">Nama Tampilan</string>
+  <string name="photo_url">Tautan Foto</string>
+  <string name="login_name">Nama Login</string>
+  <string name="about">Tentang</string>
+  <string name="app_settings">Pengaturan Aplikasi</string>
+  <string name="authentication">Autentikasi</string>
+  <string name="authentication_summary">Ganti opsi autentikasi-mu.</string>
+  <string name="change_password">Ganti Kata Sandi</string>
+  <string name="change_email">Ganti Alamat Email</string>
+  <string name="change_login_name">Ganti Nama Login</string>
+  <string name="change">Ganti</string>
+  <string name="character_level">Level Karakter</string>
+  <string name="auto_allocate_points">Pembagian Poin Otomatis</string>
+  <string name="stat_guide">Panduan Status</string>
+  <string name="character_build">Bentuk Tubuh Karakter</string>
+  <string name="character_build_description">Setiap level memberimu sebuah poin untuk ditaruh kepada sebuah atribut pilihanmu. Kamu bisa melakukannya secara manual, atau biarkan game ini mengaturnya untukmu menggunakan salah satu opsi Pembagian Otomatis.</string>
+  <string name="strength">Kekuatan</string>
+  <string name="strength_description">Meningkatkan bonus dari serangan kritikal dan buat itu lebih sering terjadi sewaktu menyelesaikan tugas. Juga meningkatkan damage yang kamu lakukan kepada boss.</string>
+  <string name="intelligence">Kecerdasan</string>
+  <string name="intelligence_description">Meningkatkan EXP yang dihasilkan dari menyelesaikan tugas. Juga meningkatkan batas mana-mu dan seberapa cepat mana bertambah dari waktu ke waktu.</string>
+  <string name="constitution">Ketahanan</string>
+  <string name="constitution_description">Mengurangi jumlah damage yang kamu terima dari tugasmu. Tidak mengurangi damage yang diterima dari boss.</string>
+  <string name="perception">Persepsi</string>
+  <string name="perception_description">Meningkatkan kecenderungan untuk menemukan item sewaktu menyelesaikan Tugas, batas drop harian, Bonus Rentetan, dan jumlah koin emas yang dihadiahkan dari Tugas.</string>
+  <string name="buffs">Buff</string>
+  <string name="allocated">Teralokasi</string>
+  <string name="distribute_evenly">Bagikan Merata</string>
+  <string name="distribute_class">Bagikan berdasarkan pekerjaan</string>
+  <string name="distribute_task">Bagikan berdasarkan aktifitas tugas</string>
+  <string name="no_points_to_allocate">Tidak ada Poin untuk Dibagikan</string>
+  <string name="points_to_allocate" formatted="false">%d Poin untuk Dibagikan</string>
+  <string name="distribute_evenly_help">Bagikan jumlah poin yang sama kepada setiap atribut.</string>
+  <string name="distribute_class_help">Bagikan lebih banyak poin kepada atribut yang penting untuk Pekerjaanmu.</string>
+  <string name="distribute_task_help">Bagikan poin berdasarkan kepada kategori Kekuatan, Kecerdasan, Ketahanan, dan Persepsi yang dihubungkan kepada tugas yang kamu selesaikan.</string>
+  <string name="allocating_points">Membagikan Poin</string>
+  <string name="class_equipment">Perlengkapan</string>
+  <string name="equipment_empty">Kamu sudah punya semua perlengkapan! Lebih banyak lagi tersedia sewaktu Grand Gala, dekat titik balik matahari dan ekuinoks.</string>
+  <string name="classless">Tanpa Pekerjaan</string>
+  <string name="class_equipment_shop_dialog">Item ini hanya tersedia untuk pekerjaan tetentu. \nKamu bisa menggantu pekerjaanmu dari Pengaturan.</string>
+  <string name="class_gear_disclaimer">Kamu hanya bisa membeli perlengkapan untuk pekerjaanmu yang sekarang</string>
+  <string name="available_stats" formatted="false">%d poin</string>
+  <string name="toogle_emojis">Atur Emoji</string>
+  <string name="tavern_description">Selamat datang di Penginapan! Tarik kursi dan mari mengobrol, atau beristirahat dari tugas-tugasmu.</string>
+  <string name="check_into_inn">Masuk ke Penginapan</string>
+  <string name="community_guidelines">Pedoman Komunitas</string>
+  <string name="view_community_guidelines">Lihat Pedoman Komunitas</string>
+  <string name="guidelines_description">Habitica coba membuat sebuah lingkungan yang ramah untuk pengguna segala usia dan latar belakang, khususnya di tempat umum seperti Kedai Minuman. Jika kamu ada pertanyaan, silahkan periksa pedoman kami.</string>
+  <string name="helpful_links">Tautan Berguna</string>
+  <string name="view_faq">Lihat FAQ</string>
+  <string name="report_bug">Laporkan Gangguan</string>
+  <string name="player_tiers">Tingkatan Pemain</string>
+  <string name="staff_moderators">Staf dan Moderator</string>
+  <string name="navigation_drawer_open">Buka laci navigasi</string>
+  <string name="navigation_drawer_close">Tutup laci navigasi</string>
+  <string name="world_boss">Bos Dunia</string>
+  <string name="world_boss_art">Seni Bos</string>
+  <string name="boss_art">Seni Bos</string>
+  <string name="world_boss_description">Deskripsi Bos Dunia</string>
+  <string name="rage_strike_count" formatted="false">Tingkat Kemarahan 1%d/1%d</string>
+  <string name="pending_strike_description">Serangan ini belum terjadi!\nWorld Boss akan mengamuk dan menyerang salah satu dari penjaga toko bersahabat kita sewaktu tingkat kemarahannya telah penuh. Kerjakan sebanyak mungkin Keseharian-mu untuk mencoba mencegah serangan itu!</string>
+  <string name="pending_strike_title">Serangan Tertunda</string>
+  <string name="strike_description_title">Apakah itu Tingkatan Kemarahan?</string>
+  <string name="strike_description_subtitle">Ada 3 potensi Serangan peningkat Kemarahan</string>
+  <string name="strike_description_description">Pengukur ini terisi sewaktu Habitican tidak menyelesaikan Keseharian mereka. Sewaktu terisi penuh, sang DysHeartener akan mengerahkan Shattering Heartbreak kepada salah satu dari penjaga toko Habitica, jadi pastikan kamu melakukan tugas-tugasmu!</string>
+  <string name="pending_strike_subtitle">Serangan ini belum terjadi!</string>
+  <string name="strike_active_title" formatted="false">Sang %s telah Diserang!</string>
+  <string name="strike_active_subtitle" formatted="false">%s sekarang Patah Hati!</string>
+  <string name="strike_active_description" formatted="false">%s kita yang tercinta hancur sewaktu sang %s meremukkan %s. Cepat, kalahkan tugas-tugasmu untuk mengalahkan sang monster dan bantu membangun kembali!!</string>
+  <string name="questShop">Toko Misi</string>
+  <string name="market_owner_long">Alex sang Pedagang</string>
+  <string name="tavern_owner_long">Daniel sang penjaga penginapan</string>
+  <string name="stable_owner_long">Matt sang penguasa hewan buas</string>
+  <string name="hide_boss_art">Sembunyikan Seni Bos</string>
+  <string name="active_world_boss">Bos Dunia aktif</string>
+  <string name="no_party_description">Selesaikan misi bersama teman-temanmu atau sendirian. Bertarung melawan monster, buat Tantangan, dan bantu dirimu untuk tetap bertanggung jawab melalui Party.</string>
+  <string name="no_party_title">Mainkan Habitica dalam Party</string>
+  <string name="join_party_title">Ingin bergabung ke Party?</string>
+  <string name="create_party_website">Buka website untuk membuat Party</string>
+  <string name="id_copied">ID tersalin ke clipboard</string>
+  <string name="insufficientSubscriberGems">Kamu telah membeli semua Permata yang tersedia bulan ini. Lebih banyak akan ditambahkan dalam tiga hari pertama pada setiap bulan. Terima kasih sudah berlangganan!</string>
+  <string name="insufficientSubscriberGemsTitle">Batas Permata Bulanan Telah Tercapai</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.profile.xml b/Habitica/res/values-it/strings.profile.xml
index fdf0bbf76..1d410af8b 100644
--- a/Habitica/res/values-it/strings.profile.xml
+++ b/Habitica/res/values-it/strings.profile.xml
@@ -2,7 +2,8 @@
 <resources>
     <string name="profile_pets_and_mounts">Animali e cavalcature</string>
     <string name="profile_pets_found">Animali trovati</string>
-    <string name="profile_mounts_tamed">Cavalcature domate</string>
+    <string name="profile_mounts_tamed">Cavalcature addomesticate</string>
+    <string name="profile_loading_data">Caricamento dati utente...</string>
     <string name="profile_send_message_to">Invia messaggio a %s</string>
     <string name="profile_message_sent_to">Messaggio inviato a %s</string>
     <string name="profile_level">Livello:</string>
diff --git a/Habitica/res/values-it/strings.tutorial.xml b/Habitica/res/values-it/strings.tutorial.xml
index 49a461abb..278738393 100644
--- a/Habitica/res/values-it/strings.tutorial.xml
+++ b/Habitica/res/values-it/strings.tutorial.xml
@@ -1,10 +1,10 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_overview">Eccoci qui! Ho creato alcune attività per te basate sui tuoi interessi. Prova ad aggiungerne qualcuna anche tu. Puoi modificare un\'attività toccando il titolo.</string>
+  <string name="tutorial_overview">Eccoci qui! Ho creato alcune attività per te basate sui tuoi interessi. Prova ad aggiungerne qualcuna anche tu. Puoi modificare un\'attività toccando il suo titolo.</string>
   <string name="tutorial_habits_1">Per prima cosa ci sono le Abitudini. Possono essere Abitudini positive che vuoi migliorare o Abitudini negative che vuoi abbandonare.</string>
   <string name="tutorial_habits_2">Ogni volta che porti a termine un\'abitudine positiva, tocca il + per ottenere esperienza ed oro!</string>
-  <string name="tutorial_habits_3">Se ti fai tentare da un\'abitudine negativa, toccando - il tuo avatar perderà punti salute, per aiutarti a non farlo di nuovo.</string>
-  <string name="tutorial_habits_4">Ora prova te! Puoi trovare gli altri tipi di attività usando la barra di navigazione in basso.</string>
+  <string name="tutorial_habits_3">Se ti fai tentare da un\'abitudine negativa, toccando - (il simbolo del meno) il tuo avatar perderà punti salute, per ricordarti di fare attenzione.</string>
+  <string name="tutorial_habits_4">Ora provaci tu! Puoi trovare gli altri tipi di attività usando la barra di navigazione in basso.</string>
   <string name="tutorial_dailies_1">Crea Daily per attività che devono essere svolte periodicamente.</string>
   <string name="tutorial_dailies_2">Sta attento - se te ne salti una il tuo avatar subirà dei danni durante la notte. Completarle con regolarità ti farà ottenere grandi premi!</string>
   <string name="tutorial_todos_1">Usa le To-do per tenere traccia delle cose che devi fare solo una volta.</string>
@@ -19,4 +19,5 @@
   <string name="tutorial_party">Qui è dove tu e i tuoi amici potete motivarvi a vicenda e combattere i mostri con le vostre attività!</string>
   <string name="tutorial_tavern">Benvenuto nella Taverna, una chat pubblica per tutte le età! Qui puoi chiacchierare e fare delle domande. Divertiti!</string>
   <string name="tutorial_classes">Scegli di diventare un Guerriero, un Mago, un Guaritore o un Assassino! Ogni classe ha equipaggiamento ed abilità uniche. Tocca (?) per saperne di più!</string>
+  <string name="tutorial_stats">Premi sul bottone grigio per assegnare un sacco di punti stat in una volta, oppure usa le frecce per aggiungere un punto alla volta.</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 7ca130aa9..2fdd5a92e 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -115,12 +115,9 @@
   <string name="friday">Venerdì</string>
   <string name="saturday">Sabato</string>
   <string name="sunday">Domenica</string>
-  <string name="levelup_header">Nuovo livello!</string>
-  <string name="levelup_detail">Raggiungendo obiettivi nella vita reale, sei salito al Livello %1$d!</string>
-  <string name="levelup_health">Sei stato completamente curato!</string>
   <string name="levelup_button">Urrà!</string>
   <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_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">Ripristina Salute &amp; Riprova</string>
   <string name="filter">Filtro</string>
@@ -130,7 +127,7 @@
   <string name="used_skill_without_mana">Hai usato %1$s.</string>
   <string name="new_checklist_item">Nuovo elemento checklist</string>
   <string name="add_checklist_item">Aggiungi</string>
-  <string name="reminder_title">Ricorda di completare le tue Daily!</string>
+  <string name="reminder_title">Ricorda di completare le tue attività</string>
   <string name="skill_progress_title">Usando abilità...</string>
   <string name="coming_soon">Presto disponibile</string>
   <string name="chat_flag_confirmation">Vuoi davvero segnalare questo messaggio per violazione?</string>
@@ -270,11 +267,12 @@
   <string name="equipped">Equipaggiato</string>
   <string name="quest_cancel_message">Vuoi davvero annullare questa missione? Tutti gli inviti accettati andranno persi. Il proprietario della missione tornerà in possesso della Pergamena.</string>
   <string name="quest.invitation">Invito Missione</string>
-    <string name="quest.invitation.text">Sei stato invitato a partecipare ad una missione!</string>
+  <string name="quest_begin_message">Sei sicuro? Solo %1$d dei tuoi %2$d compagni di squadra si sono uniti alla missione! Le missioni partono automaticamente quando tutti i giocatori hanno accettato o rifiutato l\'invito.</string>
+  <string name="quest.invitation.text">Sei stato invitato a partecipare ad una missione!</string>
   <string name="ago_1day">1 giorno fa</string>
   <string name="ago_days">%d giorni fa</string>
-  <string name="ago_1Minute">1 minuto fa</string>
-  <string name="ago_minutes">%d minuti fa</string>
+  <string name="ago_1Minute">1 min. fa</string>
+  <string name="ago_minutes">%d min. fa</string>
   <string name="ago_hours">%d ore fa</string>
   <string name="ago_1hour">1 ora fa</string>
   <string name="today">Oggi</string>
@@ -301,22 +299,26 @@
   <string name="feed">Dai da mangiare</string>
   <string name="hatch_with">Fai nascere un animale con %s</string>
   <string name="hatched_pet_title">È nato un %2$s %1$s!</string>
-  <string name="evolved_pet_title">Hai appena addomesticato %2$s %1$s, andiamo a farci un giro!</string>
+  <string name="evolved_pet_title">Hai domato %1$s%2$s, inizia a cavalcare!</string>
   <string name="close">Chiudi</string>
   <string name="share">Condividi</string>
   <string name="notification_pet_fed">Hai dato da mangiare al tuo %1$s %2$s!</string>
   <string name="notification_purchase">Hai comprato %s</string>
   <string name="notification_purchase_reward">Hai comprato una ricompensa</string>
-  <string name="sectionpets">Animali base</string>
-  <string name="sectionpremiumPets">Animali Pozione Magica</string>
-  <string name="sectionquestPets">Animali Missione</string>
-  <string name="sectionspecialPets">Animali rari</string>
-  <string name="sectionmounts">Cavalcature base</string>
-  <string name="sectionpremiumMounts">Calvalcature Pozione Magica</string>
-  <string name="sectionquestMounts">Cavalcature Missione</string>
-  <string name="sectionspecialMounts">Cavalcature rare</string>
+  <string name="sectionpets">Base</string>
+  <string name="sectionpremiumPets">Pozione Magica</string>
+  <string name="sectionquestPets">Missione</string>
+  <string name="sectionspecialPets">Rari</string>
+  <string name="sectionmounts">Base</string>
+  <string name="sectionpremiumMounts">Pozione Magica</string>
+  <string name="sectionquestMounts">Missione</string>
+  <string name="sectionspecialMounts">Rare</string>
   <string name="world_quest">World Quest</string>
-  <string name="inn_description">Riposare nella Locanda impedisce alle tue Daily di danneggiarti al cambio di giorno! (Nota:  questo non impedisce di ricevere danni dai Boss)</string>
+  <string name="inn_description">Bisogno di una pausa ? Riposati alla locanda di Daniel per mettere in pausa le meccaniche di gioco più difficili di Habitica:\n\n
+• Le Daily non completate non faranno diminuire la tua salute\n
+• Le attività non perderanno serie e non cambieranno colore\n
+• I boss non ti attaccheranno per Daily non completate\n
+• I danni fatti ai boss e gli oggetti missione raccolta resteranno in attesa finché non uscirai dalla locanda</string>
   <string name="empty_items">Non hai alcun %s</string>
   <string name="user_level">LV %d</string>
   <string name="user_level_with_class">LV %1$d - %2$s</string>
@@ -324,7 +326,7 @@
   <string name="rogue">Assassino</string>
   <string name="mage">Mago</string>
   <string name="healer">Guaritore</string>
-  <string name="warrior_description">I Guerrieri possono eseguire un gran numero di \"colpi critici\" molto potenti, che forniscono un bonus di Oro ed Esperienza (e a volte degli oggetti) casualmente al completamento di una attività. Inoltre, infliggono ingenti danni ai mostri boss. Diventa un Guerriero se trovi accattivanti le imprevedibili ricompense in stile jackpot, o se vuoi dimenticarti del dolore durante le missioni boss!</string>
+  <string name="warrior_description">I Guerrieri possono eseguire un numero maggiore di \\"colpi critici\\" e con più potenza, che forniscono un bonus di Oro ed Esperienza (e a volte degli oggetti) casualmente al completamento di una attività. Inoltre, infliggono ingenti danni ai mostri Boss. Diventa un Guerriero se trovi accattivanti le imprevedibili ricompense in stile jackpot, o se vuoi dimenticarti del dolore durante le missioni Boss!</string>
   <string name="mage_description">I Maghi imparano più velocemente, guadagnano Esperienza e Livelli più velocemente delle altre classi. Hanno anche a loro disposizione molto mana per l\'utilizzo di abilità speciali. Utilizza il Mago se ti piace giocare tatticamente su Habit, o se sei fortemente motivato dal livellare e sbloccare opzioni aggiuntive!</string>
   <string name="rogue_description">Gli Assassini amano accumulare ricchezza: guadagnano più Oro di chiunque altro, e sono inclini al trovare oggetti casuali. La loro iconica abilità Furtività li rende in grado di prendersi gioco delle conseguenze delle Daily mancate. Diventa un Assassino se trovi una forte motivazione nelle Ricompense e nelle Medaglie, lottando per un bottino e dei riconoscimenti!</string>
   <string name="healer_description">I Guaritori resistono fortemente ai danni, ed estendono la loro protezione agli altri.
@@ -339,7 +341,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="dialog_go_back">Ritorna</string>
   <string name="opt_out_confirmation">Vuoi davvero rinunciare?</string>
   <string name="change_class">Cambia la tua classe</string>
-  <string name="change_class_description">Cambia classe e riottieni i tuoi punti attributo per 3 gemme. Puoi assegnare i punti attributo attraverso il sito web.</string>
+  <string name="change_class_description">Cambia classe e riottieni i tuoi punti attributo per 3 gemme.</string>
   <string name="enable_class">Abilita sistema delle classi</string>
   <string name="changing_class_progress">Cambiamento classe</string>
   <string name="by_email">Per e-mail</string>
@@ -365,8 +367,10 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="market">Mercato</string>
   <string name="timeTravelers">Viaggiatori del Tempo</string>
   <string name="seasonalShop">Negozio Stagionale</string>
-  <string name="empty_inbox">Non hai nessun messaggio. Puoi inviare un messaggio privato ad un utente dai loro messaggi nelle chat pubbliche!</string>
+  <string name="empty_inbox">Al momento non hai alcun messaggio. Puoi inviare un nuovo messaggio a un utente attraverso il loro profilo nelle chat pubbliche!</string>
   <string name="party_invite">Sblocca invitando amici</string>
+  <string name="login_incentive">Sblocca usando Habitica regolarmente</string>
+  <string name="create_account">Sblocca creando un account</string>
   <string name="no_gold">Non hai abbastanza Oro</string>
   <string name="no_potion">Non hai bisogno di comprare una pozione di salute</string>
   <string name="successful_purchase">Acquistato %1$s</string>
@@ -520,7 +524,6 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="login_btn_fb">Accedi con Facebook</string>
   <string name="login_btn_google">Accedi con Google</string>
   <string name="action_back">Indietro</string>
-  <string name="welcome_text">Oh, devi essere nuovo da queste parti. Mi chiamo Justin, e sarò la tua guida qui ad Habitica.\n\nPer cominciare, devi per prima cosa creare un avatar.</string>
   <string name="randomize">Rendi casuale</string>
   <string name="avatar_extras">Extra</string>
   <string name="avatar_skin_color">Colore pelle</string>
@@ -532,7 +535,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="weak">Deboli</string>
   <string name="strong">Forti</string>
   <string name="gray">Grigie</string>
-  <string name="dated">Con scadenza</string>
+  <string name="dated">Pianificate</string>
   <string name="completed">Completate</string>
   <string name="setuP_group_other">Altro</string>
   <string name="clear">Deseleziona</string>
@@ -554,14 +557,14 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="no_billing_subscriptions">Il tuo dispositivo non dispone di alcuno dei metodi di pagamento supportati. Per favore usa il sito web di Habitica se vuoi acquistare un abbonamento.</string>
   <string name="save">Salva</string>
   <string name="location">Posizione</string>
-  <string name="gem_reward">Ricompensa in gemme</string>
+  <string name="gem_reward">Premio in Gemme</string>
   <string name="tasks">Attività</string>
-  <string name="create_challenge">Crea sfida</string>
-  <string name="edit_challenge">Modifica sfida</string>
-  <string name="challenge_create_error_tavern_one_gem">Hai bisogni di almeno una gemma per creare una sfida nella Taverna.</string>
+  <string name="create_challenge">Crea Sfida</string>
+  <string name="edit_challenge">Modifica</string>
+  <string name="challenge_create_error_tavern_one_gem">Ti serve almeno una Gemma per creare una sfida pubblica.</string>
   <string name="challenge_create_error_enough_gems">Non hai abbastanza gemme per creare una sfida.</string>
-  <string name="identify_your_challenge_with_a_tag">Identifica la tua sfida con una etichetta.</string>
-  <string name="challenge_create_error_tag">Hai bisogno di una etichetta per creare questa sfida.</string>
+  <string name="identify_your_challenge_with_a_tag">Identifica la tua sfida con un nome breve</string>
+  <string name="challenge_create_error_tag">Hai bisogno di un nome breve per creare questa Sfida.</string>
   <string name="challenge_create_error_no_tasks">Devi aggiungere almeno una attività per creare questa sfida.</string>
   <string name="challenge_create_error_title">Hai bisogno di un titolo per creare questa sfida.</string>
   <string name="description_optional">Descrizione (opzionale)</string>
@@ -644,12 +647,14 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="display_name">Nome pubblico</string>
   <string name="photo_url">URL foto</string>
   <string name="login_name">Nome di login</string>
+  <string name="about">A proposito</string>
   <string name="app_settings">Impostazioni app</string>
   <string name="authentication">Autenticazione</string>
   <string name="authentication_summary">Cambia le tue opzioni di autenticazione.</string>
   <string name="change_password">Cambia password</string>
   <string name="change_email">Cambia indirizzo e-mail</string>
   <string name="change_login_name">Cambia nome di login</string>
+  <string name="change_username">Cambia nome utente</string>
   <string name="change">Cambia</string>
   <string name="character_level">Livello personaggio</string>
   <string name="auto_allocate_points">Alloca punti automaticamente</string>
@@ -674,4 +679,105 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="distribute_evenly_help">Assegna lo stesso numero di punti ad ogni attributo.</string>
   <string name="distribute_class_help">Assegna più punti agli attributi importanti per la tua Classe.</string>
   <string name="distribute_task_help">Assegna punti in base alle categorie Forza, Intelligenza, Costituzione e Percezione associati alle attività che completi.</string>
+  <string name="allocating_points">Allocando punti</string>
+  <string name="class_equipment">Equipaggiamento</string>
+  <string name="equipment_empty">Hai già tutto l\'equipaggiamento! Nuovi oggetti saranno disponibili durante i Gran Galà, nei periodi dei solstizi e degli equinozi.</string>
+  <string name="classless">Nessuna classe</string>
+  <string name="class_equipment_shop_dialog">Questo oggetto è disponibile solo per una specifica classe.\nPuoi cambiare la tua classe nelle Impostazioni.</string>
+  <string name="class_gear_disclaimer">Puoi comprare solo equipaggiamento per la Classe a cui appartieni.</string>
+  <string name="available_stats" formatted="false">%d punti</string>
+  <string name="toogle_emojis">Mostra/nascondi emoji</string>
+  <string name="tavern_description">Benvenuto nella Taverna! Siediti vicino a noi per fare due chiacchiere, o prenditi una pausa dalle tue attività.</string>
+  <string name="check_into_inn">Entra nella Locanda</string>
+  <string name="community_guidelines">Linee guida della community</string>
+  <string name="view_community_guidelines">Visualizza le Linee guida della community</string>
+  <string name="guidelines_description">Habitica cerca di creare un ambiente accogliente per utenti di tutte le età e di ogni provenienza, specialmente in spazi pubblici come la Taverna. Se hai delle domande, per favore controlla le nostre linee guida.</string>
+  <string name="helpful_links">Link utili</string>
+  <string name="view_faq">Vedi FAQ</string>
+  <string name="report_bug">Segnala un bug</string>
+  <string name="player_tiers">Gradi giocatore</string>
+  <string name="staff_moderators">Staff e Moderatori</string>
+  <string name="tiers_descriptions">I nomi utente che vedi in chat rappresentano il grado di un sostenitore. Più è alto il grado, più la persona ha sostenuto Habitica con opere artistiche, codici, comunità, o altro!</string>
+  <string name="navigation_drawer_open">Apri menù laterale</string>
+  <string name="navigation_drawer_close">Chiudi menù laterale</string>
+  <string name="world_boss">Boss Mondiale</string>
+  <string name="world_boss_art">Illustrazione Boss</string>
+  <string name="boss_art">Illustrazione Boss</string>
+  <string name="world_boss_description">Descrizione del Boss Mondiale</string>
+  <string name="rage_strike_count" formatted="false">Colpi Furia: %d/%d</string>
+  <string name="pending_strike_title">Serie in attesa</string>
+  <string name="strike_description_title">Cos\'è un colpo furioso?</string>
+  <string name="strike_description_subtitle">Ci sono 3 possibili colpi furiosi</string>
+  <string name="strike_active_title" formatted="false">%s è stato attaccato!</string>
+  <string name="strike_active_subtitle" formatted="false">%s ha il cuore spezzato!</string>
+  <string name="strike_active_description" formatted="false">Il nostro beneamato %s era devastato quando il %s frantumò il %s. In fretta, finisci le tue attività per sconfiggere il mostro e aiutare la ricostruzione !!</string>
+  <string name="questShop">Negozio missioni</string>
+  <string name="market_owner_long">Alex il Mercante</string>
+  <string name="tavern_owner_long">Daniel il Locandiere</string>
+  <string name="stable_owner_long">Matt il domatore</string>
+  <string name="hide_boss_art">Nascondi illustrazione Boss</string>
+  <string name="active_world_boss">Boss Mondiale attivo</string>
+  <string name="no_party_description">Intraprendi missioni da solo o con amici. Combatti mostri, crea Sfide, e responsabilizzati raggiungendo Squadre.</string>
+  <string name="no_party_title">Gioca ad Habitica con una Squadra</string>
+  <string name="join_party_title">Vuoi unirti ad una squadra?</string>
+  <string name="create_party_website">Apri il sito web per creare una squadra</string>
+  <string name="id_copied">ID copiato negli appunti</string>
+  <string name="insufficientSubscriberGems">Hai comprato tutte le Gemme possibili per questo mese. Ulteriori gemme diventano disponibili nei primi tre giorni di ogni mese. Grazie per esserti abbonato/a!</string>
+  <string name="insufficientSubscriberGemsTitle">Limite gemme mensile raggiunto</string>
+  <string name="chat_message">Messaggio Chat</string>
+  <string name="world_boss_description_title">Cos\'è un Boss Mondiale?</string>
+  <string name="world_boss_description_description">Un Boss Mondiale è un evento speciale che unisce tutta la community di Habitica per sconfiggere un potente mostro con le loro attività!\nCompleta delle attività per danneggiare il Boss\nIl Boss Mondiale non ti danneggerà per le attività non completate, ma la sua Furia aumenterà. Se la barra della Furia si riempie, il Boss attaccherà uno dei negozianti di Habitica!\nPuoi continuare i Boss delle missioni normali, il danno verrà applicato a entrambi\nControlla regolarmente la Taverna per vedere i progressi con il Boss Mondiale e gli attacchi Furia.</string>
+  <string name="world_boss_description_intro">Un Boss Mondiale è un evento speciale che unisce tutta la community di Habitica per sconfiggere un potente mostro con le loro attività!</string>
+  <string name="world_boss_description_1">Completa delle attività per danneggiare il Boss</string>
+  <string name="world_boss_description_2">Il Boss Mondiale non ti danneggerà per le attività non completate, ma la sua Furia aumenterà. Se la barra della Furia si riempie, il Boss attaccherà uno dei negozianti!</string>
+  <string name="world_boss_description_3">Puoi continuare con normali Boss di Missioni, i danni saranno applicati ad entrambi.</string>
+  <string name="world_boss_description_4">Vai nella Taverna per vedere i progressi con il Boss Mondiale e gli attacchi Furia.</string>
+  <string name="world_boss_action_prompt" formatted="false">Sconfiggi il Boss per ottenere delle ricompense speciali e salvare Habitica dal terrore di %s!</string>
+  <string name="world_boss_description_subtitle">%s attacca!</string>
+  <string name="questShop_owner_long">Ian la Guida Missione</string>
+  <string name="seasonalShop_owner_long">Maga Stagionale</string>
+  <string name="rage_attack">Attacco Furia:</string>
+  <string name="tavern_description_world_boss">Oddio, non fare attenzione al mostro lì sotto — qui siamo ancora in una zona protetta in cui puoi discutere quando fai una pausa.</string>
+  <string name="report">Segnala</string>
+  <string name="like">Mi Piace</string>
+  <string name="reply">Rispondi</string>
+  <string name="challenge_prize">Premio Sfida</string>
+  <string name="challenge_categories">Categorie Sfida</string>
+  <string name="created_challenge">Sfida creata</string>
+  <string name="public_challenge">Sfida pubblica</string>
+  <string name="short_name">Nomre Breve</string>
+  <string name="unlock_attribute_points">L\'allocazione dei punti di attributo si sblocca al livello 10</string>
+  <string name="same_day_reminder_title">Hai già aggiunto le tue attività?</string>
+  <string name="same_day_reminder_text">Più aggiungi, più sarai ricompensato. Anche piccole abitudini, messe insieme, diventano un grosso cambiamento.</string>
+  <string name="next_day_reminder_title">Hai completato le tue attività oggi?</string>
+  <string name="next_day_reminder_text">Sbloccherai e scoprirai cose nuove man mano che salirai di livello, quindi continua a completare le tue attività e divertiti!</string>
+  <string name="daily_tip_0">Vuoi provare qualcosa di nuovo? Unisciti ad una Sfida per espandere la tua lista delle attività e vincere qualche Gemma!</string>
+  <string name="daily_tip_1">Aggiungi delle checklist alle tue To-Do perché le tue ricompense si moltiplichino!</string>
+  <string name="daily_tip_2">Puoi regolare la frequenza di ripetizione di ogni Daily. Perfino la data delle attività infrequenti può essere programmata.</string>
+  <string name="daily_tip_3">Puoi impostare dei promemoria specifici anche per le Daily.</string>
+  <string name="daily_tip_4">Rivalutare occasionalmente le tue attività può aiutarti a mantenere la giusta strada.</string>
+  <string name="daily_tip_5">Fai dei respiri profondi per concentrarti meglio. Puoi farcela!</string>
+  <string name="daily_tip_6">Prova ad impostare un timer per dieci minuti e a vedere quanto riesci a fare!</string>
+  <string name="daily_tip_7">Prova ad appuntare articoli del Mercato alle tue Ricompense per motivarti a guadagnarle!</string>
+  <string name="daily_tip_8">Puoi regolare la difficoltà di un\'attività per ricompensarti dopo un\'attività impegnativa!</string>
+  <string name="daily_tip_9">Se stai vivendo un momento difficile, prova a dividere le tue attività in parti più piccole.</string>
+  <string name="moderator">Moderatore</string>
+  <string name="staff">Staff</string>
+  <string name="expand_notes">Mostra di più</string>
+  <string name="collapse_notes">Mostra meno</string>
+  <string name="reset_streak">Ripristina Serie</string>
+  <string name="week_reminder_title">Come sta andando con le tue attività?</string>
+  <string name="week_reminder_text">Una pausa fa bene, ma puoi comunque guadagnare punti su attività semplici per salire di livello e ottenere equipaggamenti fortissimi!</string>
+  <string name="last_login">Ultimo accesso</string>
+  <string name="total_checkins">Numero accessi</string>
+  <string name="two_handed">Due mani</string>
+  <string name="usernamePromptTitle">È giunta l\'ora di scegliere il tuo nome utente!</string>
+  <string name="confirmUsername">Conferma nome utente</string>
+  <string name="confirm_username_title">Sei sicuro di voler confermare il tuo nome utente attuale?</string>
+  <string name="confirm_username_description">Confermando il tuo nome utente, lo renderai pubblico per gli inviti, le @menzioni e i messaggi. Puoi cambiare il tuo nome utente andando nei parametri quando vuoi.</string>
+  <string name="cancel">Annulla</string>
+  <string name="confirm_username">Conferma Nome Utente</string>
+  <string name="username_not_confirmed">Nome Utente non confermato</string>
+  <string name="username_confirmed">Nome Utente Confermato</string>
+  <string name="username_copied">Nome Utente copiato negli appunti</string>
 </resources>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index c1ec1b280..451ad9a15 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -90,12 +90,8 @@
   <string name="friday">שישי</string>
   <string name="saturday">שבת</string>
   <string name="sunday">ראשון</string>
-  <string name="levelup_header">עליתם דרגה!</string>
-  <string name="levelup_detail">על-ידי הגשמת היעדים שלכם מהעולם האמיתי, הגעתם לדרגה %1$d!</string>
-  <string name="levelup_health">נרפאתם לחלוטין!</string>
   <string name="levelup_button">ישש!</string>
   <string name="faint_subtitle">אל ייאוש!</string>
-  <string name="faint_penalty_body">הפסדתם דרגה, זהב, וחפץ, אך אתם יכולים להשיג אותם שוב עם עבודה קשה! בהצלחה--אתם תצליחו.</string>
   <string name="faint_header">נגמרה לכם הבריאות!</string>
   <string name="faint_button">מלאו בריאות ונסו מחדש</string>
   <string name="filter">מסנן</string>
@@ -104,7 +100,6 @@
   <string name="used_skill">השתמשתם ב %1$s בעבור %2$d מאנה.</string>
   <string name="new_checklist_item">שורה חדשה לרשימה</string>
   <string name="add_checklist_item">הוסף</string>
-  <string name="reminder_title">זיכרו לסמן את המטלות היומיות!</string>
   <string name="skill_progress_title">שימוש ביכולת</string>
   <string name="coming_soon">יגיע בקרוב</string>
   <string name="chat_flag_confirmation">האם אתם בטוחים שאתם מעוניינים לדווח על ההודעה הזו?</string>
@@ -229,13 +224,7 @@
   <string name="equipped">מצוייד</string>
   <string name="quest_cancel_message">האם אתם בטוחים שאתם מעוניינים להפסיק את ההרפתקאה הזו? כל אישורי ההזמנות יאבדו. הבעלים של ההרפתקאה ימשיכו להחזיק במגילת ההרפתקאה.</string>
   <string name="quest.invitation">הזמנה להרפתקאה</string>
-    <string name="quest.invitation.text">הוזמנתם להשתתף בהרפתקאה!</string>
-  <string name="ago_1day">לפני יום</string>
-  <string name="ago_days">לפני %d ימים</string>
-  <string name="ago_1Minute">לפני דקה</string>
-  <string name="ago_minutes">לפני %d דקות</string>
-  <string name="ago_hours">לפני %d שעות</string>
-  <string name="ago_1hour">לפני שעה</string>
+  <string name="quest.invitation.text">הוזמנתם להשתתף בהרפתקאה!</string>
   <string name="today">היום</string>
   <string name="sidebar_items">חפצים</string>
   <string name="eggs">ביצים</string>
@@ -260,20 +249,10 @@
   <string name="feed">האכילו</string>
   <string name="hatch_with">הבקיעו חיית מחמד עם %s</string>
   <string name="hatched_pet_title">הבקעתם %1$s %2$s!</string>
-  <string name="evolved_pet_title">הצלחתם לאלף %1$s %2$s!, בואו נצא לרכיבה!</string>
   <string name="close">סיגרו</string>
   <string name="share">שתפו</string>
   <string name="notification_pet_fed">האכלתם את ה %1$s %2$s שלכם!</string>
-  <string name="sectionpets">חיות מחמד רגילות</string>
-  <string name="sectionpremiumPets">חיות מחמד משיקויים קסומים</string>
-  <string name="sectionquestPets">חיות מחמד מהרפתקאות</string>
-  <string name="sectionspecialPets">חיות מחמד נדירות</string>
-  <string name="sectionmounts">חיות רכיבה רגילות</string>
-  <string name="sectionpremiumMounts">חיות רכיבה משיקויים קסומים</string>
-  <string name="sectionquestMounts">חיות רכיבה מהרפתקאות</string>
-  <string name="sectionspecialMounts">חיות רכיבה נדירות</string>
   <string name="world_quest">הרפתקאה עולמית</string>
-  <string name="inn_description">נוחו באכסנייה כדי למנוע ממטלות יומיות לא מושלמות לפגוע בכם במהלך הלילה! (שימו לב: לא מונע מכם להפגע מאוייבים.)</string>
   <string name="empty_items">אין לכם כל %s</string>
   <string name="user_level">דרגה %d</string>
   <string name="user_level_with_class">דרגה %1$d - %2$s</string>
@@ -281,7 +260,6 @@
   <string name="rogue">נוכל</string>
   <string name="mage">מכשף</string>
   <string name="healer">מרפא</string>
-  <string name="warrior_description">לוחמים גורמים ליותר ״פגיעות קריטיות״, שבאקראיות נותנות בונוס זהב, ניסיון, וסיכוי ל״נפילה״ בהשלמה של משימה. הם גם גורמים לנזק כבד לאוייבים. שחקו לוחמים אם אתם מקבלים מוטיבציה מזכיות אקראיות בסגנון של מכונת מזל, או אם אתם רוצים לגרום לכאב בהרפתקאות אוייבים!</string>
   <string name="mage_description">מכשפים לומדים במהירות, וזוכים בניסיון ודרגות מהר יותר ממקצועות אחרים. הם גם מקבלים מנות גדולות של מאנה שמשמשות ליכולות מיוחדות. שחקו כמכשפים אם אתם נהנים מהצדדים הטקטיים של האביט, או אם עליה בדרגות והיבטים מתקדמים של המשחק הם גורמים שמדרבנים אתכם.</string>
   <string name="rogue_description">נוכלים אוהבים לצבור עושר, זוכים ביותר זהב מכל בעל-מקצוע אחר, ומוכוונים למציאת חפצים אקראיים. יכולת ההתגנבות המפורסמת שלהם מאפשרת להם להתחמק מההשלכות של מטלות יומיות מפוספסות. שחקו בדמות של נוכל אם מדרבן אתכם לקבל פרסים, הישגים, שלל ועיטורים!</string>
   <string name="healer_description">מרפאים הם עמידים בפני פגיעות, וחולקים את היכולת הזו עם אחרים. מטלות יומיות מפוספסות והרגלים רעים לא מבלבלים אותם כל כך, ויש להם יכולת להתאושש מכשלונות. שחקו במקצוע המרפא אם אתם נהנים לסייע לעמיתיכם לחבורה, או אם הרעיון של התחמקות ממוות דרך עבודה קשה מעורר בכם השראה!</string>
@@ -293,7 +271,6 @@
   <string name="dialog_go_back">חזרה</string>
   <string name="opt_out_confirmation">האם אתם בטוחים שאתם מעוניינים לוותר?</string>
   <string name="change_class">שנו את המקצוע שלכם</string>
-  <string name="change_class_description">החליפו מקצוע וקבלו בחזרה את נקודות התכונה תמורת 3 אבני חן. תוכלו להקצות את נקודות התכונה מחדש דרך האתר.</string>
   <string name="enable_class">אפשרו את מערכת המקצועות</string>
   <string name="changing_class_progress">שנו מקצוע</string>
   <string name="by_email">באמצעות מייל</string>
@@ -316,7 +293,6 @@
   <string name="market">שוק</string>
   <string name="timeTravelers">נוסעים בזמן</string>
   <string name="seasonalShop">חנות עונתית</string>
-  <string name="empty_inbox">אין לכם הודעות בדואר הנכנס. אתם יכולים לשלוח למשתמשים הודעה חדשה מהצ׳אט הפומבי שלהם!</string>
   <string name="party_invite">שחררו על-ידי הזמנת חברים</string>
   <string name="no_gold">אין די זהב</string>
   <string name="no_potion">אינכם צריכים לקנות שיקוי בריאות</string>
diff --git a/Habitica/res/values-ja/strings.profile.xml b/Habitica/res/values-ja/strings.profile.xml
index c726d4239..766c825f0 100644
--- a/Habitica/res/values-ja/strings.profile.xml
+++ b/Habitica/res/values-ja/strings.profile.xml
@@ -3,6 +3,7 @@
     <string name="profile_pets_and_mounts">ペットと乗騎</string>
     <string name="profile_pets_found">種のペットを発見</string>
     <string name="profile_mounts_tamed">種の乗騎を飼育</string>
+    <string name="profile_loading_data">メンバーのデータを読み込み中…</string>
     <string name="profile_send_message_to">%s にメッセージを送る</string>
     <string name="profile_message_sent_to">%s に送ったメッセージ</string>
     <string name="profile_level">レベル : </string>
diff --git a/Habitica/res/values-ja/strings.sidebar.xml b/Habitica/res/values-ja/strings.sidebar.xml
index 3ba81a29f..6176ab897 100644
--- a/Habitica/res/values-ja/strings.sidebar.xml
+++ b/Habitica/res/values-ja/strings.sidebar.xml
@@ -3,7 +3,7 @@
   <string name="sidebar.tasks">タスク</string>
   <string name="sidebar.skills">スキル</string>
   <string name="sidebar.section.social">コミュニティー</string>
-  <string name="sidebar.inbox">受信箱</string>
+  <string name="sidebar.inbox">メッセージ</string>
   <string name="sidebar.tavern">キャンプ場</string>
   <string name="sidebar.party">パーティー</string>
   <string name="sidebar.purchaseGems">ジェムの購入</string>
@@ -17,4 +17,5 @@
   <string name="sidebar.settings">設定</string>
   <string name="sidebar.about">Habitica について</string>
   <string name="sidebar_shops">ショップ</string>
+  <string name="sidebar_stats">ステータス</string>
 </resources>
diff --git a/Habitica/res/values-ja/strings.tutorial.xml b/Habitica/res/values-ja/strings.tutorial.xml
index 5335ea421..b662d0e9f 100644
--- a/Habitica/res/values-ja/strings.tutorial.xml
+++ b/Habitica/res/values-ja/strings.tutorial.xml
@@ -4,6 +4,13 @@
   <string name="tutorial_habits_1">まずは習慣。身につけたい良い習慣もあれば、やめられない悪い習慣もあるよね。</string>
   <string name="tutorial_habits_2">良い習慣をこなした時は、＋をタップして経験値とゴールドをゲット！</string>
   <string name="tutorial_habits_3">うっかり悪い習慣を行ってしまった時は、－をタップ。アバターの体力が減ってしまうので、責任を持って悪い習慣を断ち切ろう。</string>
+  <string name="tutorial_habits_4">挑戦してみよう！下のほうのナビゲーションから、異なるタスクタイプも選ぶことができます。</string>
+  <string name="tutorial_dailies_1">通常のスケジュールにしたがって行うべき期限付きのタスクは、日課に設定しましょう。</string>
+  <string name="tutorial_dailies_2">気をつけて…もし一つでもやり逃すと、あなたのアバターは夜のうちにダメージを受けてしまいます。継続的にチェックを入れることで、素晴らしい報酬を手に入れましょう！</string>
+  <string name="tutorial_todos_1">単発のタスクをこなすために、To-Doを使いましょう。</string>
+  <string name="tutorial_todos_2">もしTo-Doに期限があるのなら、設定しましょう。あなたにはクリアできるはず…がんばって！</string>
+  <string name="tutorial_rewards_1">得られたゴールドであなたのアバター用に装備を購入しましょう！</string>
+  <string name="tutorial_rewards_2">あなた自身のモチベーションを上げるために、現実世界での報酬を登録することもできます。</string>
   <string name="tutorial_tasks_complete">これで説明は終わり。もし忘れちゃったときは，FAQをチェックしてみてね。</string>
   <string name="tutorial_equipment">装備を買ったら、ここに表示されるよ。武装はアバターのステータスに影響し、(有効にすれば)衣装としてアバターの見た目を変えるよ。</string>
   <string name="tutorial_items">タスクを達成したりレベルを上げることで、アイテムを入手できるぞ。アイテムを使うにはタップしよう。</string>
@@ -12,4 +19,5 @@
   <string name="tutorial_party">友達といっしょにモンスターと戦おう!　あなたと友達それぞれの目標を達成するための責任感が試されるぞ。</string>
   <string name="tutorial_tavern">キャンプ場へようこそ!　ここは年齢なんか気にしないオープンなチャットルームです。ここでタスクの進め方について話したり、質問したりできます。楽しんでね!</string>
   <string name="tutorial_classes">戦士、魔道士、治療師、それとも盗賊…どれになるか決めよう!　クラスにはそれぞれ専用の装備とスキルがある。詳しくは (?) をタップしてね!</string>
+  <string name="tutorial_stats">一度にステータスを割り当てるには灰色のボタンを、1つずつ割り振るには矢印をタップして下さい。</string>
 </resources>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 421a5d06f..fc07aee4f 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -92,6 +92,10 @@
   <string name="reminders">通知</string>
   <string name="actions">行動</string>
   <string name="attributes">属性</string>
+  <string name="physical">力</string>
+  <string name="mental">知能</string>
+  <string name="social">体質</string>
+  <string name="other">知覚</string>
   <string name="frequency">頻度</string>
   <string name="frequency_weekly">決まった曜日</string>
   <string name="frequency_daily">何日かごと</string>
@@ -111,12 +115,8 @@
   <string name="friday">金</string>
   <string name="saturday">土</string>
   <string name="sunday">日</string>
-  <string name="levelup_header">レベルが上がった!</string>
-  <string name="levelup_detail">実生活での目標を達成し、レベル %1$d に成長した!</string>
-  <string name="levelup_health">完全に傷がいえた!</string>
   <string name="levelup_button">イエーイ!</string>
   <string name="faint_subtitle">がっかりしないで!</string>
-  <string name="faint_penalty_body">レベルとゴールドと、いずれかの装備品を失った。だけど、がんばればすべてを取り返せるぞ！ 　あなたなら、きっとできる。幸あらんことを。</string>
   <string name="faint_header">体力がなくなった!</string>
   <string name="faint_button">体力を全回復してやり直す</string>
   <string name="filter">フィルター</string>
@@ -126,7 +126,6 @@
   <string name="used_skill_without_mana">%1$s を唱えた。</string>
   <string name="new_checklist_item">新しいチェックリスト項目</string>
   <string name="add_checklist_item">追加</string>
-  <string name="reminder_title">日課をチェックした?</string>
   <string name="skill_progress_title">使用中のスキル</string>
   <string name="coming_soon">近日中</string>
   <string name="chat_flag_confirmation">このメッセージを違反として報告します。いいですか?</string>
@@ -187,6 +186,7 @@
   <string name="dismiss_tutorial">もう一度通知</string>
   <string name="intro_1_subtitle">へよこそう</string>
   <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">やるべきことを片付けながら楽しむ時が来ました。 現在%s人以上の方々がタスクをこなしながら人生を楽しんでいます。</string>
   <string name="intro_2_subtitle">ゲームの進行</string>
   <string name="intro_2_title">人生の進行</string>
   <string name="intro_2_description">実生活でタスクをこなし、ゲーム内の機能をアンロックしよう。よろいやペットなどのさまざまなアイテムを、あなた自身の目標に近づいたごほうびとして獲得しよう。</string>
@@ -266,7 +266,8 @@
   <string name="equipped">装備済み</string>
   <string name="quest_cancel_message">このクエストを中止します。よろしいですか?　招待を受けたすべての参加者を失うことになります。クエストの所有者の元にクエストの巻物が戻ってきます。</string>
   <string name="quest.invitation">クエストへの招待</string>
-    <string name="quest.invitation.text">クエストへの招待状が届いた!</string>
+  <string name="quest_begin_message">本当によろしいですか？あなたの%2$dパーティメンバーのうち、 %1$d人しかクエストに参加していません！クエストはすべてのプレーヤーが参加すると自動的に始まります。</string>
+  <string name="quest.invitation.text">クエストへの招待状が届いた!</string>
   <string name="ago_1day">1日前</string>
   <string name="ago_days">%d日前</string>
   <string name="ago_1Minute">1分前</string>
@@ -297,20 +298,25 @@
   <string name="feed">えさをやる</string>
   <string name="hatch_with">%s でペットをかえす</string>
   <string name="hatched_pet_title">%1$s%2$sが生まれた!</string>
-  <string name="evolved_pet_title">%1$s%2$s はあなたに懐きました。 一緒に出かけましょう!</string>
   <string name="close">閉じる</string>
   <string name="share">共有する</string>
   <string name="notification_pet_fed">%1$s%2$sにえさをやった!</string>
-  <string name="sectionpets">基本のペット</string>
-  <string name="sectionpremiumPets">魔法の薬のペット</string>
-  <string name="sectionquestPets">クエスト ペット</string>
-  <string name="sectionspecialPets">貴重なペット</string>
-  <string name="sectionmounts">基本の乗騎</string>
-  <string name="sectionpremiumMounts">魔法の薬の乗騎</string>
-  <string name="sectionquestMounts">クエストの乗騎</string>
-  <string name="sectionspecialMounts">レアな乗騎</string>
+  <string name="notification_purchase">%sを購入しました</string>
+  <string name="notification_purchase_reward">報酬をを購入しました</string>
+  <string name="sectionpets">ふつうの</string>
+  <string name="sectionpremiumPets">魔法の薬</string>
+  <string name="sectionquestPets">クエスト</string>
+  <string name="sectionspecialPets">レアな</string>
+  <string name="sectionmounts">ふつうの</string>
+  <string name="sectionpremiumMounts">魔法の薬</string>
+  <string name="sectionquestMounts">クエスト</string>
+  <string name="sectionspecialMounts">レアな</string>
   <string name="world_quest">世界のクエスト</string>
-  <string name="inn_description">ロッジで休んでいる間は、日課をやらずに夜が明けてもダメージを受けない! ( 注 : ボスから受けるダメージは避けられない)</string>
+  <string name="inn_description">休憩が必要？ダニエルの宿屋にチェックインし、Habiticaのややこしいゲームシステムを一時停止しましょう:
+・日課をこなさなくてもダメージを受けなくなります
+・タスクの連続実行は変更されなくなり、色も変わらなくなります
+・日課をこなさなくてもボスからのダメージを受けなくなります
+・チェックアウトするまで、ボスダメージや収集クエストアイテムは保留されたままになります</string>
   <string name="empty_items">%s を持ってないよ</string>
   <string name="user_level">レベル %d</string>
   <string name="user_level_with_class">レベル %1$d %2$s</string>
@@ -318,7 +324,6 @@
   <string name="rogue">盗賊</string>
   <string name="mage">魔道士</string>
   <string name="healer">治療師</string>
-  <string name="warrior_description">戦士はタスクを完了したときに、「会心の一撃」が出やすく、その効果も高い。「会心の一撃」が出ると、ゴールド、経験値、アイテムドロップの確率にボーナスがつく。また、戦士はボスに大きなダメージを与えられるぞ。予測できない一攫千金の報酬でやる気が出る、もしくはボス クエストで活躍したいなら、戦士でプレーしよう!</string>
   <string name="mage_description">魔道士は、すぐに身に着ける学習能力をもっているよ。経験値の取得とレベルアップが他のクラスより速い。また、魔道士は、スキルを使うためのマナを集めるのがうまい。Habitica の戦術的な面を楽しみたい、レベルアップや拡張機能のアンロックにすごくやる気が出るなら、魔道士でプレーしよう!</string>
   <string name="rogue_description">盗賊は富を集めることを愛するのです。ほかのどのクラスよりもゴールドを稼ぎ、アイテムを見つける確率が高い。盗賊の特徴、忍びの術をもってすれば、日課をやらなかったとしても、性格的に傷つかない。戦利品や勲章――Habitica では、ごほうびと実績に強く心動かされるなら、盗賊でプレーしよう!</string>
   <string name="healer_description">治療師は痛みに耐え、他人を守るのです。やらなかった日課や悪い習慣にも治療師は動揺せず、失敗から体力を回復させる能力がある。パーティーの他のメンバーを助けることに喜びを感じる、困難な仕事による死をも恐れぬ理想があるのなら、治療師でプレーしよう!</string>
@@ -332,7 +337,7 @@
   <string name="dialog_go_back">戻る</string>
   <string name="opt_out_confirmation">選ばないでいい?</string>
   <string name="change_class">クラスを変更する</string>
-  <string name="change_class_description">クラスを変更し、能力値を回収する。要 3 ジェム。能力値の割りあては Web 画面で行う。 </string>
+  <string name="change_class_description">3ジェム支払い、クラスを変更し、ステータスポイントを再び割りあてできるようにする。</string>
   <string name="enable_class">クラス システムを有効にする</string>
   <string name="changing_class_progress">クラスの変更</string>
   <string name="by_email">メールで</string>
@@ -358,10 +363,13 @@
   <string name="market">市場</string>
   <string name="timeTravelers">タイムトラベラー</string>
   <string name="seasonalShop">期間限定ショップ</string>
-  <string name="empty_inbox">受信箱にメッセージがありません。Habitica ユーザーあてにメッセージを送ることができます。公開チャットに投稿しているユーザーにメッセージを送ってみてはどうですか?</string>
+  <string name="empty_inbox">メッセージがありません。公開チャットから他のユーザーにメッセージを送ることができます！</string>
   <string name="party_invite">友達を招待するとアンロック</string>
+  <string name="login_incentive">Habiticaに連続でログインするとアンロック</string>
+  <string name="create_account">アカウントを作成するとアンロック</string>
   <string name="no_gold">ゴールドが足りません</string>
   <string name="no_potion">体力回復の薬を買う必要がありません</string>
+  <string name="successful_purchase">%1$sを購入しました</string>
   <string name="purchase_confirmation_title">購入の確認</string>
   <string name="confirm_purchase_text">%2$s %3$s で %1$s  を買う</string>
   <string name="gem">ジェム</string>
@@ -486,7 +494,7 @@
   <string name="warning">注意</string>
   <string name="open_settings">設定を開く</string>
   <string name="dont_keep_activities_warning">あなたは開発者向けのオプション \“Don\'t keep Activities\” を有効にしているようです。現在、このオプションはHabiticaのアプリに問題を起こしますので、無効にすることをお勧めします。</string>
-  <string name="inbox">受信箱</string>
+  <string name="inbox">メッセージ</string>
   <string name="FAQ">よくある質問</string>
   <string name="special">スペシャル</string>
   <string name="gem_for_gold_description">Habiticaへの寄付のお礼として、あなたは毎月一定数のジェムをゲーム内のゴールドで購入することができます。</string>
@@ -512,9 +520,8 @@
   <string name="login_btn_fb">Facebookでログイン</string>
   <string name="login_btn_google">Googleでログイン</string>
   <string name="action_back">戻る</string>
-  <string name="welcome_text">やあ、新人さんだね。僕はジャスティン。Habiticaの案内役だよ。
-始める前に、まずは自分のアバターを作ろう。</string>
   <string name="randomize">ランダムにする</string>
+  <string name="avatar_extras">その他</string>
   <string name="avatar_skin_color">肌の色</string>
   <string name="avatar_hair_color">髪色</string>
   <string name="avatar_hair_bangs">前髪</string>
@@ -524,7 +531,7 @@
   <string name="weak">弱い</string>
   <string name="strong">強い</string>
   <string name="gray">無効</string>
-  <string name="dated">古い</string>
+  <string name="dated">予定</string>
   <string name="completed">完了</string>
   <string name="setuP_group_other">ほか</string>
   <string name="clear">クリア</string>
@@ -546,14 +553,10 @@
   <string name="no_billing_subscriptions">あなたのデバイスは、サポートされている支払方法に対応していません。寄付を購入したい場合は、Habiticaのウェブサイトをご利用ください。</string>
   <string name="save">保存</string>
   <string name="location">場所</string>
-  <string name="gem_reward">ジェムの報酬</string>
   <string name="tasks">タスク</string>
   <string name="create_challenge">チャレンジを作成する</string>
-  <string name="edit_challenge">チャレンジを編集する</string>
-  <string name="challenge_create_error_tavern_one_gem">キャンプ場でチャレンジを作成するには、ジェムが1つ以上必要です。</string>
+  <string name="edit_challenge">編集</string>
   <string name="challenge_create_error_enough_gems">チャレンジを作成するのに十分なジェムを持っていません。</string>
-  <string name="identify_your_challenge_with_a_tag">チャレンジをタグから探しています……</string>
-  <string name="challenge_create_error_tag">このチャレンジを作成するには、タグが必要です。</string>
   <string name="challenge_create_error_no_tasks">このチャレンジを作成するには、タスクを1つ以上追加する必要があります。</string>
   <string name="challenge_create_error_title">このチャレンジを作成するには、タイトルが必要です。</string>
   <string name="description_optional">説明 (任意)</string>
@@ -579,6 +582,149 @@
   <string name="invitations">招待</string>
   <string name="quest_leader_header" formatted="false">%sが始めたタスク</string>
   <string name="quest_abort_message">このミッションを中断します。よろしいですか?　パーティの全員が中断になり、すべての進行状況は失われます。クエストの巻物はクエスト所有者の手に戻ります。</string>
-  <string name="loading">Loading...</string>
+  <string name="loading">ロード中…</string>
   <string name="reloading_content">再度読み込みます</string>
+  <string name="thousand_abbrev">k</string>
+  <string name="million_abbrev">m</string>
+  <string name="billion_abbrev">b</string>
+  <string name="your_balance">残高:</string>
+  <string name="available_until" formatted="false">%sまで利用可能</string>
+  <string name="gems_left_max" formatted="false">今月のジェム: 残り%1$d/%2$d</string>
+  <string name="gems_left_nomax" formatted="false">今月のジェム: 残り%d</string>
+  <string name="health">体力</string>
+  <string name="collect">集める</string>
+  <string name="rage_meter">怒りメーター</string>
+  <string name="boss_quest">ボスクエスト</string>
+  <string name="collection_quest">収集クエスト</string>
+  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+  <string name="experience_reward" formatted="false">%d の経験値</string>
+  <string name="gold_reward" formatted="false">%dゴールド</string>
+  <string name="quest_owner_rewards">クエストオーナー報酬</string>
+  <string name="str_abbrv">力</string>
+  <string name="per_abbrv">知覚</string>
+  <string name="int_abbrv">知能</string>
+  <string name="con_abbrv">体質</string>
+  <string name="reset_account">アカウントをリセット</string>
+  <string name="reset_account_description">注意！この操作によってあなたのアカウントの多くの部分がリセットされます。この操作は非推奨ですが、短期間でやり直すことを有用と考えています。
+
+この操作によってあなたのレベル、ゴールド、経験値はすべて初期化されます。すべてのタスク(チャレンジのものを除く)は永久に削除され、履歴も失われます。すべての装備も失われますが、限定品や寄付者得点アイテムも含めすべての装備は買い直すことができます(ただし再購入するためにはその装備に適した職である必要があります)。職業とペット、乗騎はそのままです。タスクも装備も保存される安全な選択肢である転生のオーブのほうが好ましいかもしれません。</string>
+  <string name="delete_account">アカウントを削除</string>
+  <string name="delete_account_description">本当によろしいですか？アカウントが永久に削除され、二度と復元できなくなります！Habiticaを再び使うためには、再度登録が必要になります。購入、使用したジェムは返金されません。本当によろしければ、下のテキストボックスにパスワードを入力して下さい。</string>
+  <string name="reset_account_confirmation">アカウントをリセット</string>
+  <string name="delete_account_confirmation">アカウントを削除</string>
+  <string name="danger_zone">危険地帯</string>
+  <string name="nevermind">おかまいなく</string>
+  <string name="resetting_account">アカウントをリセット</string>
+  <string name="deleting_account">アカウントを削除</string>
+  <string name="insufficientGold">このアイテムを購入するにはもっとタスクをこなす必要があります！</string>
+  <string name="insufficientGems">このアイテムを購入するにはもっとジェムが必要です！</string>
+  <string name="purchase_gems">ジェムを購入する</string>
+  <string name="insufficientHourglasses">このアイテムを購入するにはもっと神秘の砂時計が必要です！</string>
+  <string name="get_hourglasses">神秘の砂時計を手に入れる</string>
+  <string name="subscribe_for_hourglasses">寄付して神秘の砂時計を手に入れる</string>
+  <string name="timetravelers_closed_description">三ヶ月の連続ログインごとに一つ神秘の砂時計が手に入るので、これを使って、過去や未来の限定版アイテム、ペット、乗騎を開放しましょう！</string>
+  <string name="want_to_subscribe">寄付がしたい</string>
+  <string name="seasonal_closed_description">大祭は夏至と冬至、春分や秋分の頃に開催されるので、その頃にまた季節の特別アイテムたちを確認してみましょう！</string>
+  <string name="come_back_soon">間もなく再開！</string>
+  <string name="level">レベル</string>
+  <string name="streak_label">21日連続実行</string>
+  <string name="stats">ステータス</string>
+  <string name="fix_character_description">もしバグや間違いによってあなたのキャラクターが変更されてしまったら、ここから手動で値を修正することができます。</string>
+  <string name="fix_character_values">キャラクターの能力値を修正する</string>
+  <string name="saving">保存</string>
+  <string name="forgot_password_title">パスワードリセット用のURLをメールする</string>
+  <string name="forgot_password_description">Habiticaアカウント登録時に使用したメールアドレスを入力して下さい。</string>
+  <string name="forgot_password_confirmation">もしメールアドレスが登録されていれば、新しいパスワードの設定方法がメールで送信されます。</string>
+  <string name="ok">OK</string>
+  <string name="profile">プロフィール</string>
+  <string name="profile_summary">公開プロフィールを編集しましょう。</string>
+  <string name="display_name">名前を表示</string>
+  <string name="photo_url">写真のURL</string>
+  <string name="login_name">ログイン名</string>
+  <string name="about">Habitica について</string>
+  <string name="app_settings">アプリの設定</string>
+  <string name="authentication">認証</string>
+  <string name="authentication_summary">認証オプションを変更する</string>
+  <string name="change_password">パスワードを変更する</string>
+  <string name="change_email">メールアドレスを変更する</string>
+  <string name="change_login_name">ログイン名を変更する</string>
+  <string name="change_username">ユーザー名を変更する</string>
+  <string name="change">変更する</string>
+  <string name="character_level">キャラクターのレベル</string>
+  <string name="auto_allocate_points">ポイントの自動割り当て</string>
+  <string name="stat_guide">案内を開始する</string>
+  <string name="character_build">キャラクター作成</string>
+  <string name="character_build_description">各レベルごとに、自由に割り当てることができるポイントが得られます。手動で割り当てることもできますが、自動割り当てによってゲームに割り当てを任せることも可能です。</string>
+  <string name="strength">力</string>
+  <string name="strength_description">タスク完了時のクリティカルヒットの威力と頻度を増やします。また、ボスへ与えるダメージも増やします。</string>
+  <string name="intelligence">知能</string>
+  <string name="intelligence_description">タスクの完了によって得られる経験値を増やします。また、マナの上限を増やし、マナの時間回復を早めます。</string>
+  <string name="constitution">体質</string>
+  <string name="constitution_description">タスクの失敗によって受けるダメージを減らします。ボスからのダメージは減少しません。</string>
+  <string name="perception">知覚</string>
+  <string name="perception_description">タスクの完了時のドロップ確率や、日課のドロップ確率、連続実行ボーナス、タスク報酬ゴールド量などを上昇させます。</string>
+  <string name="buffs">バフ</string>
+  <string name="allocated">割当済み</string>
+  <string name="distribute_evenly">均等に分配する</string>
+  <string name="distribute_class">クラスに基づいて分配する</string>
+  <string name="distribute_task">タスクの状況に基づいて分配する</string>
+  <string name="no_points_to_allocate">割り当てるポイントがありません</string>
+  <string name="points_to_allocate" formatted="false">%dポイント割り当て可能</string>
+  <string name="distribute_evenly_help">各能力に同じ値のポイントを割り当てます。</string>
+  <string name="distribute_class_help">クラスにとって重要なポイントを多く割り当てます。</string>
+  <string name="distribute_task_help">あなたが完了したタスクに基づいて、力、知能、体質、知覚にポイントを割り当てます。</string>
+  <string name="allocating_points">ポイントの割り当て</string>
+  <string name="class_equipment">装備</string>
+  <string name="equipment_empty">あなたはすでにすべての装備を持っています！夏至、冬至、春分や秋分の頃に開催される大祭で新たな装備がリリースされます。</string>
+  <string name="classless">クラスに属さない</string>
+  <string name="class_equipment_shop_dialog">このアイテムは特定のクラスにのみ利用可能です、\n
+クラスはセッティングから変更できます。</string>
+  <string name="class_gear_disclaimer">現在のクラス用の装備しか購入できません。</string>
+  <string name="available_stats" formatted="false">%dポイント</string>
+  <string name="toogle_emojis">絵文字を使う</string>
+  <string name="tavern_description">ロッジにようこそ！腰掛けてチャットをし、タスクを休憩しましょう。</string>
+  <string name="check_into_inn">宿にチェックインする</string>
+  <string name="community_guidelines">コミュニティガイドライン</string>
+  <string name="view_community_guidelines">コミュニティガイドラインを見る</string>
+  <string name="guidelines_description">Habiticaは、そして特にキャンプ場などの公共スペースは、年齢やバックグラウンドにかかわらず歓迎する雰囲気を作ろうと努力しています。質問がある場合は、ガイドラインに助言を求めてみて下さい。</string>
+  <string name="helpful_links">有用なリンク</string>
+  <string name="view_faq">FAQを見る</string>
+  <string name="report_bug">バグを報告する</string>
+  <string name="player_tiers">プレイヤー段位</string>
+  <string name="staff_moderators">スタッフとモデレーター</string>
+  <string name="tiers_descriptions">チャットに表示される色付きのユーザー名は、その人の貢献者段位を示します。段位が高ければ高いほど、その人は作画、コーディング、コミュニティなどでHabiticaにより貢献していることになります。</string>
+  <string name="navigation_drawer_open">ナビゲーションバーを開く</string>
+  <string name="navigation_drawer_close">ナビゲーションバーを閉じる</string>
+  <string name="world_boss">ワールドボス</string>
+  <string name="world_boss_art">ボス画像</string>
+  <string name="boss_art">ボス画像</string>
+  <string name="world_boss_description">ワールドボスの説明</string>
+  <string name="rage_strike_count" formatted="false">怒り攻撃 %d/%d</string>
+  <string name="pending_strike_description">まだ攻撃はされていません！
+ワールドボスは、怒りゲージがたまるとわたしたちの味方である商人に攻撃してきます。日課をこなし、攻撃されるのを避けましょう！</string>
+  <string name="pending_strike_title">未解決攻撃</string>
+  <string name="strike_description_title">怒り攻撃とは？</string>
+  <string name="strike_description_subtitle">怒り攻撃には3種類あります</string>
+  <string name="strike_description_description">ゲージはHabiticaの住人が日課を残すと溜まっていきます。満タンになると、DysHeartenerがHabiticaの商人にココロクジキアタックをしてきますので、タスクはしっかりこなしましょう！</string>
+  <string name="pending_strike_subtitle">まだ攻撃はされていません！</string>
+  <string name="strike_active_title" formatted="false">%s が襲撃を受けました！</string>
+  <string name="strike_active_subtitle" formatted="false">%sは悲しみに打ちひしがれています！</string>
+  <string name="strike_active_description" formatted="false">%sの攻撃で%sが破壊されたので、愛すべき%sは打ちのめされてしまいました。急いで！　タスクを片付けてこの怪物を倒し、再建の手助けをするのです！</string>
+  <string name="questShop">クエスト ショップ</string>
+  <string name="market_owner_long">商人のAlex</string>
+  <string name="tavern_owner_long">キャンプ場の支配人・Daniel</string>
+  <string name="stable_owner_long">猛獣使いのダニエル</string>
+  <string name="hide_boss_art">ボス画像を隠す</string>
+  <string name="active_world_boss">活動中のワールドボス</string>
+  <string name="no_party_title">パーティーに参加してHabiticaをプレイする</string>
+  <string name="join_party_title">パーティーに参加したいですか？</string>
+  <string name="create_party_website">パーティーを作成するにはウェブサイトを開いてください</string>
+  <string name="id_copied">IDをクリップボードにコピーしました</string>
+  <string name="insufficientSubscriberGemsTitle">毎月のジェムの購入上限に達しました</string>
+  <string name="world_boss_description_title">ワールドボスとは何ですか？</string>
+  <string name="world_boss_description_subtitle">%sの攻撃！</string>
+  <string name="questShop_owner_long">クエストガイドのイアン</string>
+  <string name="seasonalShop_owner_long">季節の魔女</string>
+  <string name="rage_attack">怒りの攻撃：</string>
+  <string name="display_name_length_error">表示名は1~30文字にしてください</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index c777074f4..3a8ffeae8 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -115,12 +115,8 @@
   <string name="friday">금요일</string>
   <string name="saturday">토요일</string>
   <string name="sunday">일요일</string>
-  <string name="levelup_header">레벨이 올랐습니다!</string>
-  <string name="levelup_detail">일상생활의 목표들을 달성함으로써 레벨 %1$d가 되었어요!</string>
-  <string name="levelup_health">체력이 완전히 회복되었습니다!</string>
   <string name="levelup_button">만세!</string>
   <string name="faint_subtitle">좌절하지 말아요!</string>
-  <string name="faint_penalty_body">당신은 레벨, 골드, 장비 한개를 잃었지만, 열심히 일하면 곧 되찾을 수 있을꺼에요! 행운을 빌어요--분명 잘 해낼꺼에요.</string>
   <string name="faint_header">체력이 모두 떨어졌어요!</string>
   <string name="faint_button">체력을 채우고 다시 도전하세요.</string>
   <string name="filter">필터</string>
@@ -130,7 +126,6 @@
   <string name="used_skill_without_mana">%1$s을(를) 사용했습니다.</string>
   <string name="new_checklist_item">새로운 체크리스트 항목</string>
   <string name="add_checklist_item">더하기</string>
-  <string name="reminder_title">일일과제 체크하는 것을 잊지마세요!</string>
   <string name="skill_progress_title">스킬 사용</string>
   <string name="coming_soon">곧 찾아옵니다</string>
   <string name="chat_flag_confirmation">정말 이 메세지를 신고하시겠습니까?</string>
@@ -191,10 +186,12 @@
   <string name="dismiss_tutorial">나중에 알려주세요</string>
   <string name="intro_1_subtitle">환영합니다</string>
   <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">즐겁게 자기 할 일을 해보세요. 자기 계발중인%s명이 넘는 사람들과 함께 하나씩 일상 생활의 과제들을 해나가세요.</string>
   <string name="intro_2_subtitle">게임의 진전</string>
   <string name="intro_2_title">삶의 진전</string>
   <string name="intro_2_description">실제 삶에서의 일을 처리하는 것으로 게임의 특색들을 잠금해제 하세요. 목표를 달성해 갑옷, 펫, 그리고 더 많은 것들을 얻으세요.</string>
   <string name="intro_3_subtitle">몬스터와 싸우기</string>
+  <string name="intro_3_title">친목을 다지세요</string>
   <string name="intro_3_description">친구들의 도움으로 당신의 목표를 유지시키세요. 일상 생활과 전투에서 서로를 도와가며 함께 성장하세요!</string>
   <string name="intro_finish_button">시작합시다!</string>
   <string name="previous_button">이전</string>
@@ -202,6 +199,8 @@
   <string name="skip_button">스킵</string>
   <string name="setup_welcome_description">Habitica에 오신걸 환영합니다. 게임에서의 진행도는 당신 일상에서의 진행도를 의미하죠! 과제를 달성할수록 새로운 장비, 펫, 퀘스트 등을 열 수 있어요.</string>
   <string name="setup_welcome_title">환영합니다</string>
+  <string name="avatar_setup_description">자기 아바타가 어떻게 생기길 원하세요? 생김새는 나중에도 바꿀 수 있으니 걱정하지 마세요.</string>
+  <string name="task_setup_description">잘했어요! 그럼 이제 이 여정을 통해 삶의 어떤 부분을 개선하고 싶은지 알아볼까요?</string>
   <string name="setup_group_work">일</string>
   <string name="setup_group_exercise">운동</string>
   <string name="setup_group_health">건강</string>
@@ -273,13 +272,8 @@
   <string name="equipped">착용됨</string>
   <string name="quest_cancel_message">정말 이 퀘스트를 취소하시겠습니까? 모든 초대장과 승인들을 잃을 것입니다. 퀘스트 스크롤은 주인에게 돌아갑니다.</string>
   <string name="quest.invitation">퀘스트 초대장</string>
-    <string name="quest.invitation.text">퀘스트에 초대받았습니다!</string>
-  <string name="ago_1day">하루 전</string>
-  <string name="ago_days">%d 일 전</string>
-  <string name="ago_1Minute">1분 전</string>
-  <string name="ago_minutes">%d 분 전</string>
-  <string name="ago_hours">%d 시간 전</string>
-  <string name="ago_1hour">1시간 전</string>
+  <string name="quest_begin_message">정말 시작하실건가요? 파티원 %2$d명 중 %1$d명만 퀘스트에 참여했어요. 퀘스트는 모든 플레이어가 초대 수락 또는 거절 의사를 밝히면 자동으로 시작됩니다.</string>
+  <string name="quest.invitation.text">퀘스트에 초대받았습니다!</string>
   <string name="today">오늘</string>
   <string name="sidebar_items">아이템</string>
   <string name="eggs">알</string>
@@ -307,16 +301,22 @@
   <string name="close">닫기</string>
   <string name="share">나누기</string>
   <string name="notification_pet_fed">%1$s %2$s 에게 먹이를 줬습니다!</string>
+  <string name="notification_purchase">%s 를 구매했습니다</string>
+  <string name="notification_purchase_reward">보상을 구매했습니다</string>
   <string name="sectionpets">기본 펫</string>
-  <string name="sectionpremiumPets">마법 물약의 펫</string>
+  <string name="sectionpremiumPets">마법물약 펫</string>
   <string name="sectionquestPets">퀘스트 펫</string>
   <string name="sectionspecialPets">희귀 펫</string>
   <string name="sectionmounts">기본 탑승펫</string>
-  <string name="sectionpremiumMounts">마법 물약의 탑승펫</string>
+  <string name="sectionpremiumMounts">마법 물약 탑승펫</string>
   <string name="sectionquestMounts">퀘스트 탑승펫</string>
   <string name="sectionspecialMounts">희귀 탑승펫</string>
   <string name="world_quest">세계 퀘스트</string>
-  <string name="inn_description">여관에서 쉬면 완료하지 못한 일일과제가 당신을 다치게 하는 것을 막을 수 있습니다. (주의: 보스로부터 받는 데미지는 피하지 못합니다.)</string>
+  <string name="inn_description">쉬고 싶으세요? Daniel의 여관에 묵으면 Habitica를 일부 멈추어둘 수 있습니다:\n\n
+• 미완료 일일과제 때문에 데미지를 입지 않습니다\n
+• 과제의 연속 기록을 잃거나 색이 변하지 않습니다\n
+• 보스가 미완료 일일과제에 따라 공격하지 않습니다\n
+• 당신이 보스에게 주는 데미지나 수집 퀘스트에서 수집한 아이템은 체크아웃하면 적용됩니다</string>
   <string name="empty_items">%s 가 하나도 없습니다</string>
   <string name="user_level">Lvl %d</string>
   <string name="user_level_with_class">Lvl %1$d %2$s</string>
@@ -324,7 +324,6 @@
   <string name="rogue">도적</string>
   <string name="mage">마법사</string>
   <string name="healer">힐러</string>
-  <string name="warrior_description">전사들은 보너스 골드, 경험치를 주고 아이템 드롭 확률을 증가시키는 \"치명타\"를 더 강하게, 자주 발생시킬 수 있습니다. 또, 보스몬스터에 강한 피해를 입힐 수 있습니다. 예측 불가능한 대박을 터트리거나 보스 공격에서 활약하는 것을 원한다면 전사를 추천합니다!</string>
   <string name="mage_description">마법사는 경험치와 레벨이 다른 클래스에 비해 빠르게 성장합니다. 또, 특수 능력을 사용하기 위한 마나도 훨씬 많습니다. 계획적인 과제달성 게임을 하시고 싶거나 빠른 레벨업으로 다양한 기능들을 체험하시고 싶으시다면 마법사를 추천합니다!</string>
   <string name="rogue_description">도적은 다른 클래스에 비해 골드를 더 많이 받고 랜덤한 아이템들을 잘 찾아냅니다. 그들의 민첩 능력은 일일과제를 놓쳐서 발생하는 위험을 잘 피할 수 있도록 합니다. 보상과 업적, 아이템과 뱃지 모으기를 좋아하신다면 도적을 추천합니다!</string>
   <string name="healer_description">힐러는 공격에 휘둘리지 않고 동료들을 보호해 줍니다. 놓친 일일과제와 나쁜 습관들은 그들에게 큰 피해를 입히지 못하고, 설령 실패를 하더라도 치료가 가능합니다. 파티원들을 도와주길 좋아하고 노력으로 죽음을 이겨내는 것이 매력적이라면 힐러를 추천합니다!</string>
@@ -338,7 +337,7 @@
   <string name="dialog_go_back">뒤로 가기</string>
   <string name="opt_out_confirmation">선택을 유예하고 싶은 것이 확실한가요?</string>
   <string name="change_class">직업 바꾸기</string>
-  <string name="change_class_description">보석 3개를 사용하여 직업을 바꾸고 능력치를 초기화 하세요. 웹사이트에서 능력치를 배분할 수 있습니다. </string>
+  <string name="change_class_description">보석 3개를 이용해 직업을 바꾸고 능력치 포인트를 돌려받으세요.</string>
   <string name="enable_class">직업시스템 활성화</string>
   <string name="changing_class_progress">직업 바꾸기</string>
   <string name="by_email">이메일로</string>
@@ -366,8 +365,11 @@
   <string name="seasonalShop">계절 상점</string>
   <string name="empty_inbox">받은 편지함 메시지가 없습니다. 공개 채팅 메시지를 통해 사용자에게 새 메시지를 보낼 수 있습니다!</string>
   <string name="party_invite">친구를 초대하여 잠금 해제하기</string>
+  <string name="login_incentive">Habitica에 꾸준히 로그인하여 잠금해제</string>
+  <string name="create_account">계정을 만들어 잠금 해제</string>
   <string name="no_gold">골드가 충분하지 않음</string>
   <string name="no_potion">체력 물약을 살 필요가 없음</string>
+  <string name="successful_purchase">%1$s을(를) 구매함</string>
   <string name="purchase_confirmation_title">구매 확인</string>
   <string name="confirm_purchase_text">%1$s을(를) %2$s %3$s(으)로 구매함</string>
   <string name="gem">보석</string>
@@ -492,7 +494,7 @@
   <string name="warning">주의</string>
   <string name="open_settings">설정 열기</string>
   <string name="dont_keep_activities_warning">개발자 옵션 \\"활동을 보관하지 마세요\\"가 활성화 된 것 같습니다. 현재이 옵션을 사용하면 habitica 앱에 문제가 발생하므로 사용하지 않는 것이 좋습니다.</string>
-  <string name="inbox">받은 편지함</string>
+  <string name="inbox">메세지</string>
   <string name="FAQ">자주 묻는 질문</string>
   <string name="special">스페셜</string>
   <string name="gem_for_gold_description">당신은 Habitica를 정기 후원하시므로, 매달 골드를 이용해 특정량의 보석을 구입할 수 있습니다.</string>
@@ -527,7 +529,16 @@
   <string name="weak">약함</string>
   <string name="strong">강함</string>
   <string name="gray">회색</string>
+  <string name="completed">완료됨</string>
+  <string name="setuP_group_other">기타</string>
   <string name="empty_title_habits">습관이 하나도 없어요.</string>
+  <string name="empty_description_habits">\'습관\'은 엄격한 일정이 없는 과제입니다. 하루에 여러번 체크할 수도 있고, 아예 체크하지 않아도 됩니다.</string>
+  <string name="empty_title_dailies">일일과제가 하나도 없습니다.</string>
+  <string name="empty_description_dailies">일일과제는 주기적으로 하려고 하는 과제를 말합니다. 자신의 일정에 맞게 설정하세요.</string>
+  <string name="empty_title_todos">할 일이 아직 없습니다.</string>
+  <string name="empty_title_rewards">보상이 없습니다.</string>
+  <string name="read_community_guidelines">글을 올리기 전에 커뮤니티 가이드라인을 읽어주세요</string>
+  <string name="reload_content">새로 고침</string>
   <string name="start_quest">새로운 퀘스트 시작하기</string>
   <string name="leave_party">파티 떠나기</string>
 </resources>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index 07999d434..1917b92b6 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -96,12 +96,8 @@
   <string name="friday">Penktadienis</string>
   <string name="saturday">Šeštadienis</string>
   <string name="sunday">Sekmadienis</string>
-  <string name="levelup_header">Pasiekei naują Lygį!</string>
-  <string name="levelup_detail">Siekdamas savo gyvenimo tikslų, pasiekei %1$d Lygį!</string>
-  <string name="levelup_health">Tavo gyvybingumas atstatytas!</string>
   <string name="levelup_button">Valio!</string>
   <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">Atstatyti Gyvybes ir bandyti dar kartą</string>
   <string name="filter">FIltras</string>
@@ -111,7 +107,6 @@
   <string name="used_skill_without_mana">Panaudojai %1$s.</string>
   <string name="new_checklist_item">naujas sąrašo punktas</string>
   <string name="add_checklist_item">Pridėti</string>
-  <string name="reminder_title">Nepamiršk pažymėti savo Užduočių!</string>
   <string name="skill_progress_title">Sugebėjimas Naudojamas</string>
   <string name="coming_soon">Jau Greitai</string>
   <string name="chat_flag_confirmation">Ar tikrai norite pranešti apie šią žinutę dėl pažeidimo?</string>
@@ -236,13 +231,7 @@
   <string name="equipped">Užsidėta</string>
   <string name="quest_cancel_message">Ar tikrai nori atšaukti misiją? Visi pakvietimai bus nutraukti. Misijos savininkas atgaus misijos rankraštį.</string>
   <string name="quest.invitation">Misijos Pakvietimas</string>
-    <string name="quest.invitation.text">Tave pakvietė dalyvauti misijoje!</string>
-  <string name="ago_1day">Liko 1 diena</string>
-  <string name="ago_days">prieš %d dieną(as)</string>
-  <string name="ago_1Minute">prieš 1 minutę</string>
-  <string name="ago_minutes">prieš %d minutę(es)</string>
-  <string name="ago_hours">prieš %d valandą(as)</string>
-  <string name="ago_1hour">prieš 1 valandą</string>
+  <string name="quest.invitation.text">Tave pakvietė dalyvauti misijoje!</string>
   <string name="today">Šiandien</string>
   <string name="sidebar_items">Daiktai</string>
   <string name="eggs">Kiaušiniai</string>
@@ -267,26 +256,15 @@
   <string name="feed">Maitinti</string>
   <string name="hatch_with">Užauginti gyvūną su %s</string>
   <string name="hatched_pet_title">Užauginai %1$s %2$s!</string>
-  <string name="evolved_pet_title">Prisijaukinai %1$s %2$s, lekiame paskraidyti!</string>
   <string name="close">Uždaryti</string>
   <string name="share">Dalintis</string>
   <string name="notification_pet_fed">Pašėrei savo %1$s %2$s!</string>
-  <string name="sectionpets">Paprasti Augintiniai</string>
-  <string name="sectionpremiumPets">Stebuklingų Eliksyrų Augintiniai</string>
-  <string name="sectionquestPets">Misijų Augintiniai</string>
-  <string name="sectionspecialPets">Reti Augintiniai</string>
-  <string name="sectionmounts">Paprasti Augintiniai</string>
-  <string name="sectionpremiumMounts">Stebuklingų Eliksyrų Augintiniai</string>
-  <string name="sectionquestMounts">Misijų Augintiniai</string>
-  <string name="sectionspecialMounts">Reti Augintiniai</string>
   <string name="world_quest">Pasaulinė Misija</string>
-  <string name="inn_description">Pailsėk Smuklėje, kad tavo nepabaigtos Kasdienės Užduotys nepadarytų tau žalos nakties metu! (Pastaba: pabaisos vistiek padarys tau žalos.)</string>
   <string name="empty_items">Nebeturi %s</string>
   <string name="warrior">Karys</string>
   <string name="rogue">Sukčius</string>
   <string name="mage">Magas</string>
   <string name="healer">Gydytojas</string>
-  <string name="warrior_description">Kariai dažniau sugeba smogti \"kritinius\" smūgius, kas duoda papildomo Aukso, Patirties ir padidina lobio gavimo šansą. Jie taip pat daro daug žalos pabaisoms. Pasirink karį, jei tave motyvuoja nenuspėjami atlygiai ar nori pasižymėti pabaisų medžiojimo Misijose!</string>
   <string name="mage_description">Magai greitaisi mokosi ir greičiau renka Patirtį ir Lygius nei kitos klasės. Jie taip pat turi daugiausia magijos taškų specialiems sugebėjimams. Pasirink Magą, jei tau patinka taktinė Habitica pusė arba jei tave labiausiai motyvuoja veikėjo lygio kilimas!</string>
   <string name="rogue_description">Sukčiai mėgsta kaupti turtus gaunami daugiausia Aukso ir rasdami daugiausia lobių. Jie taip pat gali pasislėpti nuo praleistų kasdienių Užduočių. Pasirink sukčių, jei tave labiausiai motyvuoja Atlygiai ir Pasiekimai ir nori kuo greičiau užpildyti savo kolekcijas!</string>
   <string name="healer_description">Gydytojai yra labai sunkiai sužeidžiami - savybė kuria jie dalinasis su aplinkiniais. Praleistos užduotys ir blogi įpročiai jų taip stipriai neveikia ir jie sugeba atstayti savo gyvybes po nesėkmių. Pasirink Gydytoją, jei nori padėti kitiems savo grupėje ir jei tave įkvepia Mirties apgaudinėjimas.</string>
@@ -298,7 +276,6 @@
   <string name="dialog_go_back">Grįžti</string>
   <string name="opt_out_confirmation">Ar tikrai nori atsisakyti?</string>
   <string name="change_class">Pakeisk klasę</string>
-  <string name="change_class_description">Pakeisk savo klasę ir atgauk išleistus savybių taškus už 3 brangakmenius. Šiuos taškus galėsi priskirti atsidarius interneto puslapį naršyklėje</string>
   <string name="enable_class">Įjungti Klasių Sistemą</string>
   <string name="changing_class_progress">Klasės Keitimas</string>
   <string name="by_email">El. Paštu</string>
@@ -321,7 +298,6 @@
   <string name="market">Turgus</string>
   <string name="timeTravelers">Keliautojai Laiku</string>
   <string name="seasonalShop">Sezoninė Parduotuvė</string>
-  <string name="empty_inbox">Tavo Pašo dėžutėje žinučių nėra. Kitiems vartotojams galima siųsti pranešimus paspaudus ant jų viešų pranešimų!</string>
   <string name="party_invite">Atidenk pakviečiant draugus</string>
   <string name="no_gold">Nepakanka Aukso</string>
   <string name="no_potion">Tau nereikia gyvybių eliksyro</string>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index ba175838c..f0f88a97f 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -115,12 +115,9 @@
   <string name="friday">Vrijdag</string>
   <string name="saturday">Zaterdag</string>
   <string name="sunday">Zondag</string>
-  <string name="levelup_header">Je bent een niveau omhoog gegaan!</string>
-  <string name="levelup_detail">Door het behalen van je doelen in het echte leven ben je uitgegroeid tot Niveau %1$d!</string>
-  <string name="levelup_health">Je bent volledig genezen!</string>
   <string name="levelup_button">Hoera!</string>
   <string name="faint_subtitle">Wanhoop niet!</string>
-  <string name="faint_penalty_body">Je verliest een niveau, je goud en een stuk uitrusting, maar je kunt ze allemaal terug krijgen door hard te werken! Succes--je zult het geweldig doen.</string>
+  <string name="faint_penalty_body">Je verliest een niveau, je goud en een stuk uitrusting, maar je kunt ze allemaal terug krijgen door hard te werken! Succes—je zult het geweldig doen.</string>
   <string name="faint_header">Je hebt geen Levenspunten meer!</string>
   <string name="faint_button">Herstel Gezondheid &amp; probeer opnieuw</string>
   <string name="filter">Filter</string>
@@ -130,7 +127,7 @@
   <string name="used_skill_without_mana">Je hebt %1$s gebruikt.</string>
   <string name="new_checklist_item">nieuw checklijstpunt</string>
   <string name="add_checklist_item">Toevoegen</string>
-  <string name="reminder_title">Vergeet niet om je Dagelijkse taken af te vinken!</string>
+  <string name="reminder_title">Vergeet je taken niet af te vinken</string>
   <string name="skill_progress_title">Vaardigheid gebruiken</string>
   <string name="coming_soon">Binnenkort beschikbaar</string>
   <string name="chat_flag_confirmation">Weet je zeker dat je dit bericht wilt melden wegens overtreding?</string>
@@ -270,13 +267,14 @@
   <string name="equipped">In gebruik</string>
   <string name="quest_cancel_message">Ben je zeker dat je deze queeste wilt beëindigen? Alle aangenomen uitnodigingen zullen verloren gaan. De eigenaar van de queeste zal de queesterol terug krijgen.</string>
   <string name="quest.invitation">Queeste uitnodiging</string>
-    <string name="quest.invitation.text">Je bent uitgenodigd om deel te nemen aan een queeste!</string>
-  <string name="ago_1day">1 dag geleden</string>
-  <string name="ago_days">%d dagen geleden</string>
-  <string name="ago_1Minute">1 minuut geleden</string>
-  <string name="ago_minutes">%d minuten geleden</string>
-  <string name="ago_hours">%d uren geleden</string>
-  <string name="ago_1hour">1 uur geleden</string>
+  <string name="quest_begin_message">Weet je het je zeker? Nog maar %1$d van je %2$d groepsleden hebben zich aangesloten bij deze queeste! Queestes beginnen automatisch wanneer alle spelers de uitnodiging hebben geaccepteerd of afgewezen.</string>
+  <string name="quest.invitation.text">Je bent uitgenodigd om deel te nemen aan een queeste!</string>
+  <string name="ago_1day">1d geleden</string>
+  <string name="ago_days">%dd geleden</string>
+  <string name="ago_1Minute">1m geleden</string>
+  <string name="ago_minutes">%dm geleden</string>
+  <string name="ago_hours">%du geleden</string>
+  <string name="ago_1hour">1u geleden</string>
   <string name="today">Vandaag</string>
   <string name="sidebar_items">Voorwerpen</string>
   <string name="eggs">Eieren</string>
@@ -301,20 +299,26 @@
   <string name="feed">Voeder</string>
   <string name="hatch_with">Laat huisdier uitkomen met %s</string>
   <string name="hatched_pet_title">Je hebt een %1$s %2$s laten uitkomen!</string>
-  <string name="evolved_pet_title">Je hebt %1$s %2$s getemd; laten we op weg gaan!</string>
+  <string name="evolved_pet_title">Je hebt %1$s%2$s afgericht, laten we een ridje maken!</string>
   <string name="close">Sluiten</string>
   <string name="share">Delen</string>
   <string name="notification_pet_fed">Je hebt je %1$s %2$s gevoederd!</string>
-  <string name="sectionpets">Normale huisdieren</string>
-  <string name="sectionpremiumPets">Huisdieren uit magische drankjes</string>
-  <string name="sectionquestPets">Queeste Huisdieren</string>
-  <string name="sectionspecialPets">Zeldzame Huisdieren</string>
-  <string name="sectionmounts">Normale rijdieren</string>
-  <string name="sectionpremiumMounts">Rijdieren uit magische drankjes</string>
-  <string name="sectionquestMounts">Queeste Rijdieren</string>
-  <string name="sectionspecialMounts">Zeldzame Rijdieren</string>
+  <string name="notification_purchase">Je hebt %s gekocht</string>
+  <string name="notification_purchase_reward">Je hebt een beloning gekocht</string>
+  <string name="sectionpets">Standaard</string>
+  <string name="sectionpremiumPets">Toverdrankje</string>
+  <string name="sectionquestPets">Queeste</string>
+  <string name="sectionspecialPets">Zeldzaam</string>
+  <string name="sectionmounts">Standaard</string>
+  <string name="sectionpremiumMounts">Magisch Drankje</string>
+  <string name="sectionquestMounts">Queeste</string>
+  <string name="sectionspecialMounts">Zeldzaam</string>
   <string name="world_quest">Wereldqueeste</string>
-  <string name="inn_description">Rust uit in de Herberg om ervoor te zorgen dat je ongedane Dagelijkse Taken je niet kunnen schaden in de nacht! (Let wel: je ontvangt nog wel schade van een Baas.)</string>
+  <string name="inn_description">Een pauze nodig? Check in bij Daniels Herberg om een paar van Habitica\'s moeilijkere spelmechanismen te pauzeren:\n\n
+• Gemiste dagelijkse taken zullen je niet beschadigen
+• Taken zullen geen streaks verliezen of vervallen in kleur
+• Bazen zullen je geen schade doen voor je gemiste dagelijkse taken
+• Je schade aan de baas of verzamelvoorwerpen van queesten zullen in afwachting blijven tot je uitcheckt</string>
   <string name="empty_items">Je hebt geen %s</string>
   <string name="user_level">NIV %d</string>
   <string name="user_level_with_class">NIV %1$d %2$s</string>
@@ -322,7 +326,7 @@
   <string name="rogue">Dief</string>
   <string name="mage">Magiër</string>
   <string name="healer">Heler</string>
-  <string name="warrior_description">Krijgers scoren meer en betere \"voltreffers\", die willekeurig extra Goud, Ervaring en kans op een voorwerp geven wanneer je een taak afvinkt. Ze doen ook veel schade aan bazen. Speel een Krijger wanneer je motivatie vindt in onvoorspelbare jackpot-stijl beloningen, of wanneer je de echte schade wilt uitdelen tijdens Baasqueestes!</string>
+  <string name="warrior_description">Krijgers scoren meer en betere \\"voltreffers\\", die willekeurig extra Goud, Ervaring en kans op een voorwerp geven wanneer je een taak afvinkt. Ze doen ook veel schade aan bazen. Speel een Krijger wanneer je motivatie vindt in onvoorspelbare jackpot-stijl beloningen, of wanneer je de echte schade wilt uitdelen tijdens Baasqueestes!</string>
   <string name="mage_description">Magiërs leren snel, en krijgen sneller ervaringspunten en niveaus dan andere klassen. Ze krijgen ook veel Mana door speciale talenten te gebruiken. Speel een magiër wanneer je de tactiek van Gewoontes leuk vindt of als je sterk gemotiveerd wordt door niveaus omhoog te gaan en speciale dingen te ontgrendelen!</string>
   <string name="rogue_description">Dieven vinden het geweldig om rijkdom te verwerven, en krijgen dus ook meer Goud dan de rest. Ook zijn ze goed in willekeurig voorwerpen vinden. Hun iconische Heimelijkheid laat hen zich verschuilen voor gemiste Dagelijkse Taken. Speel een Dief als je veel motivatie vindt in beloningen en prestaties, strevend voor de buit en de badges!</string>
   <string name="healer_description">Helers staan onaangedaan tegenover schade en kunnen die bescherming tot anderen uitstrekken. Gemiste Dagelijkse Taken en slechte Gewoontes doen hen niet veel, en ze hebben hun manieren om er terug bovenop te raken na pech. Speel een Heler als je het leuk vindt om anderen in je Groep te helpen of als het idee om de Dood door hard werk te slim af te zijn jou inspireert!</string>
@@ -336,7 +340,7 @@
   <string name="dialog_go_back">Ga terug</string>
   <string name="opt_out_confirmation">Weet je zeker dat je je wil afmelden?</string>
   <string name="change_class">Verander je klasse</string>
-  <string name="change_class_description">Verander je klasse en krijg je eigenschapspunten terug voor 3 edelstenen. Je kunt eigenschapspunten toewijzen via de website</string>
+  <string name="change_class_description">Verander je klasse en krijg je eigenschapspunten terug voor 3 edelstenen.</string>
   <string name="enable_class">Klassesysteem aanzetten</string>
   <string name="changing_class_progress">Van klasse veranderen</string>
   <string name="by_email">Via Email</string>
@@ -344,6 +348,7 @@
   <string name="send">Versturen</string>
   <string name="invite">Vrienden uitnodigen</string>
   <string name="invite_id_description">Als je vrienden hebt die al Habitica spelen, nodig hen dan hier uit met hun Gebruikers-ID.</string>
+  <string name="invite_username_description">Als je vrienden hebt die al Habitica spelen, nodig hen dan hier uit met hun gebruikersnaam.</string>
   <string name="invite_email_description">Als een vriend zich inschrijft op Habitica via jouw email, zullen ze automatisch uitgenodigd worden voor jouw groep!</string>
   <string name="add_invites">Uitnodigingen toevoegen</string>
   <string name="user_id">Gebruikers ID</string>
@@ -362,8 +367,10 @@
   <string name="market">Markt</string>
   <string name="timeTravelers">Tijdreizigers</string>
   <string name="seasonalShop">Seizoenswinkel</string>
-  <string name="empty_inbox">Je hebt geen inboxberichten. Je kan een gebruiker een nieuw bericht sturen vanuit hun openbare chatberichten.</string>
+  <string name="empty_inbox">Je hebt geen berichten. Je kunt een gebruiker een nieuw bericht sturen vanuit hun publieke chatberichten!</string>
   <string name="party_invite">Ontgrendel door vrienden uit te nodigen</string>
+  <string name="login_incentive">Speel vrij door regelmatig in te loggen bij Habitica</string>
+  <string name="create_account">Speel vrij door een account aan te maken</string>
   <string name="no_gold">Niet genoeg goud</string>
   <string name="no_potion">Je hoeft geen gezondheidsdrankje te kopen</string>
   <string name="successful_purchase">%1$s gekocht</string>
@@ -491,7 +498,7 @@
   <string name="warning">Waarschuwing</string>
   <string name="open_settings">Open instellingen</string>
   <string name="dont_keep_activities_warning">Het lijkt erop dat je de ontwikkelaarsoptie \\"Hou geen activiteiten bij\\" aan hebt staan. Momenteel zorgt deze optie voor problemen met de habitica app, dus raden we je aan het uit te zetten.</string>
-  <string name="inbox">Inbox</string>
+  <string name="inbox">Berichten</string>
   <string name="FAQ">Veel gestelde vragen</string>
   <string name="special">Speciaal</string>
   <string name="gem_for_gold_description">Omdat je geabonneerd bent op Habitica kan je iedere maand een aantal edelstenen kopen met goud.</string>
@@ -517,7 +524,6 @@
   <string name="login_btn_fb">Aanmelden met Facebook</string>
   <string name="login_btn_google">Aanmelden met Google</string>
   <string name="action_back">Terug</string>
-  <string name="welcome_text">Oh, jij bent vast nieuw hier. Ik ben Justin, ik zal je gids zijn in Habitica.\n\nOm te beginnen zul je een avatar moeten maken.</string>
   <string name="randomize">Willekeurig</string>
   <string name="avatar_extras">Extra\'s</string>
   <string name="avatar_skin_color">Huidskleur</string>
@@ -529,7 +535,7 @@
   <string name="weak">Zwak</string>
   <string name="strong">Sterk</string>
   <string name="gray">Grijs</string>
-  <string name="dated">Gedateerd</string>
+  <string name="dated">Gepland</string>
   <string name="completed">Voltooid</string>
   <string name="setuP_group_other">Andere</string>
   <string name="clear">Wissen</string>
@@ -551,14 +557,14 @@
   <string name="no_billing_subscriptions">Je apparaat heeft geen van de ondersteunde betaalmethodes. Gebruik alsjeblieft de Habitica-website als je een abonnement wilt kopen.</string>
   <string name="save">Opslaan</string>
   <string name="location">Locatie</string>
-  <string name="gem_reward">Edelsteenbeloning</string>
+  <string name="gem_reward">Edelsteen beloning</string>
   <string name="tasks">Taken</string>
-  <string name="create_challenge">Uitdaging maken</string>
-  <string name="edit_challenge">Uitdaging bewerken</string>
-  <string name="challenge_create_error_tavern_one_gem">Je hebt minstens 1 edelsteen nodig om een uitdaging in de Herberg te maken.</string>
+  <string name="create_challenge">Maak een Uitdaging</string>
+  <string name="edit_challenge">Bewerk</string>
+  <string name="challenge_create_error_tavern_one_gem">Je hebt minstens 1 edelsteen nodig om een openbare uitdaging te maken.</string>
   <string name="challenge_create_error_enough_gems">Je hebt niet genoeg edelstenen om een uitdaging te maken.</string>
-  <string name="identify_your_challenge_with_a_tag">Identificeer je uitdaging met een label ..</string>
-  <string name="challenge_create_error_tag">Je hebt een label nodig om deze uitdaging te maken.</string>
+  <string name="identify_your_challenge_with_a_tag">Identificeer je uitdaging met een korte naam</string>
+  <string name="challenge_create_error_tag">Je hebt een korte naam nodig om deze uitdaging te maken.</string>
   <string name="challenge_create_error_no_tasks">Je moet op zijn minst één taak toevoegen om deze uitdaging te maken.</string>
   <string name="challenge_create_error_title">Je hebt een titel nodig om deze uitdaging te maken.</string>
   <string name="description_optional">Beschrijving (optioneel)</string>
@@ -586,6 +592,9 @@
   <string name="quest_abort_message">Weet je zeker dat je deze missie wilt stoppen? Hij zal worden gestopt voor iedereen in je groep en alle vooruitgang raakt verloren. De queesterol wordt terug gegeven aan de eigenaar van de queeste.</string>
   <string name="loading">Aan het laden...</string>
   <string name="reloading_content">Inhoud opnieuw aan het laden</string>
+  <string name="thousand_abbrev">k</string>
+  <string name="million_abbrev">mln.</string>
+  <string name="billion_abbrev">mld.</string>
   <string name="your_balance">Jouw balans:</string>
   <string name="available_until" formatted="false">Verkrijgbaar tot %s</string>
   <string name="gems_left_max" formatted="false">Maandelijkse edelstenen: %1$d/%2$d Resterend</string>
@@ -599,10 +608,176 @@
   <string name="experience_reward" formatted="false">%dErvaringspunten</string>
   <string name="gold_reward" formatted="false">%d Goud</string>
   <string name="quest_owner_rewards">Queeste Eigenaar Beloningen</string>
+  <string name="str_abbrv">KRA</string>
+  <string name="per_abbrv">PER</string>
+  <string name="int_abbrv">INT</string>
+  <string name="con_abbrv">LIC</string>
+  <string name="reset_account">Account Resetten</string>
+  <string name="reset_account_description">WAARSCHUWING! Dit stelt grote delen van je account opnieuw in. Het wordt ten zeerste afgeraden, maar sommige mensen vinden het handig in het begin, na kort met de site te hebben gespeeld. \n\nAl je taken (behalve die van uitdagingen) zullen permanent verwijderd worden, en je zult al hun historische data verliezen. Je zult al je uitrusting verliezen, maar je kunt ze allemaal terugkopen, inclusief alle uitrusting met beperkte oplage of Mysterievoorwerpen voor abonnees die je al bezit (je zul wel in de juiste klasse moeten zijn om klassegebonden uitrusting terug te kopen). Je zult je huidige klasse en je huisdieren en rijdieren behouden. Wellicht gebruik je liever een Bol der Hergeboorte in de plaats, aangzien het een veel veiligere optie is waarbij je alle taken en uitrusting behoudt. </string>
   <string name="delete_account">Verwijder Account</string>
   <string name="delete_account_description">Weet je het zeker? Dit zal je account voor altijd wissen en het kan nooit meer hersteld worden! Je zult een nieuw account moeten aanmaken om Habitica opnieuw te gebruiken. Resterende of uitgegeven Edelstenen zullen niet terugbetaald worden. Als je het echt zeker weet, typ je wachtwoord dan in het onderstaande tekstveld.</string>
+  <string name="reset_account_confirmation">mijn account resetten</string>
   <string name="delete_account_confirmation">verwijder mijn account</string>
   <string name="danger_zone">Gevarenzone</string>
   <string name="nevermind">Laat maar</string>
+  <string name="resetting_account">Account aan het resetten</string>
   <string name="deleting_account">Account Verwijderen</string>
+  <string name="insufficientGold">Je moet meer taken voltooien voordat je dit voorwerp kunt aanschaffen!</string>
+  <string name="insufficientGems">Je hebt meer Edelstenen nodig om dit voorwerp te kopen!</string>
+  <string name="purchase_gems">Edelstenen kopen</string>
+  <string name="insufficientHourglasses">Je hebt meer Mystieke Zandlopers nodig om dit voorwerp te kopen!</string>
+  <string name="get_hourglasses">Krijg zandlopers</string>
+  <string name="subscribe_for_hourglasses">Abonneer voor Zandlopers</string>
+  <string name="timetravelers_closed_description">Verdien een Mystieke zandloper voor elke drie maanden van opeenvolgende abbonering, en gebruik ze dan om voorwerpen, huisdieren en rijdieren met beperkte oplage uit het verleden en de toekomst vrij te spelen!</string>
+  <string name="want_to_subscribe">Ik wil me abonneren</string>
+  <string name="seasonal_closed_description">De Grote Gala\'s vinden dicht bij zonnewenden en nachteveningen plaats, dus kom dan terug om een leuk assortiment aan speciale seizoensgebonden voorwerpen te vinden!</string>
+  <string name="come_back_soon">Kom snel terug!</string>
+  <string name="level">Niveau</string>
+  <string name="streak_label">21-daagse serie</string>
+  <string name="stats">Statistieken</string>
+  <string name="fix_character_description">Als je een fout aantreft, of je een vergissing hebt gemaakt die je personage onterecht heeft veranderd, kun je die waarden hier manueel aanpassen.</string>
+  <string name="fix_character_values">Personagewaarden herstellen</string>
+  <string name="saving">Aan het opslaan</string>
+  <string name="forgot_password_title">E-mail een link om je wachtwoord te resetten</string>
+  <string name="forgot_password_description">Voer het e-mail adres dat je gebruikte om je Habitica account te registreren in.</string>
+  <string name="forgot_password_confirmation">Als je we e-mail adres in ons bestand hebben zijn de instructies om een nieuw wachtwoord in te stellen naar je e-mail gestuurd.</string>
+  <string name="ok">OK</string>
+  <string name="profile">Profiel</string>
+  <string name="profile_summary">Pas je openbaar profiel aan.</string>
+  <string name="display_name">Weergavenaam</string>
+  <string name="photo_url">Foto URL</string>
+  <string name="login_name">Inlognaam</string>
+  <string name="about">Over</string>
+  <string name="app_settings">App-instellingen</string>
+  <string name="authentication">Authenticatie</string>
+  <string name="authentication_summary">Pas je authenticatieopties aan.</string>
+  <string name="change_password">Pas je wachtwoord aan.</string>
+  <string name="change_email">Pas je e-mail adres aan</string>
+  <string name="change_login_name">Pas je Inlognaam aan</string>
+  <string name="change_username">Pas je Gebruikersnaam aan</string>
+  <string name="change">Verander</string>
+  <string name="character_level">Niveau Personage</string>
+  <string name="auto_allocate_points">Automatisch Punten Toewijzen</string>
+  <string name="stat_guide">Gids bij statistieken</string>
+  <string name="character_build">Karakterbouw</string>
+  <string name="character_build_description">Bij elk niveau verdien je een punt om toe te wijzen aan een eigenschap van jou keuze. Dat kun je manueel doen, of je kunt het spel voor je laten beslissen door één van de opties voor Automatische Toewijzing te gebruiken.</string>
+  <string name="strength">Kracht</string>
+  <string name="strength_description">Verhoogt de bonus van voltreffers en maakt ze waarschijnlijker bij het voltooien van een taak. Verhoogt ook de schade die toegebracht wordt aan bazen.</string>
+  <string name="intelligence">Intelligentie</string>
+  <string name="intelligence_description">Verhoogt ERV die verdiend word door taken te voltooien. Verhoogt ook je mana capaciteit en hoe snel mana regenereert.</string>
+  <string name="constitution">Lichaam</string>
+  <string name="constitution_description">Verlaagt de hoeveelheid schade die je krijgt van je taken. De schade die je krijgt van bazen wordt niet verlaagd.</string>
+  <string name="perception">Perceptie</string>
+  <string name="perception_description">Verhoogt de kans om drops te vinden bij het voltooien van Taken, de dagelijkse drop-capaciteit, seriebonussen en de hoeveelheid goud die wordt die je verdient door Taken.</string>
+  <string name="buffs">Buffers</string>
+  <string name="allocated">Toegewezen</string>
+  <string name="distribute_evenly">Gelijkmatig Verdelen</string>
+  <string name="distribute_class">Verdeling baseren op klasse</string>
+  <string name="distribute_task">Verdelen op basis van activiteit van taken</string>
+  <string name="no_points_to_allocate">Geen punten toe te wijzen</string>
+  <string name="points_to_allocate" formatted="false">%dpunten toe te wijzen</string>
+  <string name="distribute_evenly_help">Wijst hetzelfde aantal punten toe aan elke eigenschap</string>
+  <string name="distribute_class_help">Wijst meer punten toe aan de eigenschappen die belangrijk zijn voor jou Klasse.</string>
+  <string name="distribute_task_help">Wijst punten toe op basis van de categorieën van Kracht, Intelligentie, Lichaam en Perceptie  die verbonden zijn aan de taken die je voltooit.</string>
+  <string name="allocating_points">Punten aan het toewijzen</string>
+  <string name="class_equipment">Uitrusting</string>
+  <string name="equipment_empty">Je hebt alle uitrusting al! Meer zal uitgebracht worden tijdens de Grote Galas, dicht bij de zonnestilstanden en nachteveningen.</string>
+  <string name="classless">Klasseloos</string>
+  <string name="class_equipment_shop_dialog">Dit voorwerp is enkel beschikbaar voor een specifieke klasse.\n Je kunt van klasse veranderen bij je Instellingen.</string>
+  <string name="class_gear_disclaimer">Je kunt enkel uitrusting kopen voor je huidige klasse</string>
+  <string name="available_stats" formatted="false">%d punten</string>
+  <string name="toogle_emojis">Emojis aan- en uit zetten</string>
+  <string name="tavern_description">Welkom in de Herberg! Kom erbij zitten om te praten of neem een pauze van je taken.</string>
+  <string name="check_into_inn">Check in bij de Herberg</string>
+  <string name="community_guidelines">gemeenschapsrichtlijnen</string>
+  <string name="view_community_guidelines">Bekijk de gemeenschapsrichtlijnen</string>
+  <string name="guidelines_description">Habitica wenst ruimte te bieden aan gebruikers van alle leeftijden en achtergronden, vooral op openbare plekken zoals de Herberg. Als je hierover vragen hebt, raadpleeg dan onze richtlijnen.</string>
+  <string name="helpful_links">Handige links</string>
+  <string name="view_faq">Bekijk de FAQ</string>
+  <string name="report_bug">Meld een bug</string>
+  <string name="player_tiers">Rangen spelers</string>
+  <string name="staff_moderators">Staf en Moderatoren</string>
+  <string name="tiers_descriptions">De gekleurde gebruikersnamen die je in de chat ziet stellen iemands rang van bijdrage voor. Hoe hoger de rang, hoe meer die persoon heeft bijgedragen aan Habitica aan de hand van kunst, code, de gemeenschap of meer!</string>
+  <string name="navigation_drawer_open">Open navigatie lade</string>
+  <string name="navigation_drawer_close">Sluit navigatie lade</string>
+  <string name="world_boss">Wereldbaas</string>
+  <string name="world_boss_art">Baas-illustratie</string>
+  <string name="boss_art">Baas Kunst</string>
+  <string name="world_boss_description">Wereldbaas beschrijving</string>
+  <string name="rage_strike_count" formatted="false">Woede Aanvallen: %d/%d</string>
+  <string name="pending_strike_description">Deze aanval is nog niet gebeurd!\nDe Wereldbaas zal een van de vriendelijke winkeliers aanvliegen wanneer de woedebalk opvult. Houd je dagelijkse taken bij en probeer dit te vermijden!</string>
+  <string name="pending_strike_title">Inkomende Aanval</string>
+  <string name="strike_description_title">Wat is een Woede Aanval?</string>
+  <string name="strike_description_subtitle">Er zijn 3 potentiële Woede Aanvallen</string>
+  <string name="strike_description_description">De meter vult wanneer een Habitican zijn dagelijkse taken mist. Als deze compleet gevuld is, zal de DysHeartener zijn Verbrijzelende Liefdesverdriet op een van Habitica\'s winkeliers loslaten, dus zorg ervoor dat je taken gedaan worden!</string>
+  <string name="pending_strike_subtitle">Deze Aanval is nog niet gebeurd!</string>
+  <string name="strike_active_title" formatted="false">De %s werd aangevallen!</string>
+  <string name="strike_active_subtitle" formatted="false">%s\'s hart is gebroken!</string>
+  <string name="strike_active_description" formatted="false">Onze dierbare %s was verwoest toen de %s de %s verbrijzelde. Pak snel je taken aan om het monster te verslaan en te helpen herbouwen!</string>
+  <string name="questShop">Queestenwinkel</string>
+  <string name="market_owner_long">Alex de Handelaar</string>
+  <string name="tavern_owner_long">Daniel de herbergier</string>
+  <string name="stable_owner_long">Matt de beestenmeester</string>
+  <string name="hide_boss_art">Verberg Baas-illustratie</string>
+  <string name="active_world_boss">Actieve Wereldbaas</string>
+  <string name="no_party_description">Ga op queesten met vrienden of met jezelf. Vecht met monsters, creëer Uitdagingen en help jezelf om verantwoordelijk te blijven met behulp van Gezelschappen.   </string>
+  <string name="no_party_title">Speel Habitica in een groep</string>
+  <string name="join_party_description">Geef een groepslid jouw gebruikersnaam die hieronder te vinden is en dan kunnen ze jou uitnodigen</string>
+  <string name="join_party_description_id">Geef hen jouw gebruikers-ID of laat hen jouw QR-code scannen om je uit te nodigen.</string>
+  <string name="join_party_title">Wil je deelnemen aan een gezelschap?</string>
+  <string name="create_party_website">Open de website om een groep aan te maken</string>
+  <string name="id_copied">ID naar klembord gekopieerd</string>
+  <string name="insufficientSubscriberGems">Je hebt alle Edelstenen die je deze maand kan kopen al gekocht. Meer Edelstenen worden beschikbaar binnen de eerste drie dagen van elke maand. Bedankt om geabonneerd te zijn!</string>
+  <string name="insufficientSubscriberGemsTitle">Maandelijkse Maximum Edelstenen Bereikt</string>
+  <string name="chat_message">Chatbericht</string>
+  <string name="world_boss_description_title">Wat is een Wereldbaas?</string>
+  <string name="world_boss_description_description">Een Wereldbaas is een speciaal evenement waarbij de hele gemeenschap samenwerkt om een machtig monster neer te halen met hun taken!\nVoltooi taken om de Baas te beschadigen\nDe Baas doet geen schade voor gemiste taken, maar zijn Woedebalk gaat omhoog. Als de balk gevuld raakt, dan valt de Baas één van de winkeliers aan!\nJe kan gewoon doorgaan met normale Queeste Bazen,  schade geldt voor beide\.Check de Herberg om de vooruitgang van de Baas en zijn woede aanvallen te zien</string>
+  <string name="world_boss_description_intro">Een Wereldbaas is een speciaal evenement waarbij de hele gemeenschap samenwerkt om een krachtig monster met hun taken te verslaan!</string>
+  <string name="world_boss_description_1">Volbreng taken om de Baas te beschadigen</string>
+  <string name="world_boss_description_2">Deze Baas zal jou niet schaden voor gemiste taken, maar zal zijn Woedemeter Omhoog doen gaan. Als deze vol is, zal de Baas één van onze winkeliers aanvallen!</string>
+  <string name="world_boss_description_3">Je kan verdergaan met normale Queeste-Bazen, jouw schade zal voor beiden tellen.</string>
+  <string name="world_boss_description_4">Check de Herberg om de vooruitgang en Woedeaanvallen van de Baas te zien.</string>
+  <string name="world_boss_action_prompt" formatted="false">Versla de Baas om speciale beloningen te ontvangen en red Habitica van %s\'s terreur!</string>
+  <string name="world_boss_description_subtitle">%s valt aan!</string>
+  <string name="questShop_owner_long">Ian de queeste-gids</string>
+  <string name="seasonalShop_owner_long">Seizoenstovenares</string>
+  <string name="rage_attack">Woedeaanval</string>
+  <string name="tavern_description_world_boss">Oh jee, schenk geen aandacht aan het monster hier beneden — dit blijft een veilige plaats om te chatten tijdens je pauzes.</string>
+  <string name="report">rapporteer</string>
+  <string name="like">Vind ik leuk</string>
+  <string name="reply">Reageer</string>
+  <string name="challenge_prize">Uitdaging Prijs</string>
+  <string name="challenge_categories">Uitdaging Categorieën</string>
+  <string name="created_challenge">Gemaakte uitdaging</string>
+  <string name="joined">Toegetreden</string>
+  <string name="public_challenge">Openbare uitdaging</string>
+  <string name="short_name">korte naam</string>
+  <string name="unlock_attribute_points">Attribuutpunten toewijzen wordt ontgrendeld vanaf niveau 10</string>
+  <string name="same_day_reminder_title">Heb je al wat taken toegevoegd?</string>
+  <string name="same_day_reminder_text">Hoe meer je toevoegt, hoe hoger de beloning. Zelfs kleine gewoontes voegen toe aan grote verandering. </string>
+  <string name="next_day_reminder_title">Heb je jou taken afgevinkt vandaag?</string>
+  <string name="next_day_reminder_text">Er is veel om te ontgrendelen en te ontdekken als je niveau omhoog gaat, dus houd je taken bij en veel plezier!</string>
+  <string name="daily_tip_0">Wil je iets nieuws proberen? Sluit je aan bij een uitdaging om je takenlijst te vergroten en win wat Edelstenen!</string>
+  <string name="daily_tip_1">Voeg checklijsten toe aan jou To-Dos om de beloningen te vermenigvuldigen!</string>
+  <string name="daily_tip_2">Je kunt veranderen hoe vaak een Dagelijkse taak zich herhaalt. Zelfs onregelmatige taken kunnen ingepland worden.</string>
+  <string name="daily_tip_3">Je kunt ook specifieke herinneringen voor Dagelijkse taken inplannen. </string>
+  <string name="daily_tip_4">Het van tijd tot tijd herevalueren van je taken kan je helpen om op het rechte pad te blijven. </string>
+  <string name="daily_tip_5">Haal een paar keer diep adem om je te helpen focussen. Je kunt dit!</string>
+  <string name="daily_tip_6">Probeer een timer te zetten voor 10 minuten en kijk hoeveel je kunt doen!</string>
+  <string name="daily_tip_7">Probeer taken van de Markt vast te prikken bij je Beloningen om je te motiveren ze te verdienen!</string>
+  <string name="moderator">Moderator</string>
+  <string name="expand_notes">Lees Meer</string>
+  <string name="collapse_notes">Laat minder zien</string>
+  <string name="reset_streak">Reset Serie</string>
+  <string name="week_reminder_title">Hoe gaat het met je taken?</string>
+  <string name="week_reminder_text">Pauzes zijn gezond, maar je kan nog steeds punten krijgen voor simpele activiteiten om levels omhoog te gaan en een coole uitrusting te krijgen.</string>
+  <string name="last_login">Laatste Check-in</string>
+  <string name="total_checkins">Totaal aantal Check-ins</string>
+  <string name="two_handed">Tweehandig</string>
+  <string name="usernamePromptTitle">Het is tijd om een gebruikersnaam te kiezen</string>
+  <string name="confirmUsername">Bevestig gebruikersnaam</string>
+  <string name="confirm_username_title">Weet je zeker dat je jou huidige gebruikersnaam wilt bevestigen?</string>
+  <string name="cancel">Annuleren</string>
+  <string name="confirm_username">Bevestig gebruikersnaam</string>
+  <string name="username_not_confirmed">Gebruikersnaam niet bevestigd</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.profile.xml b/Habitica/res/values-pl/strings.profile.xml
index 615747687..fed0ad7f7 100644
--- a/Habitica/res/values-pl/strings.profile.xml
+++ b/Habitica/res/values-pl/strings.profile.xml
@@ -3,6 +3,7 @@
     <string name="profile_pets_and_mounts">Chowańce i Wierzchowce</string>
     <string name="profile_pets_found">Znalezione chowańce</string>
     <string name="profile_mounts_tamed">Okiełznane wierzchowce</string>
+    <string name="profile_loading_data">Ładowanie danych użytkownika...</string>
     <string name="profile_send_message_to">Wyślij wiadomość do %s</string>
     <string name="profile_message_sent_to">Wiadomość wysłana do %s</string>
     <string name="profile_level">Poziom:</string>
@@ -11,6 +12,7 @@
     <string name="profile_boosts">Doładowania:</string>
     <string name="profile_private_message">Wiadomość prywatna</string>
     <string name="profile_achievements">Osiągnięcia</string>
+    <string name="profile_achievement_ok">OK</string>
     <string name="profile_qrcode_close">Zamknij</string>
 
 </resources>
diff --git a/Habitica/res/values-pl/strings.sidebar.xml b/Habitica/res/values-pl/strings.sidebar.xml
index 0b4561c59..199edca2f 100644
--- a/Habitica/res/values-pl/strings.sidebar.xml
+++ b/Habitica/res/values-pl/strings.sidebar.xml
@@ -3,13 +3,13 @@
   <string name="sidebar.tasks">Zadania</string>
   <string name="sidebar.skills">Umiejętności</string>
   <string name="sidebar.section.social">Społeczność</string>
-  <string name="sidebar.inbox">Skrzynka pocztowa</string>
+  <string name="sidebar.inbox">Wiadomości</string>
   <string name="sidebar.tavern">Karczma</string>
   <string name="sidebar.party">Drużyna</string>
   <string name="sidebar.purchaseGems">Kup Klejnoty</string>
   <string name="sidebar.guilds">Gildie</string>
   <string name="sidebar.challenges">Wyzwania</string>
-  <string name="sidebar.section.inventory">Inwentarz</string>
+  <string name="sidebar.section.inventory">Ekwipunek</string>
   <string name="sidebar.avatar">Awatar</string>
   <string name="sidebar.equipment">Ekwipunek</string>
   <string name="sidebar.stable">Stajnia</string>
@@ -17,4 +17,5 @@
   <string name="sidebar.settings">Ustawienia</string>
   <string name="sidebar.about">O programie</string>
   <string name="sidebar_shops">Sklepy</string>
+  <string name="sidebar_stats">Statystyki</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.tutorial.xml b/Habitica/res/values-pl/strings.tutorial.xml
index a0723fb64..5f8eb28b2 100644
--- a/Habitica/res/values-pl/strings.tutorial.xml
+++ b/Habitica/res/values-pl/strings.tutorial.xml
@@ -1,9 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="tutorial_overview">To zaczynamy! Wprowadziłem kilka zadań dla Ciebie w oparciu o Twoje zainteresowania. Spróbuj dodać kilka swoich. Możesz edytować każde zadanie stukając w tytuł.</string>
+  <string name="tutorial_habits_1">Po pierwsze, Nawyki. Możesz dodać pozytywne Nawyki, które chcesz wzmocnić lub negatywne Nawyki, które chcesz rzucić.</string>
   <string name="tutorial_habits_2">Za każdym razem, kiedy zrobisz pozytywny nawyk, naciśnij +, aby otrzymać doświadczenie i złoto!</string>
+  <string name="tutorial_habits_3">Jeśli zdarzy Ci się potknięcie i wykonasz negatywny nawyk, naciśnięcie - zredukuje zdrowie twojego awatara, aby pomóc Ci w byciu odpowiedzialnym.</string>
+  <string name="tutorial_habits_4">Spróbuj sprawdzić inne rodzaje zadań poprzez dolną nawigację!</string>
   <string name="tutorial_dailies_1">Twórz Codzienne dla zadań, które wymagają regularnego działania.</string>
   <string name="tutorial_dailies_2">Bądź ostrożny - jeśli pominiesz jedno z nich, twój awatar następnego dnia otrzyma obrażenia. Systematyczne odznaczanie ich przynosi wspaniałe nagrody!</string>
   <string name="tutorial_todos_1">Użyj Do-Zrobienia dla zadań, które musisz zrobić tylko raz.</string>
+  <string name="tutorial_todos_2">Jeśli twoje Do-Zrobienia ma być wykonane w określonym czasie, ustal termin. Wygląda na to, że jedno możesz odhaczyć — śmiało!</string>
   <string name="tutorial_rewards_1">Kup wyposażenie dla swojego awatara za złoto, które zarobiłeś!</string>
   <string name="tutorial_rewards_2">Możesz również robić realne nagrody, na podstawie tego, co Cię motywuje.</string>
   <string name="tutorial_tasks_complete">To wszystko na razie. Jeżeli potrzebujesz przypomnienia, sprawdź sekcję FAQ.</string>
@@ -14,4 +19,5 @@
   <string name="tutorial_party">Tutaj Ty i Twoi przyjaciele pilnujecie wzajemnie swoich celów i walczycie z potworami poprzez swoje zadania!</string>
   <string name="tutorial_tavern">Witaj w Karczmie - publicznym czacie dla wszystkich grup wiekowych! Możecie tu rozmawiać o produktywności i zadawać pytania. Miłej zabawy!</string>
   <string name="tutorial_classes">Wybierz, czy zostać Wojownikiem, Magiem, Uzdrowicielem, czy Łotrzykiem! Każda klasa ma unikalny zestaw wyposażenia i umiejętności. By dowiedzieć się więcej, stuknij (?) !</string>
+  <string name="tutorial_stats">Naciśnij szary przycisk by przydzielić dużo punktów statystyk na raz albo naciskaj strzałki by przydzielać je pojedynczo. </string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index eed07c6f2..cde77de61 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -115,12 +115,8 @@
   <string name="friday">Piątek</string>
   <string name="saturday">Sobota</string>
   <string name="sunday">Niedziela</string>
-  <string name="levelup_header">Zyskałeś Poziom!</string>
-  <string name="levelup_detail">Wypełniając życiowe cele, zyskałeś Poziom %1$d!</string>
-  <string name="levelup_health">Zostałeś w pełni uzdrowiony!</string>
   <string name="levelup_button">Hurra!</string>
   <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">Uzupełnij Zdrowie &amp; Spróbuj jeszcze raz</string>
   <string name="filter">Filtr</string>
@@ -130,7 +126,6 @@
   <string name="used_skill_without_mana">Użyto %1$s.</string>
   <string name="new_checklist_item">nowa część zadania</string>
   <string name="add_checklist_item">Dodaj</string>
-  <string name="reminder_title">Pamiętaj o odhaczaniu Codziennych!</string>
   <string name="skill_progress_title">Użycie umiejętności</string>
   <string name="coming_soon">Wkrótce dostępne</string>
   <string name="chat_flag_confirmation">Jesteś pewny że chcesz zgłosić tą wiadomość z powodu naruszeń?</string>
@@ -191,10 +186,12 @@
   <string name="dismiss_tutorial">Przypomnij mi później</string>
   <string name="intro_1_subtitle">Witaj w</string>
   <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Nadszedł czas, by się bawić kiedy wykonujesz swoje zadania. Dołącz do ponad %s innych, którzy polepszyli swoje życie wykonując zadanie za zadaniem.</string>
   <string name="intro_2_subtitle">Postęp w grze</string>
   <string name="intro_2_title">Postęp w życiu</string>
   <string name="intro_2_description">Odblokuj cechy w grze przez wykonywanie twoich zadań z realnego życia. Zdobywaj broń, chowańce i znacznie więcej za realizacje swoich celów.</string>
   <string name="intro_3_subtitle">Walcz z potworami</string>
+  <string name="intro_3_title">Bądź społeczny</string>
   <string name="intro_3_description">Zmierzaj do swoich celów z pomocą przyjaciół. Wspierajcie się wzajemnie w życiu i w walce, aby wspólnie się udoskonalać!</string>
   <string name="intro_finish_button">Zaczynajmy!</string>
   <string name="previous_button">Poprzedni</string>
@@ -203,6 +200,7 @@
   <string name="setup_welcome_description">Witaj w Habitice, gdzie postęp w grze ulepszy Twoje życie! Osiągając cele w prawdziwym świecie, odblokowujesz ekwipunek, chowańce, misje i wiele więcej.</string>
   <string name="setup_welcome_title">Witaj</string>
   <string name="avatar_setup_description">Więc, jak chciałbyś wyglądać. Nie obawiaj się, możesz to później zmienić.</string>
+  <string name="task_setup_description">Świetnie! Teraz, nad czym chciałbyś popracować podczas tej podróży?</string>
   <string name="setup_group_work">Praca</string>
   <string name="setup_group_exercise">Ćwiczenia</string>
   <string name="setup_group_health">Zdrowie</string>
@@ -267,13 +265,8 @@
   <string name="equipped">W użyciu</string>
   <string name="quest_cancel_message">Jesteś pewien że chcesz przerwać quest? Quest zostanie przerwany dla wszystkich uczestników. Zwołujący quest odzyska skrypt (quest scroll).</string>
   <string name="quest.invitation">Zaproszenie do questa.</string>
-    <string name="quest.invitation.text">Zostałeś zaproszony do udziału w misji!</string>
-  <string name="ago_1day">1 dzień temu</string>
-  <string name="ago_days">%d dni temu</string>
-  <string name="ago_1Minute">1 minutę temu</string>
-  <string name="ago_minutes">%d minut temu</string>
-  <string name="ago_hours">%d godzin temu</string>
-  <string name="ago_1hour">1 godzinę temu</string>
+  <string name="quest_begin_message">Jesteś pewien? Tylko %1$d z %2$d członków twojej drużyny dołączyło do tej misji! Misje zaczynają się automatycznie kiedy wszyscy członkowie dołączą bądź odrzucą zaproszenie.</string>
+  <string name="quest.invitation.text">Zostałeś zaproszony do udziału w misji!</string>
   <string name="today">Dzisiaj</string>
   <string name="sidebar_items">Przedmioty</string>
   <string name="eggs">Jaja</string>
@@ -298,20 +291,25 @@
   <string name="feed">Nakarm</string>
   <string name="hatch_with">Wykluj za pomocą %s</string>
   <string name="hatched_pet_title">Wyklułeś/as %1$s %2$s!</string>
-  <string name="evolved_pet_title">Oswoiłeś: %1$s %2$s, chodźmy na przejażdżkę!</string>
   <string name="close">Zamknij</string>
   <string name="share">Podziel się</string>
   <string name="notification_pet_fed">Nakarmiłeś/aś %1$s %2$s!</string>
-  <string name="sectionpets">Podstawowe chowańce</string>
-  <string name="sectionpremiumPets">Magiczne chowańce</string>
-  <string name="sectionquestPets">Chowańce z misji</string>
-  <string name="sectionspecialPets">Rzadkie chowańce</string>
-  <string name="sectionmounts">Podstawowe wierzchowce</string>
-  <string name="sectionpremiumMounts">Magiczne wierzchowce</string>
-  <string name="sectionquestMounts">Wierzchowce z misji</string>
-  <string name="sectionspecialMounts">Rzadkie wierzchowce</string>
+  <string name="notification_purchase">Kupiłeś %s</string>
+  <string name="notification_purchase_reward">Kupiłeś nagrodę</string>
+  <string name="sectionpets">Standardowe</string>
+  <string name="sectionpremiumPets">Eliksir Magiczny</string>
+  <string name="sectionquestPets">Misja</string>
+  <string name="sectionspecialPets">Rzadkie</string>
+  <string name="sectionmounts">Standardowe</string>
+  <string name="sectionpremiumMounts">Eliksir Magiczny</string>
+  <string name="sectionquestMounts">Misja</string>
+  <string name="sectionspecialMounts">Rzadkie</string>
   <string name="world_quest">Zadanie ogólnoświatowe</string>
-  <string name="inn_description">Odpoczywaj w Karczmie aby zapobiec obrażeniu z niewykonanych zadań codziennych w ciągu nocy! (Notatka: nie zapobiega przed obrażeniami otrzymanymi od Bossa ogólnoświatowego.)</string>
+  <string name="inn_description">Potrzebujesz przerwy? Zamelduj się w Karczmie Daniela, aby wstrzymać niektóre z cięższych elementów Habitiki.
+• Pominięte Codzienne nie zadadzą Ci obrażeń.
+• Zadania nie stracą serii ani nie osłabią się w kolorze
+• Bossowie nie zadadzą Ci  obrażeń za pominięte Codzienne
+• Twoje obrażenia dla bossa albo misje zbierackie zostaną jako oczekujące do końca dnia</string>
   <string name="empty_items">Nie posiadasz %s</string>
   <string name="user_level">poz %d</string>
   <string name="user_level_with_class">poz %1$d %2$s</string>
@@ -319,7 +317,6 @@
   <string name="rogue">Łotrzyk</string>
   <string name="mage">Mag</string>
   <string name="healer">Uzdrowiciel</string>
-  <string name="warrior_description">Wojownicy mają częstsze i lepsze \"trafienia krytyczne\", które losowo dają Złoto, Doświadczenie, i szansę na zdobycz za odznaczenie zadania. Zadają także ciężkie obrażenia bossom. Graj jako Wojownik jeśli motywują Cię nieprzewidywalne nagrody, lub jeśli chcesz niszczyć bossów w Misjach!</string>
   <string name="mage_description">Magowie uczą się sprawnie, zyskując Doświadczenie i Poziomy szybciej niż inne klasy. Dostają także dużo Many na specjalne umiejętności. Graj jako Mag jeśli lubisz elementy gry taktycznej w Habit, lub jeśli jesteś silnie motywowany przez zdobywanie poziomów i odblokowywanie zaawansowanych aspektów gry!</string>
   <string name="rogue_description">Łotrzyki uwielbiają gromadzić bogactwa, zyskując więcej Złota niż inni, oraz są adeptami w znajdowaniu losowych rzeczy. Ich umiejętność skradania pozwala im uniknąć konsekwencji pominięcia Codziennych. Graj jako Łotrzyk jeśli motywują Cię Nagrody i Osiągnięcia, walczenie o skarby i odznaki!</string>
   <string name="healer_description">Medycy są odporni na obrażenia, i przedłużają tą ochronę na innych. Pominięte Codzienne i złe Nawyki nie robią na nich wrażenia, mają także sposoby na odzyskanie Zdrowia po porażce. Graj jako Medyk jeśli lubisz pomagać innym w Drużynie, lub jeśli koncepcja oszukania Śmierci dzięki ciężkiej pracy jest dla ciebie inspirująca!</string>
@@ -333,7 +330,7 @@
   <string name="dialog_go_back">Wróć</string>
   <string name="opt_out_confirmation">Czy na pewno chcesz wyjść?</string>
   <string name="change_class">Zmień swoją klasę</string>
-  <string name="change_class_description">Zmień klasę i odzyskaj punkty atrybutów za 3 kryształy. Możesz przedzielić punkty atrybutów poprzez stronę internetową.</string>
+  <string name="change_class_description">Zmień klasę i odzyskaj punkty statystyk za 3 klejnoty.</string>
   <string name="enable_class">Odblokuj System Klas</string>
   <string name="changing_class_progress">Zmiana Klasy</string>
   <string name="by_email">Przez e-mail</string>
@@ -359,10 +356,13 @@
   <string name="market">Sklep</string>
   <string name="timeTravelers">Podróżnicy w czasie</string>
   <string name="seasonalShop">Sklep sezonowy</string>
-  <string name="empty_inbox">Nie masz żadnych wiadomości. Możesz wysłać użytkownikowi nową wiadomość za pomocą ich publicznych wiadomości!</string>
+  <string name="empty_inbox">Nie masz żadnych wiadomości. Możesz wysłać użytkownikowi nową wiadomość za pomocą ich publicznych wiadomości z czatu!</string>
   <string name="party_invite">Odblokuj poprzez zapraszanie przyjaciół</string>
+  <string name="login_incentive">Odblokuj regularnie odwiedzając Habitikę</string>
+  <string name="create_account">Odblokuj tworząc konto</string>
   <string name="no_gold">Niewystarczająca ilość złota</string>
   <string name="no_potion">Nie potrzebujesz kupować eliksiru uzdrawiającego</string>
+  <string name="successful_purchase">Kupiono %1$s</string>
   <string name="purchase_confirmation_title">Potwierdź zakup</string>
   <string name="confirm_purchase_text">Zakup %1$s za %2$s %3$s</string>
   <string name="gem">diament</string>
@@ -432,13 +432,19 @@
   <string name="subscriptions">Subskrypcje</string>
   <string name="subscription_duration">Powtarzaj co %s</string>
   <string name="subscribe">Subskrybuj</string>
+  <string name="subscribe.listitem1.description">Kupiec Alexander będzie ci teraz sprzedawać Klejnoty po 20 złota każdy!\n\nJego miesięczne wysyłki są początkowo ograniczone do 25 Klejnotów na miesiąc, ale mogą się zwiększyć na podstawie długości twojego abonamentu.\n\nLimit zwiększa się o 5 Klejnotów co każde trzy miesiące ciągłego abonamentu, aż do maksymalnie 50 Klejnotów na miesiąc!</string>
   <string name="subscribe.listitem3.description">Historia ukończonych Do-Zrobienia i zadań jest dostępna dłużej.</string>
+  <string name="subscribe1month.gemcap">Limit klejnotów zaczyna się od 25</string>
+  <string name="subscribe3month.gemcap">Limit klejnotów zwiększony do 30</string>
+  <string name="subscribe6month.gemcap">Limit klejnotów zwiększony do 35</string>
+  <string name="subscribe12month.gemcap">Limit klejnotów zwiększony do 45</string>
   <string name="subscription_hourglasses">+%d Mistycznej Klepsydry</string>
   <string name="payment_method">Metoda płatności</string>
   <string name="subscription">Subskrypcja</string>
   <string name="active">Aktywne</string>
   <string name="cancel_subscription">Anuluj Subskrypcję</string>
   <string name="cancel_subscription_google.description">Nie chcesz dłużej subskrypcji? Możesz z niej zrezygnować w sekcji \"Moje Aplikacje\" Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle.description">Nie chcesz dłużej subskrybować? Z powodu twojej metody płatności, możesz anulować subskrypcję tylko poprzez stronę internetową. Kliknij przycisk poniżej, aby otworzyć stronę w twojej przeglądarce!</string>
   <string name="visit_habitica_website">Odwiedź Stronę Habitiki</string>
   <string name="current_bonuses">Obecne Dodatki</string>
   <string name="months_subscribed">Miesięcy subskrypcji</string>
@@ -451,6 +457,7 @@
   <string name="three_months">3 miesiące</string>
   <string name="six_months">6 miesięcy</string>
   <string name="twelve_months">12 miesięcy</string>
+  <string name="subscribe_prompt_thanks">Za subskrypcję otrzymasz te użyteczne korzyści:</string>
   <string name="subscription_status">Status Subskrypcji</string>
   <string name="byLeader">przez %s</string>
   <string name="challenge_details">Szczegóły wyzwania</string>
@@ -477,13 +484,14 @@
   <string name="warning">Uwaga</string>
   <string name="open_settings">Otwórz ustawienia</string>
   <string name="dont_keep_activities_warning">Wygląda, że masz aktywną opcję deweloperską \\"\"Don\'t keep Activities\"\. Obecnie powoduje ona problemy z Habitiką, dlatego też sugerujemy jej wyłączenie.</string>
-  <string name="inbox">Skrzynka odbiorcza</string>
+  <string name="inbox">Wiadomości</string>
   <string name="FAQ">Najczęściej Zadawane Pytania</string>
   <string name="special">Specjalne</string>
   <string name="gem_for_gold_description">Ponieważ jesteś abonentem Habitiki, możesz co miesiąc kupić, za złoto, pewną ilość klejnotów.</string>
   <string name="limited_count">%d zostało</string>
   <string name="gem_shop">Diament</string>
   <string name="mystery_item">Mistyczny Przedmiot</string>
+  <string name="myster_item_notes">Każdego miesiąca, abonenci dostają tajemniczy przedmiot. Jest on zazwyczaj wydawany około tydzień przed końcem miesiąca.</string>
   <string name="open">Otwórz</string>
   <string name="notification_mystery_item">Otwórz pudełko i znajdź %s!</string>
   <string name="checkInRewardEarned">Zdobyłeś %1$s jako nagrodę za poświęcenie w poprawie swojego życia.</string>
@@ -513,7 +521,7 @@
   <string name="weak">Słaby</string>
   <string name="strong">Silny</string>
   <string name="gray">Szary</string>
-  <string name="dated">Przestarzały</string>
+  <string name="dated">Zaplanowany</string>
   <string name="completed">Ukończone</string>
   <string name="setuP_group_other">Pozostałe</string>
   <string name="clear">Jasny</string>
@@ -528,29 +536,27 @@
   <string name="read_community_guidelines">Prosimy, przeczytaj Wytyczne Społeczności zanim umieścisz posta</string>
   <string name="maintenance">Utrzymanie</string>
   <string name="reload_content">Odśwież zawartość</string>
+  <string name="dailyDueDefaultView">Ustaw codzienne domyślnie w zakładce \'do\'</string>
   <string name="repeat_summary">Powtarzaj %1$sco %2$s%3$s%4$s</string>
   <string name="no_billing_gems">Twoje urządzenie nie posiada żadnych wspieranych metod płatności. Aby kupić klejnoty, użyj strony internetowej Habitiki.</string>
   <string name="no_billing_subscriptions">Twoje urządzenie nie posiada żadnych wspieranych metod płatności. Aby wykupić subskrypcję, użyj strony internetowej Habitiki.</string>
   <string name="save">Zapisz</string>
   <string name="location">Lokalizacja</string>
-  <string name="gem_reward">Klejnot nagrody</string>
   <string name="tasks">Zadania</string>
-  <string name="create_challenge">Stwórz wyzwanie</string>
-  <string name="edit_challenge">Edytuj wyzwanie</string>
-  <string name="challenge_create_error_tavern_one_gem">Potrzebujesz co najmniej 1 klejnotu, aby stworzyć wyzwanie w Karczmie.</string>
   <string name="challenge_create_error_enough_gems">Nie masz wystarczającej ilości klejnotów, aby stworzyć wyzwanie.</string>
-  <string name="identify_your_challenge_with_a_tag">Identyfikuj swoje wyzwanie z tagiem ..</string>
-  <string name="challenge_create_error_tag">Potrzebujesz taga, aby stworzyć to wyzwanie.</string>
   <string name="challenge_create_error_no_tasks">Musisz dodać co najmniej jedno zadanie, aby stworzyć to wyzwanie.</string>
   <string name="challenge_create_error_title">Potrzebujesz tytułu, aby stworzyć to wyzwanie.</string>
   <string name="description_optional">Opis (opcjonalne)</string>
   <string name="new_challenge_title">Tytuł nowego wyzwania</string>
   <string name="ownership">Własność</string>
   <string name="inn">Karczma</string>
+  <string name="system">System</string>
   <string name="start_quest">Rozpocznij nową misję</string>
   <string name="leave_party">Opuść drużynę</string>
   <string name="party_description">Opis drużyny</string>
+  <string name="number_participants">%1$dUczestników</string>
   <string name="welcome_back">Witaj ponownie</string>
+  <string name="yesterdaililes_prompt">Czy wykonałeś wczoraj któreś z tych Codziennych?</string>
   <string name="start_day">Rozpocznij nowy dzień!</string>
   <string name="leave_party_confirmation">Jesteś pewien, że chcesz opuścić drużynę ?</string>
   <string name="nextPrizeUnlocksIn" formatted="false">Następna nagroda za %d wizyt</string>
@@ -560,17 +566,114 @@
   <string name="participants">Uczestnicy</string>
   <string name="invitations">Zaproszenia</string>
   <string name="quest_leader_header" formatted="false">Rozpoczęta przez %s</string>
-  <string name="loading">Ładowanie...</string>
   <string name="reloading_content">Przeładowuję...</string>
+  <string name="thousand_abbrev">k</string>
+  <string name="million_abbrev">m</string>
+  <string name="billion_abbrev">b</string>
+  <string name="your_balance">Twoje saldo:</string>
   <string name="available_until" formatted="false">Dostępne do %s</string>
+  <string name="gems_left_nomax" formatted="false">Miesięczne Klejnoty: %d pozostało</string>
   <string name="health">Zdrowie</string>
+  <string name="collect">Zbierz</string>
+  <string name="rage_meter">Wskaźnik szału</string>
+  <string name="boss_quest">Misja z bossem</string>
+  <string name="collection_quest">Misja zbieracka</string>
+  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
   <string name="experience_reward" formatted="false">%d punktów doświadczenia</string>
   <string name="gold_reward" formatted="false">%d Złoto</string>
+  <string name="quest_owner_rewards">Nagroda dla właściciela misji</string>
+  <string name="str_abbrv">Sił</string>
+  <string name="per_abbrv">Per</string>
+  <string name="int_abbrv">Int</string>
+  <string name="con_abbrv">Kon</string>
   <string name="reset_account">Zresetuj konto</string>
   <string name="delete_account">Usuń konto</string>
+  <string name="reset_account_confirmation">zresetuj moje konto</string>
   <string name="delete_account_confirmation">Usuń moje konto</string>
   <string name="danger_zone">Strefa zagrożenia</string>
   <string name="nevermind">Nieważne</string>
   <string name="resetting_account">Resetowanie konta</string>
   <string name="deleting_account">Usuwanie konta</string>
+  <string name="insufficientGems">Potrzebujesz więcej klejnotów by kupić ten przedmiot!</string>
+  <string name="purchase_gems">Kup klejnoty</string>
+  <string name="insufficientHourglasses">Potrzebujesz więcej Mistycznych Klepsydr, żeby kupić ten przedmiot!</string>
+  <string name="get_hourglasses">Zdobądź klepsydry</string>
+  <string name="want_to_subscribe">Chcę mieć Abonament</string>
+  <string name="come_back_soon">Wróć wkrótce!</string>
+  <string name="level">Poziom</string>
+  <string name="streak_label">21-dniowe serie</string>
+  <string name="stats">Statystyki</string>
+  <string name="fix_character_description">Jeśli napotkałeś buga bądź popełniłeś błąd, który niesłusznie zmienił twoją postać, możesz ręcznie poprawić te wartości tutaj.</string>
+  <string name="fix_character_values">Napraw wartości postaci</string>
+  <string name="saving">Zapisywanie</string>
+  <string name="forgot_password_title">Wyślij email z linkiem do zresetowania hasła</string>
+  <string name="forgot_password_description">Podaj adres email, którego użyłeś podczas rejestrowania swojego konta w Habitice.</string>
+  <string name="ok">OK</string>
+  <string name="profile">Profil</string>
+  <string name="profile_summary">Edytuj Twój publiczny profil.</string>
+  <string name="display_name">Wyświetlane imię</string>
+  <string name="photo_url">URL zdjęcia</string>
+  <string name="login_name">Nazwa login</string>
+  <string name="about">O nas</string>
+  <string name="app_settings">Ustawienia aplikacji</string>
+  <string name="authentication">Uwierzytelnienie</string>
+  <string name="authentication_summary">Zmień swoje ustawienia uwierzytelniania.</string>
+  <string name="change_password">Zmień hasło</string>
+  <string name="change_email">Zmień adres email</string>
+  <string name="change_login_name">Zmień swoją nazwę login</string>
+  <string name="change">Zmień</string>
+  <string name="character_level">Poziom postaci</string>
+  <string name="auto_allocate_points">Automatyczne przydzielanie punktów</string>
+  <string name="stat_guide">Poradnik Statystyk</string>
+  <string name="strength">Siła</string>
+  <string name="intelligence">Inteligencja</string>
+  <string name="constitution">Kondycja</string>
+  <string name="perception">Percepcja</string>
+  <string name="buffs">Wzmocnienia</string>
+  <string name="allocated">Umieszczone</string>
+  <string name="distribute_evenly">Rozdzielaj po równo</string>
+  <string name="distribute_class">Rozdzielaj w oparciu o klasę</string>
+  <string name="distribute_task">Rozdzielaj na podstawie zadań</string>
+  <string name="no_points_to_allocate">Brak punktów do przydzielenia</string>
+  <string name="points_to_allocate" formatted="false">%d punkty do przydzielenia</string>
+  <string name="distribute_evenly_help">Przydziel taka samą liczbę punktów do każdego atrybutu.</string>
+  <string name="distribute_class_help">Przydziel więcej punktów do atrybutów ważnych dla twojej Klasy.</string>
+  <string name="allocating_points">Przydzielanie Punktów</string>
+  <string name="class_equipment">Ekwipunek</string>
+  <string name="classless">Bez klasy</string>
+  <string name="class_equipment_shop_dialog">Ten przedmiot jest dostępny tylko dla konkretnej klasy. \nMożesz zmienić swoją klasę w Ustawieniach.</string>
+  <string name="class_gear_disclaimer">Możesz kupić wyposażenie wyłącznie dla swojej obecnej klasy</string>
+  <string name="available_stats" formatted="false">%d punktów</string>
+  <string name="toogle_emojis">Włącz Emoji</string>
+  <string name="tavern_description">Witaj w Karczmie! Usiądź wygodnie na krześle i pogadaj lub zrób sobie przerwę od swoich zadań.</string>
+  <string name="check_into_inn">Zamelduj się w Karczmie</string>
+  <string name="community_guidelines">Zasady Społeczności</string>
+  <string name="view_community_guidelines">Wyświetl Zasady Społeczności</string>
+  <string name="helpful_links">Przydatne Linki</string>
+  <string name="view_faq">Przeglądnij FAQ</string>
+  <string name="report_bug">Zgłoś błąd</string>
+  <string name="player_tiers">Rangi Graczy</string>
+  <string name="staff_moderators">Załoga i Moderatorzy</string>
+  <string name="world_boss">Boss ogólnoświatowy</string>
+  <string name="world_boss_art">Obrazek bossa</string>
+  <string name="boss_art">Obrazek bossa</string>
+  <string name="world_boss_description">Opis Ogólnoświatowego Bossa</string>
+  <string name="rage_strike_count" formatted="false">Ataki Szału: %d/%d</string>
+  <string name="pending_strike_title">Oczekujący Atak</string>
+  <string name="strike_description_title">Czym jest Atak Szału?</string>
+  <string name="strike_description_subtitle">Są 3 możliwe Ataki Szału</string>
+  <string name="strike_active_title" formatted="false">%s został zaatakowany!</string>
+  <string name="questShop">Sklep z Misjami</string>
+  <string name="market_owner_long">Kupiec Alex</string>
+  <string name="tavern_owner_long">Gospodarz Karczmy Daniel</string>
+  <string name="stable_owner_long">Władca Bestii Matt</string>
+  <string name="hide_boss_art">Ukryj Obrazek Bossa</string>
+  <string name="active_world_boss">Aktywny Boss Ogólnoświatowy</string>
+  <string name="no_party_title">Graj w Habitikę w Drużynie</string>
+  <string name="insufficientSubscriberGemsTitle">Miesięczny limit Klejnotów osiągnięty</string>
+  <string name="world_boss_action_prompt" formatted="false">Pokonaj Bossa by zdobyć specjalne nagrody i uratować Habitikę od terroru %s!</string>
+  <string name="world_boss_description_subtitle">%sataki!</string>
+  <string name="questShop_owner_long">Ian Przewodnik Misji</string>
+  <string name="seasonalShop_owner_long">Sezonowa Czarodziejka</string>
+  <string name="rage_attack">Atak szału:</string>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.sidebar.xml b/Habitica/res/values-pt-rBR/strings.sidebar.xml
index 73a114f9e..e28af38b4 100644
--- a/Habitica/res/values-pt-rBR/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rBR/strings.sidebar.xml
@@ -3,13 +3,13 @@
   <string name="sidebar.tasks">Tarefas</string>
   <string name="sidebar.skills">Habilidades</string>
   <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Caixa de Entrada</string>
+  <string name="sidebar.inbox">Mensagens</string>
   <string name="sidebar.tavern">Taverna</string>
   <string name="sidebar.party">Grupo</string>
   <string name="sidebar.purchaseGems">Comprar Gemas</string>
   <string name="sidebar.guilds">Guilda</string>
   <string name="sidebar.challenges">Desafios</string>
-  <string name="sidebar.section.inventory">Inventório</string>
+  <string name="sidebar.section.inventory">Inventário</string>
   <string name="sidebar.avatar">Avatar</string>
   <string name="sidebar.equipment">Equipamento</string>
   <string name="sidebar.stable">Estábulo</string>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 1a6d96f76..a80c3df19 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -115,9 +115,6 @@
   <string name="friday">Sexta</string>
   <string name="saturday">Sábado</string>
   <string name="sunday">Domingo</string>
-  <string name="levelup_header">Você ganhou um nível!</string>
-  <string name="levelup_detail">Por completar os objetivos de sua vida real, você subiu para o Nível %1$d!</string>
-  <string name="levelup_health">Você foi completamente curado!</string>
   <string name="levelup_button">Hurra!</string>
   <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á bem!</string>
@@ -270,13 +267,14 @@
   <string name="equipped">Equipado</string>
   <string name="quest_cancel_message">Tem certeza que deseja cancelar esta missão? Todos os convites aceitos serão perdidos. O proprietário da missão manterá posse do pergaminho da missão.</string>
   <string name="quest.invitation">Convite para Missão</string>
-    <string name="quest.invitation.text">Você foi convidado a participar de uma missão!</string>
-  <string name="ago_1day">1 dia atrás</string>
-  <string name="ago_days">%d dias atrás</string>
-  <string name="ago_1Minute">1 minuto atrás</string>
-  <string name="ago_minutes">%d minutos atrás</string>
-  <string name="ago_hours">%d horas atrás</string>
-  <string name="ago_1hour">1 hora atrás</string>
+  <string name="quest_begin_message">Tem certeza? Apenas %1$d de seus %2$d membros do grupo aceitaram esta missão! Missões iniciam automaticamente quando todos os jogadores tiverem aceitado ou rejeitado o convite.</string>
+  <string name="quest.invitation.text">Você foi convidado a participar de uma missão!</string>
+  <string name="ago_1day">1d atrás</string>
+  <string name="ago_days">%dd atrás</string>
+  <string name="ago_1Minute">1min atrás</string>
+  <string name="ago_minutes">%dmin atrás</string>
+  <string name="ago_hours">%dhrs atrás</string>
+  <string name="ago_1hour">1hr atrás</string>
   <string name="today">Hoje</string>
   <string name="sidebar_items">Itens</string>
   <string name="eggs">Ovos</string>
@@ -301,32 +299,36 @@
   <string name="feed">Alimentar</string>
   <string name="hatch_with">Chocar mascote com %s</string>
   <string name="hatched_pet_title">Você chocou um %1$s %2$s!</string>
-  <string name="evolved_pet_title">Você domou %1$s %2$s, vamos dar um passeio!</string>
+  <string name="evolved_pet_title">Você domou %1$s %2$s, vamos dar um passeio !</string>
   <string name="close">Fechar</string>
   <string name="share">Compartilhar</string>
   <string name="notification_pet_fed">Você alimentou seu %1$s %2$s!</string>
   <string name="notification_purchase">Você comprou %s</string>
   <string name="notification_purchase_reward">Você comprou uma recompensa</string>
-  <string name="sectionpets">Mascotes Básicos</string>
-  <string name="sectionpremiumPets">Mascotes de Poções Mágicas</string>
-  <string name="sectionquestPets">Mascotes de Missões</string>
-  <string name="sectionspecialPets">Mascotes Raros</string>
-  <string name="sectionmounts">Montarias Básicas</string>
-  <string name="sectionpremiumMounts">Montarias de Poções Mágicas</string>
-  <string name="sectionquestMounts">Montarias de Missões</string>
-  <string name="sectionspecialMounts">Montarias Raras</string>
+  <string name="sectionpets">Base</string>
+  <string name="sectionpremiumPets">Poção Mágica</string>
+  <string name="sectionquestPets">Missão</string>
+  <string name="sectionspecialPets">Especial</string>
+  <string name="sectionmounts">Base</string>
+  <string name="sectionpremiumMounts">Poção Mágica</string>
+  <string name="sectionquestMounts">Missão</string>
+  <string name="sectionspecialMounts">Especial</string>
   <string name="world_quest">Missão Global</string>
-  <string name="inn_description">Descanse na Pousada para prevenir suas Diárias de causarem dano de um dia para o outro! (Nota: Não lhe previne de receber dano em Missões com Chefão)</string>
+  <string name="inn_description">Precisa de um descanso? Faça uma visita à Pousada do Daniel e pare algumas das mecânicas de jogo mais difíceis do Habitica.
+• Diárias não feitas não lhe causarão dano
+• As tarefas não vão perder seus combos ou decair de cor
+• Os Chefões não causarão dano pelas Diárias não feitas.
+• Seu dano no chefão ou items de Missão de coleta ficarão acumulados até o fim do dia</string>
   <string name="empty_items">Você não tem nenhum %s</string>
   <string name="user_level">Nível %d</string>
   <string name="user_level_with_class">Nível %1$d %2$s</string>
   <string name="warrior">Guerreiro</string>
-  <string name="rogue">Ladino</string>
+  <string name="rogue">Gatuno</string>
   <string name="mage">Mago</string>
   <string name="healer">Curandeiro</string>
-  <string name="warrior_description">Guerreiros dão mais e melhores \"danos críticos\", o que aleatoriamente dá Ouro, Experiência e chance de drop ao marcar uma tarefa. Eles também dão grandes danos a monstros. Jogue como guerreiro se você acha motivadoras recompensas imprevisíveis, como um caça-níqueis, ou quer arrasar nas missões de Chefão!</string>
+  <string name="warrior_description">Guerreiros dão mais e melhores \\"danos críticos\\", o que aleatoriamente dá Ouro, Experiência e melhores chances de drop ao marcar uma tarefa. Eles também dão grandes danos a monstros. Jogue como guerreiro se você acha motivadoras recompensas imprevisíveis, como um caça-níqueis, ou quer arrasar nas missões de Chefão!</string>
   <string name="mage_description">Magos aprendem rapidamente, ganhando Experiência e Níveis mais rápido que as outras classes. Eles também recebem bastante Mana para usar Habilidades especiais. Jogue como mago se você gosta dos aspectos táticos do jogo ou se você é fortemente motivado por subir de níveis e desbloquear recursos avançados!</string>
-  <string name="rogue_description">Ladinos adoram acumular riqueza, ganhar mais ouro que qualquer um e são adeptos de achar itens aleatórios. Suas icônicas habilidades furtivas os permitem evitar as consequências de suas Diárias não realizadas. Jogue como Ladino se você encontra forte motivação nas Recompensas e Conquistas, esforçando-se por saques e medalhas!</string>
+  <string name="rogue_description">Ladinos adoram acumular riqueza, ganhar mais ouro que qualquer um e são adeptos de achar itens aleatórios. Suas icônicas habilidades furtivas os permitem evitar as consequências de suas Diárias não realizadas. Jogue como Gatuno se você encontra forte motivação nas Recompensas e Conquistas, esforçando-se por saques e medalhas!</string>
   <string name="healer_description">Curandeiros odeiam danos e estendem esta proteção ao Grupo. Diárias não realizadas e maus Hábitos não os afetam muito e eles têm formas de recuperar Vida. Jogue como Curandeiro se você gosta de ajudar seu Grupo ou se a ideia de enganar a morte com trabalho duro te inspira!</string>
   <string name="select_class">Escolha sua Classe</string>
   <string name="opt_out_class">Cancelar</string>
@@ -338,7 +340,7 @@
   <string name="dialog_go_back">Voltar</string>
   <string name="opt_out_confirmation">Você tem certeza que quer cancelar?</string>
   <string name="change_class">Mudar sua classe</string>
-  <string name="change_class_description">Mude sua classe e recupere seus pontos de atributo por 3 gemas. Você pode distribuir pontos de atributo através do site.</string>
+  <string name="change_class_description">Mude a sua classe e reembolse seus Pontos de Atributo por 3 gemas.</string>
   <string name="enable_class">Habilitar Sistema de Classes</string>
   <string name="changing_class_progress">Mudando de Classe</string>
   <string name="by_email">Por E-mail</string>
@@ -346,6 +348,7 @@
   <string name="send">Enviar</string>
   <string name="invite">Convidar amigos</string>
   <string name="invite_id_description">Se você tem amigos que já usam o Habitica, convide-os através do ID de Usuário aqui.</string>
+  <string name="invite_username_description">Se você já tem amigos usando o Habitica, convide-os pelo nome de usuário aqui.</string>
   <string name="invite_email_description">Se um amigo entra no Habitica pelo seu e-mail, ele automaticamente é convidado ao seu grupo.</string>
   <string name="add_invites">Adicionar convites</string>
   <string name="user_id">ID de usuário
@@ -367,6 +370,8 @@
   <string name="seasonalShop">Loja Sazonal</string>
   <string name="empty_inbox">Você não tem nenhuma mensagem na caixa de entrada. Você pode enviar novas mensagens a outros usuários a partir das mensagens deles em chats públicos!</string>
   <string name="party_invite">Desbloqueie ao convidar amigos</string>
+  <string name="login_incentive">Desbloqueia ao logar regularmente no Habitica</string>
+  <string name="create_account">Desbloqueia ao criar sua conta</string>
   <string name="no_gold">Ouro insuficiente</string>
   <string name="no_potion">Você não precisa comprar uma poção de vida</string>
   <string name="successful_purchase">Comprado %1$s</string>
@@ -494,7 +499,7 @@
   <string name="warning">Aviso</string>
   <string name="open_settings">Abrir Configurações</string>
   <string name="dont_keep_activities_warning">Parece que você tem a opção de Desenvolvedor \\"Não manter Atividades\\" ativa. Atualmente, esta opção causa problemas com o aplicativo Habitica, por isso sugerimos desativá-la.</string>
-  <string name="inbox">Caixa de Entrada</string>
+  <string name="inbox">Mensagens</string>
   <string name="FAQ">Perguntas Frequentes</string>
   <string name="special">Especial</string>
   <string name="gem_for_gold_description">Por você ter Assinado o Habitica, você pode comprar um número de Gemas cada mês usando Ouro.</string>
@@ -520,7 +525,6 @@
   <string name="login_btn_fb">Logar com Facebook</string>
   <string name="login_btn_google">Logar com Google</string>
   <string name="action_back">Voltar</string>
-  <string name="welcome_text">Oh, você deve ser novo aqui. Eu sou Justin, eu serei seu guia no Habitica.\n\nPara começar, você precisará criar um avatar.</string>
   <string name="randomize">Aleatório</string>
   <string name="avatar_extras">Extras</string>
   <string name="avatar_skin_color">Cor da Pele</string>
@@ -532,7 +536,7 @@
   <string name="weak">Fraco</string>
   <string name="strong">Forte</string>
   <string name="gray">Cinza</string>
-  <string name="dated">Com Data</string>
+  <string name="dated">Agendado</string>
   <string name="completed">Concluído</string>
   <string name="setuP_group_other">Outro</string>
   <string name="clear">Limpar</string>
@@ -554,14 +558,14 @@
   <string name="no_billing_subscriptions">Seu aparelho não possui nenhum dos métodos de pagamento suportados. Por favor, use o site do Habitica se você quiser comprar a Assinatura.</string>
   <string name="save">Salvar</string>
   <string name="location">Local</string>
-  <string name="gem_reward">Recompensa em Gema</string>
+  <string name="gem_reward">Prêmio de Gemas</string>
   <string name="tasks">Tarefas</string>
-  <string name="create_challenge">Criar desafio</string>
-  <string name="edit_challenge">Editar desafio</string>
-  <string name="challenge_create_error_tavern_one_gem">Você precisa no mínimo de 1 gema para criar um desafio na Taverna</string>
+  <string name="create_challenge">Criar Desafio</string>
+  <string name="edit_challenge">Editar</string>
+  <string name="challenge_create_error_tavern_one_gem">Você necessita de pelo menos 1 Gema para criar um desafio público</string>
   <string name="challenge_create_error_enough_gems">Você não possui gemas suficiente para criar um desafio</string>
-  <string name="identify_your_challenge_with_a_tag">Identifique seu desafio com uma etiqueta</string>
-  <string name="challenge_create_error_tag">Você precisa de uma etiqueta para criar este Desafio</string>
+  <string name="identify_your_challenge_with_a_tag">Classifique seus desafios com um nome curto</string>
+  <string name="challenge_create_error_tag">Você necessita de um nome curto para criar esse Desafio.</string>
   <string name="challenge_create_error_no_tasks">Você precisa adicionar no mínimo uma tarefa para criar este Desafio</string>
   <string name="challenge_create_error_title">Você precisa de um titulo para criar este Desafio</string>
   <string name="description_optional">Descrição (opcional)</string>
@@ -605,6 +609,10 @@
   <string name="experience_reward" formatted="false">%d Pontos de Experiência</string>
   <string name="gold_reward" formatted="false">%d Ouro</string>
   <string name="quest_owner_rewards">Recompensas do Dono da Missão</string>
+  <string name="str_abbrv">For</string>
+  <string name="per_abbrv">Per</string>
+  <string name="int_abbrv">Int</string>
+  <string name="con_abbrv">Con</string>
   <string name="reset_account">Reiniciar Conta</string>
   <string name="reset_account_description">ATENÇÃO! Isto resetará várias partes da sua conta. Essa ação é bastante desencorajada, mas algumas pessoas acreditam ser útil começo após brincar com o site por um curto período.\n\nVocê irá perder todos os seus níveis, ouro e pontos de experiência. Todas as suas tarefas (exceto as de desafios) será permanentemente deletadas e você irá perder todo o histórico delas. Você irá perder todo o seu equipamento mas ainda os poderá comprar de volta, incluindo todos os equipamentos de edição limitada ou os Itens Misteriosos de Assinantes que você já possuir (você precisará ser da classe correta para comprar equipamentos específicos de classe). Você manterá sua classe atual e seus mascotes e montarias. Talvez você prefira usar um Orbe do Renascimento ao invés de reiniciar sua conta, que é uma opção muito mais segura e na qual você manterá todas as suas tarefas e equipamentos.</string>
   <string name="delete_account">Deletar Conta</string>
@@ -626,18 +634,18 @@
   <string name="seasonal_closed_description">As Grande Galas acontecem próximo da virada das quatro estações do ano, então volte aqui nesses períodos para ver os itens sazonais especiais!</string>
   <string name="come_back_soon">Volte logo!</string>
   <string name="level">Nível</string>
-  <string name="streak_label">Sequências de 21 Dias</string>
-  <string name="stats">Estatísticas</string>
+  <string name="streak_label">Combos de 21 Dias</string>
+  <string name="stats">Atributos</string>
   <string name="fix_character_description">Se você encontrou um bug ou cometeu um erro que mudou seu personagem injustamente, você pode corrigir seus atributos manualmente aqui.</string>
-  <string name="fix_character_values">Consertar Valores de Personagem</string>
+  <string name="fix_character_values">Corrigir Valores de Personagem</string>
   <string name="saving">Salvando</string>
-  <string name="forgot_password_title">Enviar Link de Resetar Senha por E-mail</string>
+  <string name="forgot_password_title">Enviar Link de Senha por E-mail</string>
   <string name="forgot_password_description">Digite o endereço de e-mail que você usou para registrar sua conta no Habitica.</string>
   <string name="forgot_password_confirmation">Se nós tivermos seu e-mail no banco de dados, instruções para escolher uma nova senha foram enviadas para seu e-mail.</string>
   <string name="ok">OK</string>
   <string name="profile">Perfil</string>
-  <string name="profile_summary">Editar seu Perfil Público</string>
-  <string name="display_name">Mostrar Nome</string>
+  <string name="profile_summary">Editar seu Perfil Público.</string>
+  <string name="display_name">Nome de Exibição</string>
   <string name="photo_url">URL da Foto</string>
   <string name="login_name">Nome de Login</string>
   <string name="about">Sobre</string>
@@ -645,30 +653,141 @@
   <string name="authentication">Autenticação</string>
   <string name="authentication_summary">Mudar suas opções de autenticação.</string>
   <string name="change_password">Mudar Senha</string>
-  <string name="change_email">Alterar endereço de email</string>
+  <string name="change_email">Alterar Endereço de Email</string>
   <string name="change_login_name">Alterar Nome de Login</string>
+  <string name="change_username">Mudar nome de usuário</string>
   <string name="change">Alterar</string>
   <string name="character_level">Nível do Personagem</string>
-  <string name="auto_allocate_points">Distribuir pontos automaticamente</string>
+  <string name="auto_allocate_points">Distribuir Pontos Automaticamente</string>
   <string name="stat_guide">Guia de Atributos</string>
   <string name="character_build">Construção de Personagem</string>
   <string name="character_build_description">Cada nível lhe dá um ponto para aumentar um atributo de sua escolha. Você pode fazê-lo manualmente ou permitir que o aplicativo decida usando uma das opções de Distribuição Automática.</string>
   <string name="strength">Força</string>
-  <string name="strength_description">Aumenta o bônus de acertos críticos e a chance de ocorrê-los ao concluir uma tarefa. Também aumenta o dano causado a chefes.</string>
+  <string name="strength_description">Aumenta o bônus de acertos críticos e a chance de ocorrê-los ao concluir uma tarefa. Também aumenta o dano causado a chefões.</string>
   <string name="intelligence">Inteligência</string>
-  <string name="intelligence_description">Aumenta a experiência obtida ao completar tarefas. Também aumenta seu limite de mana e a taxa de recuperação por tempo.</string>
+  <string name="intelligence_description">Aumenta a experiência obtida ao completar tarefas. Também aumenta seu limite e taxa de recuperação de mana.</string>
   <string name="constitution">Constituição</string>
-  <string name="constitution_description">Diminui o dano levado pelas tarefas. Não diminui o dano causado por chefes.</string>
+  <string name="constitution_description">Diminui o dano recebido pelas tarefas. Não diminui o dano causado por chefões.</string>
   <string name="perception">Percepção</string>
   <string name="perception_description">Aumenta a possibilidade de drop de itens ao completar tarefas, o limite de drop diário, bônus de combo e a quantidade de Ouro obtido por tarefas.</string>
   <string name="buffs">Buffs</string>
   <string name="allocated">Distribuído</string>
-  <string name="distribute_evenly">Distribuir igualmente</string>
+  <string name="distribute_evenly">Distribuir Igualmente</string>
   <string name="distribute_class">Distribuir baseado na classe</string>
-  <string name="distribute_task">Distribuir baseado nas atividades</string>
-  <string name="no_points_to_allocate">Sem pontos para distribuir</string>
-  <string name="points_to_allocate" formatted="false">%d pontos para distribuir</string>
+  <string name="distribute_task">Distribuir baseado nas tarefas</string>
+  <string name="no_points_to_allocate">Sem Pontos para Distribuir</string>
+  <string name="points_to_allocate" formatted="false">%d pontos para Distribuir</string>
   <string name="distribute_evenly_help">Distribui o mesmo número de pontos para cada atributo.</string>
   <string name="distribute_class_help">Distribui mais pontos para os atributos importantes para sua classe.</string>
   <string name="distribute_task_help">Distribui pontos com base nas categorias Força, Inteligência, Constituição e Percepção, associadas às tarefas que você completa.</string>
+  <string name="allocating_points">Distribuindo Pontos</string>
+  <string name="class_equipment">Equipamento</string>
+  <string name="equipment_empty">Você já tem todos os equipamentos! Outros serão liberados durante as Grand Galas, que acontecem ao fim de cada estação do ano.</string>
+  <string name="classless">Sem classe</string>
+  <string name="class_equipment_shop_dialog">Este item está disponível apenas para uma classe específica.\nVocê pode alterar sua classe em Configurações.</string>
+  <string name="class_gear_disclaimer">Você apenas pode comprar equipamento para sua classe atual.</string>
+  <string name="available_stats" formatted="false">%dPontos</string>
+  <string name="toogle_emojis">Alternar emojis</string>
+  <string name="tavern_description">Bem-vindo a Taverna. Puxe uma cadeira e se junte ao chat ou dê um descanso de suas tarefas. </string>
+  <string name="check_into_inn">Entrar na Pousada</string>
+  <string name="community_guidelines">Diretrizes da Comunidade</string>
+  <string name="view_community_guidelines">Veja as Diretrizes da Comunidade</string>
+  <string name="guidelines_description">Habitica procura criar um ambiente acolhedor a todos os seus usuários, independente da idade ou backgrounds técnico, de modo especial nos espaços públicos tais como a Taverna. Se você tiver alguma questão, por favor consulte nossas diretrizes.</string>
+  <string name="helpful_links">Links auxiliares</string>
+  <string name="view_faq">Veja o FAQ</string>
+  <string name="report_bug">Reporte um Bug</string>
+  <string name="player_tiers">Níveis dos jogadores</string>
+  <string name="staff_moderators">Staff e Moderadores</string>
+  <string name="tiers_descriptions">Os nomes de usuário coloridos que você vê no Chat representam seus níveis de contribuição. Quanto maior for o nível, mais a pessoa tem contribuído com Habitica através de arte, código, com a comunidade ou muito mais!</string>
+  <string name="navigation_drawer_open">Abrir o painel de navegação</string>
+  <string name="navigation_drawer_close">Fechar o painel de navegação</string>
+  <string name="world_boss">Chefão Global</string>
+  <string name="world_boss_art">Arte do Chefão</string>
+  <string name="boss_art">Arte do Chefão</string>
+  <string name="world_boss_description">Descrição do Chefão Global</string>
+  <string name="rage_strike_count" formatted="false">Strikes de Raiva: %d/%d</string>
+  <string name="pending_strike_description">Este strike ainda não aconteceu! \ O Chefão Global vai atacar um dos nossos amigos comerciantes, uma vez que sua barra de raiva encher. Continue completando suas Diárias para tentar e evitar que isso aconteça!</string>
+  <string name="pending_strike_title">Strike Pendente</string>
+  <string name="strike_description_title">O que é um Strike de Raiva?</string>
+  <string name="strike_description_subtitle">Há 3 potenciais Strikes de Raiva</string>
+  <string name="strike_description_description">Essa barra enche quando os Habiticanos esquecem suas tarefas diárias. Caso encha, o Descoraçador usa seu Ataque do Coração Partido em um dos comerciantes de Habitica, então lembre-se de completar suas tarefas!</string>
+  <string name="pending_strike_subtitle">Este Strike ainda não aconteceu!</string>
+  <string name="strike_active_title" formatted="false">O %s foi Atacado!</string>
+  <string name="strike_active_subtitle" formatted="false">%s está de Coração Partido!</string>
+  <string name="strike_active_description" formatted="false">Nossa amada %s foi devastada quando o %s quebrou o %s. Rápido, enfrente suas tarefas para derrotar o monstro e ajudar a reconstruir!!</string>
+  <string name="questShop">Loja de Missões</string>
+  <string name="market_owner_long">Alex o Mercante</string>
+  <string name="tavern_owner_long">Daniel o estalajadeiro</string>
+  <string name="stable_owner_long">Matt o mestre das bestas</string>
+  <string name="hide_boss_art">Esconder Arte do Chefão</string>
+  <string name="active_world_boss">Chefão Mundial Atual</string>
+  <string name="no_party_description">Faça missões com amigos ou por conta própria. Combata monstros, crie desafios e ajude a si mesmo a continuar responsável através dos Grupos.</string>
+  <string name="no_party_title">Jogar Habitica em um Grupo</string>
+  <string name="join_party_description">Dê a um membro do Grupo o nome de usuário abaixo e eles poderão enviá-lo um convite</string>
+  <string name="join_party_description_id">Informe o seu ID de usuário ou faça com que eles digitalizem seu código QR para convidar.</string>
+  <string name="join_party_title">Deseja entrar em um grupo?</string>
+  <string name="create_party_website">Entre no site para criar um grupo</string>
+  <string name="id_copied">ID copiado para a área de transferência</string>
+  <string name="insufficientSubscriberGems">Você comprou todas as gemas que pode este mês. Mais gemas tornam-se disponíveis nos primeiros três dias de cada mês. Obrigado por ser um assinante!</string>
+  <string name="insufficientSubscriberGemsTitle">Capacidade Mensal de Gemas Atiginda</string>
+  <string name="chat_message">Mensagem de bate-papo</string>
+  <string name="world_boss_description_title">O que é um Chefão Global?</string>
+  <string name="world_boss_description_description">Um Chefão Global é um evento especial onde a comunidade inteira trabalha junto para derrotar um monstro poderoso com suas tarefas!\nComplete tarefas para causar dano ao Chefão\nO Chefão não te atacará por suas tarefas esquecidas, mas a sua barra de Fúria irá aumentar. Se a barra ficar cheia, o Chefão atacará um dos mercadores!\nVocê pode continuar nos Chefões das missões normais, danos se aplicarão aos dois\nVisite a Taverna para ver o Progresso do Chefão e os Ataques de Fúria</string>
+  <string name="world_boss_description_intro">Um Chefão Global é um evento especial onde a comunidade inteira trabalha junto para derrotar um monstro poderoso com suas tarefas!</string>
+  <string name="world_boss_description_1">Complete tarefas para causar dano no Chefão</string>
+  <string name="world_boss_description_2">O Chefão não te atacará por suas tarefas esquecidas, mas a sua barra de Fúria irá aumentar. Se a barra ficar cheia, o Chefão atacará um dos mercadores!</string>
+  <string name="world_boss_description_3">Você pode continuar nos Chefões das missões normais, danos se aplicarão aos dois</string>
+  <string name="world_boss_description_4">Visite a Taverna para ver o Progresso do Chefão e os Ataques de Fúria</string>
+  <string name="world_boss_action_prompt" formatted="false">Derrote o Chefão para obter recompensas especiais e salvar Habitica do Terror do %s!</string>
+  <string name="world_boss_description_subtitle">%s ataca!</string>
+  <string name="questShop_owner_long">Ian o Guia das Missões</string>
+  <string name="seasonalShop_owner_long">Feiticeira Sazonal</string>
+  <string name="rage_attack">Ataque de Fúria:</string>
+  <string name="tavern_description_world_boss">Oh parça, não esquenta com o bicho lá embaixo — aqui ainda é seguro pra trocar ideia enquanto descansa.</string>
+  <string name="report">Reportar</string>
+  <string name="like">Curtir</string>
+  <string name="reply">Responder</string>
+  <string name="challenge_prize">Prêmio do desafio</string>
+  <string name="challenge_categories">Categorias do desafio</string>
+  <string name="created_challenge">Desafio criado</string>
+  <string name="joined">Entrou</string>
+  <string name="public_challenge">Desafio Público</string>
+  <string name="short_name">Nome Curto</string>
+  <string name="unlock_attribute_points">Distribuição de ponto de atributo desbloqueia no nível 10</string>
+  <string name="same_day_reminder_title">Você já adicionou suas Tarefas?</string>
+  <string name="same_day_reminder_text">Quanto mais você adiciona, mais será recompensado. Mesmo pequenos hábitos auxiliam em grandes mudanças.</string>
+  <string name="next_day_reminder_title">Você marcou suas Diárias feitas hoje?</string>
+  <string name="next_day_reminder_text">Há muito o que desbloquear e descobrir ao subir de nível, então, continue com suas tarefas e divirta-se!</string>
+  <string name="daily_tip_0">Gostaria de tentar algo novo? Entre em um desafio para expandir sua lista de tarefas e ganhe algumas Gemas!</string>
+  <string name="daily_tip_1">Adicione listas em seus Afazeres para multiplicar suas recompensas!</string>
+  <string name="daily_tip_2">Você pode mudar com que frequência cada Diária se repete. Mesmo tarefas menos frequentes podem ser programadas.</string>
+  <string name="daily_tip_3">Você pode agendar lembretes específicos para Diárias também.</string>
+  <string name="daily_tip_4">Conferir suas tarefas ocasionalmente pode ajudá-lo a ficar no caminho certo.</string>
+  <string name="daily_tip_5">Respire fundo para ajudá-lo a se concentrar. Você consegue!</string>
+  <string name="daily_tip_6">Tente marcar o tempo por dez minutos e veja quantas coisas consegue fazer!</string>
+  <string name="daily_tip_7">Tente fixar itens do Mercado nas suas Recompensas para ajudá-lo a motivar a consegui-los!</string>
+  <string name="daily_tip_8">Você pode mudar o nível de sua tarefa para recompensar mais em tarefas difíceis!</string>
+  <string name="daily_tip_9">Se você está tendo dificuldades, tente dividir suas tarefas em partes menores.</string>
+  <string name="moderator">Moderador</string>
+  <string name="staff">Equipe</string>
+  <string name="expand_notes">Leia mais</string>
+  <string name="collapse_notes">Mostre menos</string>
+  <string name="reset_streak">Reiniciar Combo</string>
+  <string name="week_reminder_title">Como vão as suas tarefas?</string>
+  <string name="week_reminder_text">Pausas são saudáveis, mas você ainda ganha pontos por atividades simples para evoluir e ganhar equipamentos!</string>
+  <string name="last_login">Último Check-in </string>
+  <string name="total_checkins">Total de Check-ins</string>
+  <string name="two_handed">Duas mãos</string>
+  <string name="usernamePromptTitle">É hora de definir seu nome de usuário!</string>
+  <string name="usernamePromptBody">Nomes de login agora são nomes de usuário únicos e estarão visíveis ao lado do seu nome de exibição e serão usados para convites, @menções em bate-papo e mensagens.</string>
+  <string name="confirmUsername">Confirmar nome de usuário</string>
+  <string name="usernamePromptDisclaimer">Nomes de usuários devem estar de acordo com os nossos <a href="https://habitica.com/static/terms">Termos de Serviço</a> e <a href="https://habitica.com/static/community-guidelines">Diretrizes da Comunidade</a>. Se você não definiu um nome de login anteriormente, seu nome de usuário foi gerado automaticamente.</string>
+  <string name="confirm_username_title">Você ter certeza que deseja confirmar seu nome de usuário atual?</string>
+  <string name="confirm_username_description">Confirmar seu nome de usuário o tornará público para convites, @menções e mensagens. Você pode alterar seu nome de usuário nas configurações a qualquer momento.</string>
+  <string name="cancel">Cancelar</string>
+  <string name="confirm_username">Confirmar nome de usuário</string>
+  <string name="username_not_confirmed">Nome de usuário não confirmado</string>
+  <string name="username_confirmed">Nome de Usuário Confirmado</string>
+  <string name="enter_recipient_username">Insira o nome de usuário do destinatário</string>
+  <string name="username_copied">Nome de usuário copiado para Área de Transferência</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.profile.xml b/Habitica/res/values-pt-rPT/strings.profile.xml
index 165751576..c35ab4618 100644
--- a/Habitica/res/values-pt-rPT/strings.profile.xml
+++ b/Habitica/res/values-pt-rPT/strings.profile.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="profile_pets_and_mounts">Animais de Estimação e Montadas</string>
+    <string name="profile_pets_and_mounts">Animais de Estimação e Montarias</string>
     <string name="profile_pets_found">Animais de Estimação Encontrados</string>
     <string name="profile_mounts_tamed">Montadas Domesticada</string>
+    <string name="profile_loading_data">A carregar os dados de membro...</string>
     <string name="profile_send_message_to">Enviar mensagem para %s</string>
     <string name="profile_message_sent_to">Mensagem enviada para %s</string>
     <string name="profile_level">Nível:</string>
@@ -11,4 +12,7 @@
     <string name="profile_boosts">Aumentos</string>
     <string name="profile_private_message">Mensagem Privada</string>
     <string name="profile_achievements">Conquistas</string>
-    </resources>
+    <string name="profile_achievement_ok">ACEITAR</string>
+    <string name="profile_qrcode_close">Fechar</string>
+
+</resources>
diff --git a/Habitica/res/values-pt-rPT/strings.sidebar.xml b/Habitica/res/values-pt-rPT/strings.sidebar.xml
index a9d31145f..90b547baf 100644
--- a/Habitica/res/values-pt-rPT/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rPT/strings.sidebar.xml
@@ -3,7 +3,7 @@
   <string name="sidebar.tasks">Tarefas</string>
   <string name="sidebar.skills">Habilidades</string>
   <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Caixa de Entrada</string>
+  <string name="sidebar.inbox">Mensagens</string>
   <string name="sidebar.tavern">Taberna</string>
   <string name="sidebar.party">Equipa</string>
   <string name="sidebar.purchaseGems">Comprar Gemas</string>
@@ -17,4 +17,5 @@
   <string name="sidebar.settings">Definições</string>
   <string name="sidebar.about">Sobre</string>
   <string name="sidebar_shops">Lojas</string>
+  <string name="sidebar_stats">Estatísticas</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.tutorial.xml b/Habitica/res/values-pt-rPT/strings.tutorial.xml
index 9266649cb..d91943f13 100644
--- a/Habitica/res/values-pt-rPT/strings.tutorial.xml
+++ b/Habitica/res/values-pt-rPT/strings.tutorial.xml
@@ -5,6 +5,6 @@
   <string name="tutorial_pets">Ao completar as suas tarefas do mundo real, tem agora uma hipótese de aleatória para encontrar ovos e poções. Combina-os para gerar animais</string>
   <string name="tutorial_skills">Atributos são habilidades especiais que têm efeitos poderosos! Toque num atributo para o usar. Este irá custar Mana (a barra azul), que ganha ao verificar e completar todos os dias as suas tarefas da vida real. Consulte as FAQs no menu para mais informação!</string>
   <string name="tutorial_party">Isto é onde você e os seus amigos podem responsabilizar-se mutuamente para os vossos objetivos e lutar contra monstros com as vossas tarefas!</string>
-  <string name="tutorial_tavern">Bem-vindo ao Tabern, uma sala de conversação publica para todas as idades! Aqui pode conversar sobre a produtividade e colocar questões. Divirta-se!</string>
-  <string name="tutorial_classes">Escolha para se tornar num Guerreiro, Feiticeiro, Curandeiro ou Bandido! Cada classe tem equipamento e atributos únicos. Toque em (?) para saber mais!</string>
+  <string name="tutorial_tavern">Bem-vindo ao Tabern, uma sala de conversação pública para todas as idades! Aqui pode conversar sobre a produtividade e colocar questões. Divirta-se!</string>
+  <string name="tutorial_classes">Escolha para se tornar num Guerreiro, Mago, Curandeiro ou Bandido! Cada classe tem equipamento e habilidades únicos. Toque em (?) para saber mais!</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index 8189289ed..6dd908dab 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -66,6 +66,7 @@
   <string name="about.give_us_feedback">Envie-nos Comentários!</string>
   <string name="about.bugreport">Comunique um Erro</string>
   <string name="about.source_code">Código Fonte</string>
+  <string name="repeatEvery">Repetir a Cada</string>
   <!--Network Errors-->
   <string name="network_error_title">Erro de Ligação</string>
   <string name="network_error_no_network_body">Não está ligado à Internet.</string>
@@ -91,9 +92,20 @@
   <string name="reminders">Lembretes</string>
   <string name="actions">Ações</string>
   <string name="attributes">Atributos</string>
+  <string name="physical">Força</string>
+  <string name="mental">Inteligência</string>
+  <string name="social">Constituição</string>
+  <string name="other">Perceção</string>
   <string name="frequency">Frequência</string>
   <string name="frequency_weekly">Em certos dias da semana</string>
   <string name="frequency_daily">A cada X dias</string>
+  <string name="repeatables_summary_title">Resumo</string>
+  <string name="repeatables_frequency_daily">Diariamente</string>
+  <string name="repeatables_frequency_weekly">Semanalmente</string>
+  <string name="repeatables_frequency_monthly">Mensalmente</string>
+  <string name="repeatables_frequency_yearly">Anualmente</string>
+  <string name="repeatables_frequency_day_of_month">Dia do Mês</string>
+  <string name="repeatables_frequency_day_of_week">Dia da Semana</string>
   <string name="monday">Segunda</string>
   <string name="tuesday">Terça</string>
   <string name="wednesday">Quarta</string>
@@ -101,12 +113,8 @@
   <string name="friday">Sexta</string>
   <string name="saturday">Sábado</string>
   <string name="sunday">Domingo</string>
-  <string name="levelup_header">Ganhou um nível!</string>
-  <string name="levelup_detail">Ao atingir os seus objetivos da vida real, evoluiu para o Nível %1$d!</string>
-  <string name="levelup_health">Foi totalmente curado!</string>
   <string name="levelup_button">Hurra!</string>
   <string name="faint_subtitle">Não desespere!</string>
-  <string name="faint_penalty_body">Perdeu um Nível, o seu Ouro, e uma peça de Equipamento, mas consegue recuperá-los de novo, com trabalho duro! Boa sorte - irá conseguir.</string>
   <string name="faint_header">Gastou a sua Vida!</string>
   <string name="faint_button">Recarregue a Vida e Tente Novamente</string>
   <string name="filter">Filtro</string>
@@ -116,7 +124,6 @@
   <string name="used_skill_without_mana">Utilizou %1$s.</string>
   <string name="new_checklist_item">novo item da lista de verificações</string>
   <string name="add_checklist_item">Adicionar</string>
-  <string name="reminder_title">Lembre-se de verificar as suas Tarefas Diárias!</string>
   <string name="skill_progress_title">Utilizando habilidade</string>
   <string name="coming_soon">Brevemente</string>
   <string name="chat_flag_confirmation">Tem a certeza que pretende denunciar esta mensagem por violação?</string>
@@ -175,7 +182,7 @@
   <string name="sidebar_help">Ajuda e FAQs</string>
   <string name="complete_tutorial">Percebi!</string>
   <string name="dismiss_tutorial">Lembrar-me novamente</string>
-  <string name="intro_1_subtitle">Bem-vindo a</string>
+  <string name="intro_1_subtitle">Bem-vindo ao</string>
   <string name="intro_1_title">Habitica</string>
   <string name="intro_1_description">É hora de se divertir enquanto faz as coisas. Junte-se a mais de %s de outros, melhorando as suas vidas com uma tarefa de cada vez.</string>
   <string name="intro_2_subtitle">Progresso no jogo</string>
@@ -184,7 +191,7 @@
   <string name="previous_button">Anterior</string>
   <string name="next_button">Seguinte</string>
   <string name="skip_button">Ignorar</string>
-  <string name="setup_welcome_description">Bem-vindo ao Habitica, onde avançar no jogo irá melhor a sua vida real! Ao atingir os objetivos do mundo real, irá desbloquear equipamento, animais, tarefas, e muito mais.</string>
+  <string name="setup_welcome_description">Bem-vindo ao Habitica, onde avançar no jogo irá melhor a sua vida real! Ao realizar os objetivos do mundo real, irá desbloquear equipamento, animais, tarefas, e muito mais.</string>
   <string name="setup_welcome_title">Bem-vindo</string>
   <string name="setup_group_work">Trabalho</string>
   <string name="setup_group_exercise">Exercício</string>
@@ -249,13 +256,7 @@
   <string name="equipped">Equipado</string>
   <string name="quest_cancel_message">Tem a certeza que deseja cancelar esta missão? Todos os convites aceites serão perdidos. O dono da missão manterá a posse do pergaminho da missão.</string>
   <string name="quest.invitation">Convite de Missão</string>
-    <string name="quest.invitation.text">Foi convidado para participar numa missão!</string>
-  <string name="ago_1day">Há 1 dia</string>
-  <string name="ago_days">Há %d dias</string>
-  <string name="ago_1Minute">Há 1 minuto</string>
-  <string name="ago_minutes">Há %d minutos</string>
-  <string name="ago_hours">Há %d horas</string>
-  <string name="ago_1hour">Há 1 hora</string>
+  <string name="quest.invitation.text">Foi convidado para participar numa missão!</string>
   <string name="today">Hoje</string>
   <string name="sidebar_items">Itens</string>
   <string name="eggs">Ovos</string>
@@ -263,7 +264,7 @@
   <string name="food">Comida</string>
   <string name="quests">Missões</string>
   <string name="pets">Animais de Estimação</string>
-  <string name="mounts">Montadas</string>
+  <string name="mounts">Montarias</string>
   <string name="armoireEquipment">Encontraste uma peça rara de Equipamento no Armário: %s! Fenomenal!</string>
   <string name="armoireFood">Vasculhas o Armário e encontras %1$s %2$s. Que é que isto está aqui a fazer?</string>
   <string name="armoireExp">Lutas com o Armário e ganhas experiência. Boa!</string>
@@ -280,28 +281,29 @@
   <string name="feed">Alimentar</string>
   <string name="hatch_with">Nascimento do animal com %s</string>
   <string name="hatched_pet_title">Chocou um %1$s %2$s!</string>
-  <string name="evolved_pet_title">Você domou %1$s %2$s, vamos dar um passeio.</string>
   <string name="close">Fechar</string>
   <string name="share">Partilhar</string>
   <string name="notification_pet_fed">Alimentou o seu %1$s %2$s!</string>
-  <string name="sectionpets">Animais de Estimação Base</string>
-  <string name="sectionpremiumPets">Animais de Estimação de Poção Mágica</string>
-  <string name="sectionquestPets">Animais de Estimação de Missão</string>
-  <string name="sectionspecialPets">Animais de Estimação Raros</string>
-  <string name="sectionmounts">Montadas Base</string>
-  <string name="sectionpremiumMounts">Montadas de Poções Mágicas</string>
-  <string name="sectionquestMounts">Montadas de Missão</string>
-  <string name="sectionspecialMounts">Montadas Raras</string>
+  <string name="notification_purchase">Comprou %s</string>
+  <string name="notification_purchase_reward">Comprou uma recompensa</string>
+  <string name="sectionpets">Padrão</string>
+  <string name="sectionpremiumPets">Porção Mágica</string>
+  <string name="sectionquestPets">Missão</string>
+  <string name="sectionspecialPets">Raro</string>
+  <string name="sectionmounts">Padrão</string>
+  <string name="sectionpremiumMounts">Porção Mágica</string>
+  <string name="sectionquestMounts">Missão</string>
+  <string name="sectionspecialMounts">Rara</string>
   <string name="world_quest">Missão Mundial</string>
-  <string name="inn_description">Descanse na Taverna para evitar que as Tarefas Diárias o magoem de um dia para o outro! (Nota: não evita que receba um dano do Chefe.) </string>
   <string name="empty_items">Não tem quaisquer %s</string>
+  <string name="user_level">Nível %d</string>
+  <string name="user_level_with_class">Nível %1$d %2$s</string>
   <string name="warrior">Guerreiro</string>
   <string name="rogue">Bandido</string>
   <string name="mage">Mago</string>
   <string name="healer">Curandeiro</string>
-  <string name="warrior_description">Guerreiros causam melhores \"golpes críticos\" e com mais frequência, que dão bónus aleatórios de Ouro, Experiência e posibilidade de encontrar objectos ao cumprir uma tarefa. Eles também causam muito dano aos inimigos. Joga como Guerreiro te sentes motivado com recompensas jackpot imprevisíveis, ou se gostas de eliminar inimigos em Missões.</string>
   <string name="mage_description">Magos aprendem rapidamente, ganhando Experiência e Níveis mais rápido que as outras classes. Eles também possuem uma grande quantidade de Mana para usar habilidades especiais. Joga como Mago se gostas dos aspectos táticos do Habitica, ou se possuires grande motivação em subir níveis e desbloquear funcionalidades avançadas!</string>
-  <string name="rogue_description">Ladinos amam acumular fortunas, ganhando mais Ouro que qualquer um, e são peritos em achar objectos aleatórios. A sua Furtividade icónica permite-lhe evitar as consequências de Tarefas Diárias falhadas. Joga como Ladino se sentes forte motivação por Recompensas e Conquistas, e se procurares itens e medalhas!</string>
+  <string name="rogue_description">Os bandidos gostam de acumular riqueza, ganhando mais Ouro do que qualquer um, e são peritos em encontrar objetos aleatórios. A sua capacidade de atuação furtiva icónica permite-lhes evitar as consequências das Tarefas Diárias perdidas. Jogue como Bandido se se sentir uma motivação forte das Recompensas e Conquistas, lutando por espólios e medalhas!</string>
   <string name="healer_description">Curandeiros são impenetráveis contra o mal, e extendem essa protecção aos outros. Tarefas Diárias falhadas e maus Hábitos não incomodam muito, e eles têm formas de recuperar Vida quando falham. Joga como Curandeiro se gostares de ajudar os teus colegas de Equipe, ou se a ideia de enganar a Morte através de trabalho duro inspira-te!</string>
   <string name="select_class">Selecionar Classe</string>
   <string name="opt_out_class">Optar</string>
@@ -312,7 +314,6 @@
   <string name="dialog_go_back">Recuar</string>
   <string name="opt_out_confirmation">Tem a certeza que deseja Optar?</string>
   <string name="change_class">Altere a sua classe</string>
-  <string name="change_class_description">Altere a sua classe e reembolse os seus pontos de atributo em 3 gemas. Pode atribuir pontos através do site da Web</string>
   <string name="enable_class">Ativar Sistema de Classe</string>
   <string name="changing_class_progress">Alteração de Classe</string>
   <string name="by_email">Por E-mail</string>
@@ -327,7 +328,7 @@
   <string name="invite_users">Convidar para a Equipa</string>
   <string name="share_using">Partilhe, utilizando</string>
   <string name="share_hatched">Eu acabei de ganhar uma mascote %1$s %2$s no Habitica ao concluir as minhas tarefas da vida real!</string>
-  <string name="share_raised">Eu acabei de ganhar uma montada %1$s %2$s no Habitica, ao concluir as minhas tarefas da vida real!</string>
+  <string name="share_raised">Eu acabei de ganhar uma montaria %1$s %2$s no Habitica, ao concluir as minhas tarefas da vida real!</string>
   <string name="open_in_store">Abrir na Play Store</string>
   <string name="change_class_confirmation">Tem a certeza que pretende alterar a sua classe? Isto irá custar 3 gemas.</string>
   <string name="change_class_equipment_warning">Aviso: já não irá poder comprar equipamento da classe %s.</string>
@@ -337,10 +338,10 @@
   <string name="market">Mercado</string>
   <string name="timeTravelers">Viajantes no Tempo</string>
   <string name="seasonalShop">Loja Sazonal</string>
-  <string name="empty_inbox">Você não tem nenhuma mensagem na sua Caixa de Entrada. Você pode enviar uma nova mensagem para um usuário a partir do bate-papo público!</string>
   <string name="party_invite">Desbloqueie ao Convidar amigos</string>
   <string name="no_gold">Ouro insuficiente</string>
   <string name="no_potion">Precisa de comprar uma poção de vida</string>
+  <string name="successful_purchase">Comprou %1$s</string>
   <string name="purchase_confirmation_title">Confirmar compra</string>
   <string name="confirm_purchase_text">Comprar %1$s por %2$s %3$s</string>
   <string name="gem">gema</string>
@@ -444,7 +445,7 @@
   <string name="add_reminder">Adicionar Lembrete</string>
   <string name="warning">Aviso</string>
   <string name="open_settings">Abrir Definições</string>
-  <string name="inbox">Caixa de Entrada</string>
+  <string name="inbox">Mensagens</string>
   <string name="FAQ">Perguntas Mais Frequentes</string>
   <string name="special">Especial</string>
   <string name="gem_for_gold_description">Porque subscreveu o Habitica, pode comprar um número de Gemas cada mês, usando Ouro.</string>
@@ -453,8 +454,10 @@
   <string name="mystery_item">Item Mistério</string>
   <string name="myster_item_notes">Cada mês, os subscritores irão receber um item mistério. Isto geralmente é lançado cerca de uma semana antes do final do mês.</string>
   <string name="open">Abrir</string>
+  <string name="pending_approval">pendente de aprovação</string>
   <string name="filters">Filtros</string>
   <string name="done">Concluir</string>
+  <string name="group_tasks_edit_description">As tarefas de grupo não podem ser editadas.</string>
   <string name="group_tasks_edit_title">Não é possível editar esta tarefa</string>
   <string name="groups">Grupos</string>
   <string name="all">Tudo</string>
@@ -463,6 +466,7 @@
   <string name="login_btn_fb">Iniciar Sessão com Facebook</string>
   <string name="login_btn_google">Iniciar Sessão com Google</string>
   <string name="action_back">Anterior</string>
+  <string name="randomize">Aleatorizar</string>
   <string name="avatar_extras">Extras</string>
   <string name="avatar_skin_color">Cor da Pele</string>
   <string name="avatar_hair_color">Cor do Cabelo</string>
@@ -475,4 +479,16 @@
   <string name="empty_title_dailies">Não tem quaisquer Tarefas Diárias</string>
   <string name="empty_title_todos">Não tem quaisquer Afazeres</string>
   <string name="empty_title_rewards">Não tem quaisquer Recompensas</string>
+  <string name="maintenance">Manutenção</string>
+  <string name="reload_content">Recarregar Conteúdo</string>
+  <string name="save">Guardar</string>
+  <string name="location">Localização</string>
+  <string name="tasks">Tarefas</string>
+  <string name="system">Sistema</string>
+  <string name="start_quest">Iniciar uma nova Missão</string>
+  <string name="welcome_back">Seja Bem-vindo</string>
+  <string name="boss_quest">Chefe de Missão</string>
+  <string name="collection_quest">Recolha de Missão</string>
+  <string name="quest_owner_rewards">Recompensas do Dono de Missão</string>
+  <string name="tavern_description">Bem-vindo à Pousada! Puxe uma cadeira para conversar, ou efetue uma pausa das suas tarefas.</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.tutorial.xml b/Habitica/res/values-ru/strings.tutorial.xml
index a971ebc44..10e180b3d 100644
--- a/Habitica/res/values-ru/strings.tutorial.xml
+++ b/Habitica/res/values-ru/strings.tutorial.xml
@@ -1,22 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_overview">Вот и мы! Я выполнил некоторые задания для вас, исходя из ваших интересов. Попробуйте добавить несколько собственных. Вы можете редактировать любую задачу, нажав на заголовок.</string>
-  <string name="tutorial_habits_1">Прежде всего это Привычки. Они могут быть положительными, которые вы хотите приобрести, или негативными, которые вы хотите бросить.</string>
+  <string name="tutorial_overview">Отлично! Я добавил несколько задач для тебя, исходя из твоих интересов. Попробуй добавить несколько собственных. Ты можешь редактировать любую задачу, нажав на заголовок.</string>
+  <string name="tutorial_habits_1">Прежде всего это Привычки. Они могут быть положительными Привычками, которые вы хотите приобрести, или негативными Привычками, которые вы хотите бросить.</string>
   <string name="tutorial_habits_2">Каждый раз, когда вы выполняете положительную привычку, нажмите +, чтобы получить опыт и золото!</string>
-  <string name="tutorial_habits_3">Если вы ошибетесь в негативной привычкой, нажав на - , то вы уменьшите здоровье вашего аватара. Это сделано для того, чтобы помочь вам быть более ответственным.</string>
+  <string name="tutorial_habits_3">Если вы не удержались и совершили негативную привычку, нажмите - , уменьшив здоровье вашего аватара. Это сделано для того, чтобы помочь вам быть более ответственным.</string>
   <string name="tutorial_habits_4">Попробуйте! Вы можете изучить другие типы заданий, используя нижнюю навигацию.</string>
   <string name="tutorial_dailies_1">Создайте ежедневные задачи, которые необходимо выполнять по расписанию.</string>
-  <string name="tutorial_dailies_2">Будьте осторожны - если вы пропустите раз, ваш аватар в одночасье получит урон . Регулярно выполняя их, вы получите отличные награды!</string>
+  <string name="tutorial_dailies_2">Будьте осторожны - если вы пропустите раз, ваш аватар получит урон при переходе на следующий день. Регулярно выполняя их, вы получите отличные награды!</string>
   <string name="tutorial_todos_1">Используйте список дел, чтобы отслеживать задачи, которые нужно выполнять только один раз.</string>
   <string name="tutorial_todos_2">Если ваше задание должно быть выполнено к определенному времени, установите срок. Похоже, вы можете выполнить одно - идти впереди!</string>
-  <string name="tutorial_rewards_1">Покупайте снаряжение для вашего аватара за золото которое вы получаете!</string>
+  <string name="tutorial_rewards_1">Покупайте снаряжение для вашего аватара за золото, которое вы получаете!</string>
   <string name="tutorial_rewards_2">Вы также можете создавать свои вознаграждения в зависимости от того, что вас мотивирует.</string>
   <string name="tutorial_tasks_complete">На этом все. Если вы что-то забыли, проверьте раздел часто задаваемых вопросов.</string>
   <string name="tutorial_equipment">Когда вы покупаете снаряжение, оно появляется здесь. Ваша Боевая Экипировка влияет на ваши характеристики, а Костюм (если используется) изменяет внешний вид вашего аватара.</string>
   <string name="tutorial_items">Зарабатывайте предметы, выполняя задания и повышая уровень. Нажмите на предмет, чтобы использовать его!</string>
-  <string name="tutorial_pets">Теперь, когда вы будете выполнять задачи в реальном мире, у Вас есть шанс получить яйца и зелья. Соединяйте их, чтобы вылуплялись питомцы</string>
+  <string name="tutorial_pets">Теперь, когда вы будете выполнять задачи в реальном мире, у вас есть шанс получить яйца и зелья. Соединяйте их, чтобы вылуплялись питомцы</string>
   <string name="tutorial_skills">Навыки — это специальные способности, которые имеют мощные эффекты! Нажмите на навык что бы использовать его. Это будет стоить вам очков маны (синяя шкала), которая пополняется при входе в игру каждый день и завершением задач в реальной жизни. Читайте FAQ в меню, чтобы узнать подробности!</string>
   <string name="tutorial_party">Это место где вы и ваши друзья можете помочь друг другу оставаться ответственными на пути к цели и сражаться с монстрами с помощью своих заданий!</string>
   <string name="tutorial_tavern">Добро пожаловать в Таверну, где собрались участники всех рас, полов и возрастов! Здесь вы можете болтать или задавать вопросы. Повеселитесь!</string>
   <string name="tutorial_classes">Выберите, кем вы будете: Воином, Магом, Целителем или Разбойником! У каждого класса есть уникальное снаряжение и навыки. Нажмите (?), чтобы узнать больше!</string>
+  <string name="tutorial_stats">Нажмите серую кнопку, чтобы распределить все ваши характеристики сразу, или нажмите на стрелки, чтобы добавить им по одному очку за раз.</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 3c049a2d7..54cde5ca2 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -115,12 +115,9 @@
   <string name="friday">Пятница</string>
   <string name="saturday">Суббота</string>
   <string name="sunday">Воскресенье</string>
-  <string name="levelup_header">Вы получили уровень!</string>
-  <string name="levelup_detail">Через достижение своих целей в реальной жизни Вы достигли %1$d-го уровня!</string>
-  <string name="levelup_health">Вы полностью вылечены!</string>
   <string name="levelup_button">Ура!</string>
   <string name="faint_subtitle">Не отчаивайтесь!</string>
-  <string name="faint_penalty_body">Вы потеряли уровень, золото и предмет экипировки, но сможете это наверстать, если постараетесь! Удачи! Все получится!</string>
+  <string name="faint_penalty_body">Вы потеряли Уровень, Золото и предмет Экипировки, но вы  сможете все вернуть, если продолжите выполнять задачи! Удачи! Вы справитесь!</string>
   <string name="faint_header">У вас закончилось здоровье!</string>
   <string name="faint_button">Восстановить здоровье &amp; Попробовать ещё раз</string>
   <string name="filter">Фильтр</string>
@@ -130,7 +127,7 @@
   <string name="used_skill_without_mana">Вы использовали %1$s.</string>
   <string name="new_checklist_item">новый пункт списка</string>
   <string name="add_checklist_item">Добавить</string>
-  <string name="reminder_title">Не забудьте отметить ежедневные задания!</string>
+  <string name="reminder_title">Не забудьте отмечать свои задачи!</string>
   <string name="skill_progress_title">Использовать навык</string>
   <string name="coming_soon">Скоро</string>
   <string name="chat_flag_confirmation">Вы уверены, что хотите пожаловаться на это сообщение?</string>
@@ -270,11 +267,12 @@
   <string name="equipped">Надето</string>
   <string name="quest_cancel_message">Вы уверены, что хотите отменить квест? Все принятые приглашения будут отменены. Квестовый свиток останется у владельца.</string>
   <string name="quest.invitation">Приглашение в квест</string>
-    <string name="quest.invitation.text">Вас пригласили в квест!</string>
+  <string name="quest_begin_message">Вы уверены? Только %1$d из %2$d членов команды присоединились к этому квесту! Квест начнется автоматически, когда все игроки присоедятся или отклонят приглашение.</string>
+  <string name="quest.invitation.text">Вас пригласили в квест!</string>
   <string name="ago_1day">1 день назад</string>
   <string name="ago_days">%d дней назад</string>
-  <string name="ago_1Minute">1 минуту назад</string>
-  <string name="ago_minutes">%d минут назад</string>
+  <string name="ago_1Minute">1 месяц назад</string>
+  <string name="ago_minutes">%d месяцев назад</string>
   <string name="ago_hours">%d часов назад</string>
   <string name="ago_1hour">1 час назад</string>
   <string name="today">Сегодня</string>
@@ -301,22 +299,26 @@
   <string name="feed">Покормить</string>
   <string name="hatch_with">Вылупить питомца с помощью %s</string>
   <string name="hatched_pet_title">У вас вылупился %1$s %2$s!</string>
-  <string name="evolved_pet_title">%1$s %2$s ждет в стойлах, пора покататься!</string>
+  <string name="evolved_pet_title">Вы приручили %1$s%2$s, пора покататься! </string>
   <string name="close">Закрыть</string>
   <string name="share">Поделиться</string>
   <string name="notification_pet_fed">Вы покормили вашего %1$s %2$s!</string>
   <string name="notification_purchase">Вы купили %s</string>
   <string name="notification_purchase_reward">Вы купили награду</string>
-  <string name="sectionpets">Основные питомцы</string>
-  <string name="sectionpremiumPets">Питомцы из волшебного эликсира</string>
-  <string name="sectionquestPets">Квестовые питомцы</string>
+  <string name="sectionpets">Обычные</string>
+  <string name="sectionpremiumPets">Магический эликсир</string>
+  <string name="sectionquestPets">Квест</string>
   <string name="sectionspecialPets">Редкие питомцы</string>
   <string name="sectionmounts">Основные скакуны</string>
-  <string name="sectionpremiumMounts">Скакуны из волшебного эликсира</string>
-  <string name="sectionquestMounts">Квестовые скакуны</string>
-  <string name="sectionspecialMounts">Редкие скакуны</string>
+  <string name="sectionpremiumMounts">Магический эликсир</string>
+  <string name="sectionquestMounts">Квест</string>
+  <string name="sectionspecialMounts">Редкие питомцы</string>
   <string name="world_quest">Мировой квест</string>
-  <string name="inn_description">Отдых в гостинице защитит вас от урона за невыполненные ежедневные задания по ночам! (Примечание: не предотвращает получение урона от мирового босса.)</string>
+  <string name="inn_description">Нужен отдых? Запишитесь в гостиницу Даниэля, чтобы остановить несколько сложных игровых механик страны Habitica:\n\n
+• Пропущенные ежедневные дела не нанесут урона\n
+• Задачи не будут терять серий или понижения в цвете\n
+• Боссы не нанесут ущерб вашим пропущенным ежедневкам\n
+• Ваши собранные предметы или урон боссу останутся в ожидании до выписки</string>
   <string name="empty_items">У вас нет %s</string>
   <string name="user_level">Ур. %d</string>
   <string name="user_level_with_class">Ур. %1$d - %2$s</string>
@@ -324,7 +326,7 @@
   <string name="rogue">Разбойник</string>
   <string name="mage">Маг</string>
   <string name="healer">Целитель</string>
-  <string name="warrior_description">Воины чаще и лучше наносят «критические удары», которые случайным образом увеличивают награду за выполнение заданий: золото, опыт и шанс выпадения предметов. Кроме того, воины наносят значительный урон монстрам-боссам. Играйте за воина, если для вас существенным стимулом станет возможность сорвать джекпот, неожиданно получив больше наград, или осыпать сильнейшими ударами босса в квестах!</string>
+  <string name="warrior_description">Воины чаще и лучше наносят \“критические удары\”, которые случайным образом увеличивают награду за выполнение заданий: золото, опыт и шанс выпадения предметов. Кроме того, воины наносят значительный урон монстрам-боссам. Играйте за воина, если для вас существенным стимулом станет возможность сорвать джекпот, неожиданно получив больше наград, или осыпать сильнейшими ударами босса в квестах!</string>
   <string name="mage_description">Маги быстро учатся, получая опыт и уровни быстрее, чем другие классы. Они также выгодно используют ману на особые навыки. Играйте за мага, если вам по душе тактическая сторона Habitica или если хорошей мотивацией для вас служит получение новых уровней и открытие дополнительных возможностей.</string>
   <string name="rogue_description">Разбойники накапливают богатства, получая больше золота, чем кто бы там ни было. Они также эксперты по поиску различных предметов. Их культовая способность «Хитрость» позволяет им уклониться от последствий невыполненных ежедневных заданий. Играйте за разбойника, если хорошей мотивацией для вас являются награды и достижения и вы жаждете трофеев и значков!</string>
   <string name="healer_description">Целители неуязвимы перед уроном и распространяют защиту на других. Пропущенные ежедневные задания и вредные привычки несильно их беспокоят, а после неудачи они могут восстановить здоровье. Играйте за целителя, если вам нравится помогать другим членам команды или если вас вдохновляет мысль о возможности усердным трудом обмануть смерть.</string>
@@ -338,7 +340,7 @@
   <string name="dialog_go_back">Вернуться назад</string>
   <string name="opt_out_confirmation">Вы уверены, что хотите отказаться?</string>
   <string name="change_class">Изменить ваш класс</string>
-  <string name="change_class_description">Поменяйте класс, и получите назад ваши очки характеристик за 3 самоцвета. Распределить очки характеристик можно на сайте.</string>
+  <string name="change_class_description">Измени свой класс и перераспредели очки характеристик за 3 самоцвета</string>
   <string name="enable_class">Включить систему классов</string>
   <string name="changing_class_progress">Изменение класса</string>
   <string name="by_email">По электронной почте</string>
@@ -346,6 +348,7 @@
   <string name="send">Отправить</string>
   <string name="invite">Пригласить друзей</string>
   <string name="invite_id_description">Если у вас уже есть друзья, которые пользуются Habitica, пригласите их с помощью ID пользователя.</string>
+  <string name="invite_username_description">Если у вас уже есть друзья, которые пользуются Habitica, пригласите их используя имя пользователя.</string>
   <string name="invite_email_description">Если друг присоединится к Habitica, перейдя по ссылке в вашем письме, он автоматически будет приглашён в вашу команду!</string>
   <string name="add_invites">Добавить приглашенных</string>
   <string name="user_id">ID пользователя</string>
@@ -364,8 +367,10 @@
   <string name="market">Магазин</string>
   <string name="timeTravelers">Путешественники во времени</string>
   <string name="seasonalShop">Сезонная лавка</string>
-  <string name="empty_inbox">У вас нет входящих сообщений. Вы можете отправить пользователю новое сообщение через общий чат!</string>
+  <string name="empty_inbox">У вас нет входящих сообщений. Вы можете отправить пользователю новое сообщение через публичный чат!</string>
   <string name="party_invite">Разблокировать, пригласив друзей</string>
+  <string name="login_incentive">Разблокируй, регулярно заходя в Habitica</string>
+  <string name="create_account">Разблокируй, создав аккаунт</string>
   <string name="no_gold">Недостаточно золота</string>
   <string name="no_potion">Вам не нужно покупать зелье здоровья</string>
   <string name="successful_purchase">Купленный %1$s</string>
@@ -493,7 +498,7 @@
   <string name="warning">Предупреждение</string>
   <string name="open_settings">Открыть настройки</string>
   <string name="dont_keep_activities_warning">Похоже, что у вас активен параметр разработчика \\"Не сохранять операции\\". Обычно из-за него возникают проблемы с приложением Habitica, поэтому мы советуем его отключить.</string>
-  <string name="inbox">Входящие</string>
+  <string name="inbox">Сообщения</string>
   <string name="FAQ">Часто задаваемые вопросы</string>
   <string name="special">Специальное</string>
   <string name="gem_for_gold_description">Ваша подписка Habitica позволяет приобретать несколько самоцветов каждый месяц в обмен на золото.</string>
@@ -519,7 +524,7 @@
   <string name="login_btn_fb">Зарегистрироваться с Facebook</string>
   <string name="login_btn_google">Зарегистрироваться с Google</string>
   <string name="action_back">Назад</string>
-  <string name="welcome_text">О,  должно быть ,вы новичок. Я Джастин, я буду твоим проводником в Habitica. \ N \ nЧтобы начать, вам нужно создать аватар.</string>
+  <string name="welcome_text">О,  должно быть, вы тут впервые. Я Джастин, и буду твоим наставником в Habitica. \n\nДля начала, как тебя зовут, герой? Не беспокойся, имя, которое я выбрал, потом можно будет изменить. Ну что, а теперь давай создадим твой аватар!</string>
   <string name="randomize">Случайным образом</string>
   <string name="avatar_extras">Дополнительно</string>
   <string name="avatar_skin_color">Цвет кожи</string>
@@ -528,10 +533,10 @@
   <string name="avatar_hair_ponytail">Конский хвост</string>
   <string name="avatar_glasses">Очки</string>
   <string name="avatar_wheelchair">Кресло-каталка</string>
-  <string name="weak">Стройное</string>
-  <string name="strong">Тучное</string>
+  <string name="weak">Слабые</string>
+  <string name="strong">Сильные</string>
   <string name="gray">Серый</string>
-  <string name="dated">Датированные</string>
+  <string name="dated">Назначенное</string>
   <string name="completed">Завершить</string>
   <string name="setuP_group_other">Другое</string>
   <string name="clear">Очистить</string>
@@ -556,11 +561,11 @@
   <string name="gem_reward">Награда самоцветами</string>
   <string name="tasks">Задачи</string>
   <string name="create_challenge">Создать испытание</string>
-  <string name="edit_challenge">Редактировать Испытание</string>
-  <string name="challenge_create_error_tavern_one_gem">Вы должны иметь хотя бы 1 самоцвет в своём инвентаре, чтобы создать испытание Таверны.</string>
+  <string name="edit_challenge">Редактировать</string>
+  <string name="challenge_create_error_tavern_one_gem">Вам нужен хотябы 1 алмаз, чтобы создать общее испытание.</string>
   <string name="challenge_create_error_enough_gems">У вас недостаточно самоцветов для того, чтобы создать испытание.</string>
-  <string name="identify_your_challenge_with_a_tag">Обозначьте ваше испытание тегом..</string>
-  <string name="challenge_create_error_tag">Вам нужен тег, чтобы создать это Испытание.</string>
+  <string name="identify_your_challenge_with_a_tag">Укажите короткое имя, чтобы назвать испытание</string>
+  <string name="challenge_create_error_tag">Вам нужно придумать короткое именование, чтобы создать это Испытание.</string>
   <string name="challenge_create_error_no_tasks">Вы должны добавить хотя бы одну задачу, чтобы создать это Испытание.</string>
   <string name="challenge_create_error_title">Вам нужен заголовок, чтобы создать это Испытание.</string>
   <string name="description_optional">Описание (необязательное поле)</string>
@@ -586,7 +591,7 @@
   <string name="invitations">Приглашения</string>
   <string name="quest_leader_header" formatted="false">Начато %s</string>
   <string name="quest_abort_message">Вы уверены, что хотите отменить эту миссию? Это прервет её прохождение для каждого в вашей команде и весь прогресс будет потерян. Квестовый свиток останется у владельца.</string>
-  <string name="loading">Подключение...</string>
+  <string name="loading">Загрузка...</string>
   <string name="reloading_content">Обновление содержимого</string>
   <string name="thousand_abbrev">тыс</string>
   <string name="million_abbrev">млн</string>
@@ -604,6 +609,10 @@
   <string name="experience_reward" formatted="false">%d опыта</string>
   <string name="gold_reward" formatted="false">%d золота</string>
   <string name="quest_owner_rewards">Награды для владельца квеста</string>
+  <string name="str_abbrv">СИЛ</string>
+  <string name="per_abbrv">ВОС</string>
+  <string name="int_abbrv">ИНТ</string>
+  <string name="con_abbrv">ТЕЛ</string>
   <string name="reset_account">Сбросить аккаунт</string>
   <string name="reset_account_description">ВНИМАНИЕ! Это сбросит много разных деталей вашего аккаунта. Это очень не рекомендуется делать, но некоторые люди находя полезным сделать это в начале после кратковременных экспериментов с сайтом.\n\nВы потеряете все свои уровни, золото и очки опыта. Все ваши задачи (кроме полученных из испытаний) будут удалены навсегда, и вы потеряете всю историю задач. Вы потеряете всё своё снаряжение, но у вас будет возможность купить его обратно, включая всё снаряжение из ограниченных выпусков, а также таинственные предметы для подписчиков, которые у вас уже есть (вам понадобится персонаж соответствующего класса, чтобы купить обратно снаряжение, предназначенное для этого класса). У вас сохранится текущий класс, а также все питомцы и скакуны. Возможно, вы предпочтёте вместо этого использовать Шар возрождения, что является значительно более безопасным вариантом, и что сохранит ваши задачи и снаряжение.</string>
   <string name="delete_account">Удалить аккаунт</string>
@@ -619,6 +628,7 @@
   <string name="purchase_gems">Приобрести самоцветы</string>
   <string name="insufficientHourglasses">Вам нужно больше мистических песочных очков чтобы купить этот предмет!</string>
   <string name="get_hourglasses">Получить песочные часы</string>
+  <string name="subscribe_for_hourglasses">Оформите подписку для получения Мистических песочных часов</string>
   <string name="timetravelers_closed_description">Зарабатывайте одни мистические песочные часы за каждые три последующие месяца подписки, чтобы потом использовать их для открытия труднодоступного снаряжения, питомцев и скакунов из прошлого... и даже будущего!</string>
   <string name="want_to_subscribe">Я хочу подписаться</string>
   <string name="seasonal_closed_description">Великие праздники случаются ближе к солнцестоянию и равноденствия, поэтому в это время возможно найти забавный ассортимент специальных сезонных предметов!</string>
@@ -645,9 +655,11 @@
   <string name="change_password">Сменить пароль</string>
   <string name="change_email">Изменить электронную почту</string>
   <string name="change_login_name">Изменить логин</string>
+  <string name="change_username">Измените имя пользователя</string>
   <string name="change">Изменить</string>
   <string name="character_level">Уровень персонажа</string>
   <string name="auto_allocate_points">Автоматически распределять очки</string>
+  <string name="stat_guide">Описание характеристик</string>
   <string name="character_build">Развитие персонажа</string>
   <string name="character_build_description">За каждый уровень вы получаете одно очко, которое можете распределить на характеристику по вашему выбору. Вы можете сделать это вручную или позволить игре решить за вас, используя опцию автоматическое распределение.</string>
   <string name="strength">Сила</string>
@@ -668,4 +680,121 @@
   <string name="distribute_evenly_help">Назначает одинаковое количество очков для каждой характеристики.</string>
   <string name="distribute_class_help">Назначает больше очков на важные вашему классу характеристики.</string>
   <string name="distribute_task_help">Назначаемые очки основываются на параметрах силы, интеллекта, телосложения и восприятии, связанных с выполняемыми вами задачами.</string>
+  <string name="allocating_points">Распределение очков</string>
+  <string name="class_equipment">Снаряжение</string>
+  <string name="equipment_empty">У вас уже есть все снаряжение! Больше будет выпущено во время Гран-Гала, рядом с солнцестояниями и равноденствиями.</string>
+  <string name="classless">Бесклассовый</string>
+  <string name="class_equipment_shop_dialog">Этот предмет доступен только определенному классу\n Вы можете изменить свой класс в Настройках.</string>
+  <string name="class_gear_disclaimer">Вы можете покупать экипировку только для текущего класса</string>
+  <string name="available_stats" formatted="false">%d опыта</string>
+  <string name="toogle_emojis">Включить Emoji</string>
+  <string name="tavern_description">Добро пожаловать в Гостиницу! Пододвигайе кресло к чату или возьмите перерыв и отдохните от ваших заданий.</string>
+  <string name="check_into_inn">Разместиться в гостинице</string>
+  <string name="community_guidelines">Правила сообщества</string>
+  <string name="view_community_guidelines">Посмотреть правила сообщества</string>
+  <string name="guidelines_description">Habitica пытается создать благоприятную среду для пользователей всех возрастов и происхождения, особенно в общественных местах, таких как таверна. Если у вас есть какие-либо вопросы, ознакомьтесь с нашими рекомендациями.</string>
+  <string name="helpful_links">Полезные ссылки</string>
+  <string name="view_faq">Посмотреть ЧаВО</string>
+  <string name="report_bug">Сообщить об ошибке</string>
+  <string name="player_tiers">Ранги игроков</string>
+  <string name="staff_moderators">Сотрудники и модераторы</string>
+  <string name="tiers_descriptions">Цветные имена пользователей, которые вы видите в чате, означают ранг участника. Чем выше уровень, тем больше человек способствовал развитию через искусство, код, сообщество и более!</string>
+  <string name="navigation_drawer_open">Открыть навигационный ящик</string>
+  <string name="navigation_drawer_close">Закрыть навигационный ящик</string>
+  <string name="world_boss">Мировой босс</string>
+  <string name="world_boss_art">Изображение Босса</string>
+  <string name="boss_art">Изображение босса</string>
+  <string name="world_boss_description">Описание мирового босса</string>
+  <string name="rage_strike_count" formatted="false">Ярость: %d/%d</string>
+  <string name="pending_strike_description">Этот удар еще не случился!\nМировой босс придёт в бешенство и атакует одного из наших дружелюбных лавочников, как только его шкала Ярости заполнится. Попробуй предотвратить это, своевременно выполняя свои ежедневные задания!</string>
+  <string name="pending_strike_title">Ожидаемый урон</string>
+  <string name="strike_description_title">Что такое Удар Ярости?</string>
+  <string name="strike_description_subtitle">Может быть 3 Удара Ярости</string>
+  <string name="strike_description_description">Эта полоска заполняется, когда Хабитикане пропускают свои ежедневные задания. Если она заполнится до конца, Гразочаровыватель направит свою атаку Сокрушительная Печаль на одного из лавочников Хабитики, так что постарайся выполнить свои задачи!</string>
+  <string name="pending_strike_subtitle">Этот Удар ещё не случился!</string>
+  <string name="strike_active_title" formatted="false">Атаковали %s!</string>
+  <string name="strike_active_subtitle" formatted="false">%s повержен горем!</string>
+  <string name="strike_active_description" formatted="false">Наш любимый %s был печально потрясен, когда %s порушил %s. Скорее, завершайте ваши задания, чтобы победить этого монстра и помочь в восстановлении!</string>
+  <string name="questShop">Лавка квестов</string>
+  <string name="market_owner_long">Торговец Александр</string>
+  <string name="tavern_owner_long">Даниэль, хозяин гостиницы</string>
+  <string name="stable_owner_long">Мэтт, повелитель зверей</string>
+  <string name="hide_boss_art">Скрыть изображение босса</string>
+  <string name="active_world_boss">Действующий мировой босс</string>
+  <string name="no_party_description">Участвуйте в квестах с друзьями или в одиночку. Сражайтесь с монстрами, создавайте испытания и помогайте себе становиться ответственным вместе с командой.</string>
+  <string name="no_party_title">Играй в стране Habitica в команде</string>
+  <string name="join_party_description">Выбрать имя пользователя в команде, можно найти ниже, и отправить вам приглашение</string>
+  <string name="join_party_description_id">Дайте им свой ID пользователя или дайте свой QR-код для скана по приглашению</string>
+  <string name="join_party_title">Хотите присоединиться к команде?</string>
+  <string name="create_party_website">Открыть сайт для создания команды</string>
+  <string name="id_copied">ID скопирован в буфер обмена</string>
+  <string name="insufficientSubscriberGems">Вы купили все самоцветы, доступные в этом месяце. Новая партия будет доступна в течение первых трех дней следующего месяца. Спасибо за подписку!</string>
+  <string name="insufficientSubscriberGemsTitle">Достигнут ежемесячный лимит самоцветов</string>
+  <string name="chat_message">Чат-сообщение</string>
+  <string name="world_boss_description_title">Кто такой Мировой босс?</string>
+  <string name="world_boss_description_description">Мировой босс — особое событие, во время которого сообщество Habitica объединяет усилия, чтобы своими заданиями победить сильнейшего монстра!\nЗавершенные задачи наносят урон боссу\nБосс не тронет вас за пропущенные задания, но его счетчик ярости будет расти. Если бар заполнится, босс атакует одного из владельцев лавки!\nМожно одновременно сражаться с обычным квестовым боссом, вы нанесёте урон обоим.\nТаверне можно увидеть уровни здоровья и ярости мирового босса.</string>
+  <string name="world_boss_description_intro">Мировой босс — особое событие, во время которого сообщество Habitica объединяет усилия, чтобы своими заданиями победить сильнейшего монстра!</string>
+  <string name="world_boss_description_1">Завершите ваши задачи чтобы нанести урон Боссу</string>
+  <string name="world_boss_description_2">Мировой босс не тронет вас за пропущенные задания, но уровень его ярости будет расти. Когда шкала ярости заполнится, босс атакует одного из владельцев лавки!</string>
+  <string name="world_boss_description_3">Вы можете продолжать сражаться с обычным боссом в квесте, вы нанесёте урон обоим.</string>
+  <string name="world_boss_description_4">Проверяйте Таверну, чтобы увидеть уровни здоровья и ярости мирового босса.</string>
+  <string name="world_boss_action_prompt" formatted="false">Победите босса, чтобы заслужить особые награды и спасти страну страна Habitica от %s\'ских угроз!</string>
+  <string name="world_boss_description_subtitle">%s атаки!</string>
+  <string name="questShop_owner_long">Квест-мастер Ян</string>
+  <string name="seasonalShop_owner_long">Сезонная Чародейка</string>
+  <string name="rage_attack">Атака при ярости:</string>
+  <string name="tavern_description_world_boss">О, дорогуша, не обращай внимания на монстра внизу - это по-прежнему райский уголок, чтобы поболтать на перерывах.</string>
+  <string name="report">Пожаловаться</string>
+  <string name="like">Нравится</string>
+  <string name="reply">Ответить</string>
+  <string name="challenge_prize">Награда за испытание</string>
+  <string name="challenge_categories">Категории Испытаний</string>
+  <string name="created_challenge">Создать испытание</string>
+  <string name="joined">Присоединился</string>
+  <string name="public_challenge">Открытое испытание</string>
+  <string name="short_name">Короткое имя</string>
+  <string name="unlock_attribute_points">Распределение очков станет доступно на 10 уровне</string>
+  <string name="same_day_reminder_title">Вы не забыли добавить задачи?</string>
+  <string name="same_day_reminder_text">Чем больше вы добавляете, тем больше будет награда. Даже малые привычки хранят в себе большой выигрыш.</string>
+  <string name="next_day_reminder_title">Вы проверяли на сегодня свои задачи?</string>
+  <string name="next_day_reminder_text">Очень многое можно разблокировать и открыть с поднятием уровней, так что справляйтесь с задачами и удачи!</string>
+  <string name="daily_tip_0">Хотите попробовать что-то новое? Присоединитесь к Испытаниям, чтобы расширить свой список задач и выиграть алмазов!</string>
+  <string name="daily_tip_1">Создавайте подзадачи для своих Задач, чтобы умножить свои награды за выполнение!</string>
+  <string name="daily_tip_2">Вы можете настроить частоту повторений Ежедневных задач. Даже не актуальным задачам можно назначить время.</string>
+  <string name="daily_tip_3">Вы также можете планировать Ежедневные задачи на определенные дни.</string>
+  <string name="daily_tip_4">Иногда пересмотр ваших старых задач может помочь вернуться на продуктивную дорожку.</string>
+  <string name="daily_tip_5">Сделайте несколько глубоких вдохов, чтобы сконцентрироваться. Вы со всем справитесь!</string>
+  <string name="daily_tip_6">Попробуйте установить таймер на 10 минут и увидите как много задач вы сделаете!</string>
+  <string name="daily_tip_7">Попробуйте закрепить предметы из \"Рынка\" к вашей колонке \"Награды\", чтобы мотивировать себя на получение их!</string>
+  <string name="daily_tip_8">Вы можете изменить сложность заданий, чтобы себя ощутимее вознаграждать за выполнение сложных задач!</string>
+  <string name="daily_tip_9">Если у вас сложный период в жизни, попробуйте раздробить ваши задачи на более мелкие части.</string>
+  <string name="moderator">Модератор</string>
+  <string name="staff">Сотрудники</string>
+  <string name="expand_notes">Читать подробнее</string>
+  <string name="collapse_notes">Свернуть</string>
+  <string name="reset_streak">Сбросить счетчик</string>
+  <string name="week_reminder_title">Как поживают ваши задачи?</string>
+  <string name="week_reminder_text">Отдых полезен, но вы все еще можете зарабатывать очки опыта за выполнение заданий, чтобы поднять уровень и получить крутой комплект брони!</string>
+  <string name="last_login">Последнее посещение</string>
+  <string name="total_checkins">Всего посещений</string>
+  <string name="two_handed">Двуручное</string>
+  <string name="usernamePromptTitle">Время выбрать себе Имя пользователя!</string>
+  <string name="usernamePromptBody">Имена для логина теперь являются уникальными Никами, которые будут отображаться рядом с вашим отображаемым именем и использоваться для приглашений, чата @упоминаний и обмена сообщениями.</string>
+  <string name="usernamePromptWiki">Если хотите узнать более подробнее про изменения, то <a href="https://habitica.wikia.com/wiki/Player_Names">посетите вики.</a></string>
+  <string name="confirmUsername">Подтвердить Имя пользователя</string>
+  <string name="usernamePromptDisclaimer">Имя пользователя должно соответствовать нашим <a href="https://habitica.com/static/terms">Условиям обслуживания</a> и <a href="https://habitica.com/static/community-guidelines">Принципам сообщества</a>. Если вы ранее не выбирали имя для логина, то ваше Имя был автоматически сгенерировано.</string>
+  <string name="confirm_username_title">Вы уверены, что хотите выбрать такое Имя пользователя?</string>
+  <string name="confirm_username_description">Подтверждая свое Имя пользователя, дает возможность принимать приглашения, @упоминания и сообщения. Вы можете сменить свое Имя пользователя в любое время в настройках.</string>
+  <string name="cancel">Отменить</string>
+  <string name="confirm_username">Подтвердить Имя пользователя</string>
+  <string name="username_not_confirmed">Имя пользователя не сохранено</string>
+  <string name="username_confirmed">Ник подтвержден</string>
+  <string name="username_level">\@%s・Уровень %d</string>
+  <string name="enter_recipient_username">Ввести пользовательский ник</string>
+  <string name="username_copied">Ник скопирован в буфер обмена</string>
+  <string name="verification_pet">Один из питомцев-ветеранов будет ожидать вас, после подтверждения своего выбора!</string>
+  <string name="welcomeNameTitle">Как к вам обращаться?</string>
+  <string name="display_name_length_error">Отображаемое имя должно быть от 1 до 30 символов.</string>
+  <string name="setup_task_join_habitica">Присоединиться к Habitica (Подписаться!)</string>
+  <string name="setup_task_join_habitica_notes">Вы можете завершить Задачу, редактировать или удалить её.</string>
 </resources>
diff --git a/Habitica/res/values-tr/strings.profile.xml b/Habitica/res/values-tr/strings.profile.xml
index 2792813f0..e2be2b049 100644
--- a/Habitica/res/values-tr/strings.profile.xml
+++ b/Habitica/res/values-tr/strings.profile.xml
@@ -3,12 +3,13 @@
     <string name="profile_pets_and_mounts">Evcil &amp; Binek Hayvanlar</string>
     <string name="profile_pets_found">Bulunan Evcil Hayvanlar</string>
     <string name="profile_mounts_tamed">Evcilleştirilen Binek Hayvanları</string>
+    <string name="profile_loading_data">Üye verileri yükleniyor...</string>
     <string name="profile_send_message_to">%s kişisine mesaj gönder</string>
     <string name="profile_message_sent_to">%s kişisine mesaj gönderildi</string>
     <string name="profile_level">Seviye:</string>
     <string name="profile_class_bonus">Sınıf-Bonusu:</string>
     <string name="profile_allocated">Dağıtılmış:</string>
-    <string name="profile_boosts">Güçlendirmeler:</string>
+    <string name="profile_boosts">Artışlar:</string>
     <string name="profile_private_message">Özel Mesaj</string>
     <string name="profile_achievements">Başarılar</string>
     <string name="profile_achievement_ok">TAMAM</string>
diff --git a/Habitica/res/values-tr/strings.sidebar.xml b/Habitica/res/values-tr/strings.sidebar.xml
index 08aa52359..62ed67db3 100644
--- a/Habitica/res/values-tr/strings.sidebar.xml
+++ b/Habitica/res/values-tr/strings.sidebar.xml
@@ -3,7 +3,7 @@
   <string name="sidebar.tasks">İşler</string>
   <string name="sidebar.skills">Yetenekler</string>
   <string name="sidebar.section.social">Sosyal</string>
-  <string name="sidebar.inbox">Mesaj Kutusu</string>
+  <string name="sidebar.inbox">Mesajlar</string>
   <string name="sidebar.tavern">Taverna</string>
   <string name="sidebar.party">Takım</string>
   <string name="sidebar.purchaseGems">Elmas Satın Al</string>
@@ -17,4 +17,5 @@
   <string name="sidebar.settings">Ayarlar</string>
   <string name="sidebar.about">Hakkında</string>
   <string name="sidebar_shops">Dükkanlar</string>
+  <string name="sidebar_stats">İstatistikler</string>
 </resources>
diff --git a/Habitica/res/values-tr/strings.tutorial.xml b/Habitica/res/values-tr/strings.tutorial.xml
index 8a0758f85..9fce3ed28 100644
--- a/Habitica/res/values-tr/strings.tutorial.xml
+++ b/Habitica/res/values-tr/strings.tutorial.xml
@@ -3,13 +3,14 @@
   <string name="tutorial_overview">İşte geldik! İlgi alanlarına göre sana bazı işler doldurdum. Kendin de birkaç tane eklemeyi dene. Başlığa basarak işleri düzenleyebilirsin.</string>
   <string name="tutorial_habits_1">İlk önce alışkanlıklar. Geliştirmek istediğiniz olumlu alışkanlıklar veya bırakmak istediğiniz olumsuz alışkanlıklar olabilirler.</string>
   <string name="tutorial_habits_2">Olumlu her bir alışkanlık kazandığınızda , deneyim ve altın almak için + simgesine dokunun!</string>
-  <string name="tutorial_habits_3">Eğer hata yaparsan ve negatif bir alışkanlık yaparsan, - düğmesine basarak avatarının sağlığını azaltarak sorumluluk alabilirsin.</string>
+  <string name="tutorial_habits_3">Eğer aksilik olur da negatif bir Alışkanlığı yaparsan, - butonuna dokunman avatarının sağlığını azaltıp sorumlu kalmana yardımcı olur.</string>
   <string name="tutorial_habits_4">Bi dene! Diğer görev türlerini alttaki gezinme aracıyla keşfedebilirsiniz.</string>
-  <string name="tutorial_dailies_1">Düzenli bir programda yapılması gereken, zamana duyarlı görevler için Günlükl İşler oluştur.</string>
+  <string name="tutorial_dailies_1">Düzenli bir programda yapılması gereken, zamana duyarlı görevler için Günlük İşler oluştur.</string>
   <string name="tutorial_dailies_2">Dikkatli olun - eğer birini kaçırırsanız, avatarınız bir gece hasar alacaktır. Onları sürekli olarak kontrol etmek büyük ödüller getirrir!</string>
   <string name="tutorial_todos_1">Sadece bir kere yapman gereken işleri takip etmek için Yapılacak İşleri kullan.</string>
   <string name="tutorial_todos_2">Yapılacak İşin belirli bir süreyle yapılması gerekiyorsa, bir bitiş tarihi ayarla. Öyle görünüyor ki birini yapılmış olarak işaretleyebilirsin - devam et!</string>
   <string name="tutorial_rewards_1">Kazandığın altınla avatarına eşya al!</string>
+  <string name="tutorial_rewards_2">Seni motive eden şeyleri kullanarak Gerçek hayat ödülleride oluşturabilirsin.</string>
   <string name="tutorial_tasks_complete">Şimdilik bu kadar. Bir hatırlatıcıya ihtiyacın varsa SSS bölümüne bak.</string>
   <string name="tutorial_equipment">Ekipman satın aldığında burada gözükür. Savaş Ekipmanın niteliklerini, ve Kostümün (eğer etkinse) avatarının ne giydiğini etkiler.</string>
   <string name="tutorial_items">Görevlerini tamamlayarak ve seviye yükselerek eşya kazan. Kullanmak için eşyanın üzerine tıkla!</string>
@@ -18,4 +19,5 @@
   <string name="tutorial_party">Burası senin ve arkadaşlarının birbirinizi hedeflerinize sorumlu tutabileceğiniz ve görevlerinizle canavarlarla savaştığınız yer!</string>
   <string name="tutorial_tavern">Taverna, yani herkese açık ve her yaşın sohbet odasına hoşgeldin! Burda üretkenlik hakkında sohbet edebilir ve sorular sorabilirsin. Iyi eğlenceler!</string>
   <string name="tutorial_classes">Savaşçı, Büyücü, Şifacı veya Düzenbaz olmak için birini seç! Her bir sınıfın kendine özgü donanımı ve yeteneği vardır. Daha fazlasını öğrenmek için (?)\'ne bas!</string>
+  <string name="tutorial_stats">Niteliklerinin çoğunu tek seferde paylaştırmak için gri butona dokun veya birer birer eklemek için okları kullan.</string>
 </resources>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index 9dbbb6ecf..24833486e 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -88,7 +88,7 @@
   <string name="start_date">Başlangıç Tarihi</string>
   <string name="positive_habit_form">Olumlu (+)</string>
   <string name="negative_habit_form">Olumsuz ( - )</string>
-  <string name="checklist">Yapılacak İşler Listesi</string>
+  <string name="checklist">Maddeler</string>
   <string name="reminders">Hatırlatıcılar</string>
   <string name="actions">Hareketler</string>
   <string name="attributes">Özellikler</string>
@@ -101,7 +101,7 @@
   <string name="frequency_daily">X günde bir</string>
   <string name="repeatables_summary_title">Özet</string>
   <string name="repeatables_title">Tekrarlar</string>
-  <string name="repeatables_on_title">Yinelenir</string>
+  <string name="repeatables_on_title">Tekrarlanır</string>
   <string name="repeatables_frequency_daily">Günlük</string>
   <string name="repeatables_frequency_weekly">Haftalık</string>
   <string name="repeatables_frequency_monthly">Aylık</string>
@@ -115,12 +115,9 @@
   <string name="friday">Cuma</string>
   <string name="saturday">Cumartesi</string>
   <string name="sunday">Pazar</string>
-  <string name="levelup_header">Bir seviye yükseldin!</string>
-  <string name="levelup_detail">Gerçek hayattaki hedeflerini gerçekleştirerek %1$d. Seviyesine yükseldin!</string>
-  <string name="levelup_health">Tamamen sağlığına kavuştun!</string>
   <string name="levelup_button">Yaşasın!</string>
   <string name="faint_subtitle">Umudunu kaybetme!</string>
-  <string name="faint_penalty_body">Bir Seviye, Altınlarını ve biraz Ekipman kaybettin, ama çok çalışarak hepsini yeniden kazanabilirsin! İyi şanslar--bu işi becereceksin!</string>
+  <string name="faint_penalty_body">Bir Seviye, Altınlarını ve bir parça Ekipman kaybettin, ama çok çalışarak hepsini yeniden kazanabilirsin! İyi şanslar—bu işi becereceksin.</string>
   <string name="faint_header">Sağlığın tükendi!</string>
   <string name="faint_button">Sağlığını Doldur &amp; Tekrar Dene</string>
   <string name="filter">Filtre</string>
@@ -128,9 +125,9 @@
   <string name="mana_price_button">%d MP</string>
   <string name="used_skill">%2$d mana karşılığında %1$s kullandın.</string>
   <string name="used_skill_without_mana">%1$s kullandın.</string>
-  <string name="new_checklist_item">yeni yapılacak iş maddesi</string>
+  <string name="new_checklist_item">yeni madde</string>
   <string name="add_checklist_item">Ekle</string>
-  <string name="reminder_title">Günlük İşlerini kontrol etmeyi unutma!</string>
+  <string name="reminder_title">İşlerini işaretlemeyi unutma!</string>
   <string name="skill_progress_title">Yetenek Kullanma</string>
   <string name="coming_soon">Yakında</string>
   <string name="chat_flag_confirmation">Bu mesajı kural ihlali olarak bildirmek istediğine emin misin?</string>
@@ -191,7 +188,7 @@
   <string name="dismiss_tutorial">Daha sonra hatırlat</string>
   <string name="intro_1_subtitle">Hoş Geldin</string>
   <string name="intro_1_title">Habitica\'ya</string>
-  <string name="intro_1_description">Bir şeyleri tamamlarken artık eğlenebilirsin. %s\'dan fazla kişinin hayatlarını birer işe odaklanarak geliştirmelerine katıl. </string>
+  <string name="intro_1_description">Artık işlerini hallederken eğlenme zamanı. Hayatlarını işlerini adım adım hallederek geliştiren %s kişiye katıl.</string>
   <string name="intro_2_subtitle">Oyun gelişimi</string>
   <string name="intro_2_title">Hayatta gelişim</string>
   <string name="intro_2_description">Gerçek hayatındaki işlerini tamamlayarak oyun içindeki özellikleri aç. Zırh, evcil hayvan ve daha fazlasını hedeflerine ulaştığında ödül olarak kazan.</string>
@@ -270,12 +267,13 @@
   <string name="equipped">Giyilmiş</string>
   <string name="quest_cancel_message">Bu görevi iptal etmek istediğinize emin misiniz?  Tüm davet kabulleri kaybolacak. Görev sahibi görev parşömeni sahipliğini sürdürecektir.</string>
   <string name="quest.invitation">Görev Daveti</string>
-    <string name="quest.invitation.text">Göreve katılmak için davet edildin!</string>
+  <string name="quest_begin_message">Emin misin? %2$d takım üyesinden sadece %1$d tanesi göreve katıldı. Görevler bütün Takım üyeleri kabul ettiğinde yada reddettiğinde otomatik olarak başlar.</string>
+  <string name="quest.invitation.text">Göreve katılmak için davet edildin!</string>
   <string name="ago_1day">1 gün önce</string>
   <string name="ago_days">%d gün önce</string>
-  <string name="ago_1Minute">1 dakika önce</string>
-  <string name="ago_minutes">%d dakika önce</string>
-  <string name="ago_hours">%d saat önce</string>
+  <string name="ago_1Minute">1 dakika önce </string>
+  <string name="ago_minutes">%d dakika önce </string>
+  <string name="ago_hours">%d saat önce </string>
   <string name="ago_1hour">1 saat önce</string>
   <string name="today">Bugün</string>
   <string name="sidebar_items">Eşyalar</string>
@@ -301,22 +299,26 @@
   <string name="feed">Besle</string>
   <string name="hatch_with">Evcil hayvanı %s ile üret</string>
   <string name="hatched_pet_title">%1$s %2$s ürettin!</string>
-  <string name="evolved_pet_title">%1$s %2$s yetiştirildi, haydi biraz dolaşalım!</string>
+  <string name="evolved_pet_title">Bir %1$s %2$s ehlileştirdin.</string>
   <string name="close">Kapat</string>
   <string name="share">Paylaş</string>
   <string name="notification_pet_fed">%1$s %2$s besledin!</string>
   <string name="notification_purchase">%s satın aldın</string>
   <string name="notification_purchase_reward">Bir ödül satın aldın</string>
-  <string name="sectionpets">Temel Evcil Hayvanlar</string>
-  <string name="sectionpremiumPets">Büyü İksiri Evcil Hayvanları</string>
-  <string name="sectionquestPets">Görev Evcil Hayvanları</string>
-  <string name="sectionspecialPets">Nadir Evcil Hayvanlar</string>
-  <string name="sectionmounts">Temel Binekler</string>
-  <string name="sectionpremiumMounts">Büyü İksiri Binekleri</string>
-  <string name="sectionquestMounts">Görev Binekleri</string>
-  <string name="sectionspecialMounts">Nadir Binekler</string>
+  <string name="sectionpets">Standart</string>
+  <string name="sectionpremiumPets">Büyülü İksir </string>
+  <string name="sectionquestPets">Görev</string>
+  <string name="sectionspecialPets">Nadir</string>
+  <string name="sectionmounts">Standart</string>
+  <string name="sectionpremiumMounts">Büyülü İksir </string>
+  <string name="sectionquestMounts">Görev</string>
+  <string name="sectionspecialMounts">Nadir</string>
   <string name="world_quest">Dünya Görevi</string>
-  <string name="inn_description">Gece boyunca tamamlayamadığın Günlük İşlerinin seni incitmesinden korunmak için Han\'da dinlen. (Not: Canavar hasarı almaktan korumaz.)</string>
+  <string name="inn_description">Bir molaya mı ihtiyacın var? Daniel\'in hanına dinlenerek Habitica\'nın bazı oyun mekaniklerini durdur:/n/n
+• Tamamlanmamış günlük işler zarar vermez/n
+• Görevlerin tamamlanma serilerini yitirmez ve renklerinde değişim olmaz/n
+• Canavarlar tamamlanmamış günlük işler için saldırmaz/n
+• Canavarlara vereceğin zarar yada topladığın görev eşyaları Handan ayrılana kadar beklemede kalır</string>
   <string name="empty_items">Hiç %s sahibi değilsin</string>
   <string name="user_level">SVY %d</string>
   <string name="user_level_with_class">SVY %1$d - %2$s</string>
@@ -324,7 +326,7 @@
   <string name="rogue">Düzenbaz</string>
   <string name="mage">Büyücü</string>
   <string name="healer">Şifacı</string>
-  <string name="warrior_description">Savaşçılar rastgele bonus Altın, Tecrübe ve Görev tamamlarken eşya düşürme şansı veren daha fazla ve iyi \"kritik vuruşlar\" yapar. Ayrıca final canavarlara yüksek hasar verirler. Eğer şans oyunu gibi tahmin edilemez ödüller bulmaktan veya final canavar seferlerinde acıtacak hasarlar vermekten motive oluyorsan bir savaşçı olarak oynayabilirsin.</string>
+  <string name="warrior_description">Savaşçılar rastgele bonus Altın, Tecrübe ve Görev tamamlarken eşya düşürme şansı veren daha fazla ve iyi \\"kritik vuruşlar\\" yapar. Ayrıca final canavarlara yüksek hasar verirler. Eğer şans oyunu gibi tahmin edilemez ödüller bulmaktan veya final canavar seferlerinde acıtacak hasarlar vermekten motive oluyorsan bir savaşçı olarak oynayabilirsin!</string>
   <string name="mage_description">Büyücüler çabuk öğrenir, Tecrübe ve Seviyeleri diğer tüm sınıflardan hızlı kazanır. Ayrıca özel becerilerini kullanarak çok fazla Mana elde edebilirler. Alışkanlıkları taktiksel oyun açılarıyla oynamaktan keyif alıyorsan, veya seviye atlamaktan ve gelişmiş özelliklerin kilidini açmaktan motive oluyorsan bir büyücü olarak oynayabilirsin.</string>
   <string name="rogue_description">Düzenbazlar servet biriktirmeyi, herkesten daha fazla Altın kazanmayı severler ve rastgele eşyalar bulmada uzmandırlar. Sembolik Gizlilik yetenekleri unutulan günlük görevlerin sonuçlarından sıyrılmasını sağlar. Eğer Ödüller ve Başarılardan, ganimet ve rozetler için uğraşmaktan motivasyon buluyorsan bir düzenbaz olarak oynayabilirsin.</string>
   <string name="healer_description">Şifacılar hasarlara karşı su getirmez bir şekilde karşı dururlar ve diğerlerine de bu korumayı sürdürürler. Unutulan Günlük Görevler ve Kötü Alışkanlıklar onları çok fazla ürkütmez ve başarısızlıklardan dolayı oluşan sağlıkları iyileştirirler. Takımdaki diğerlerine refakat etmekten veya zor görevlerden dolayı Ölümü atlatma fikri seni heyecanlandırıyorsa bir şifacı olarak oynayabilirsin.</string>
@@ -338,7 +340,7 @@
   <string name="dialog_go_back">Geri Dön</string>
   <string name="opt_out_confirmation">Çekilmek istediğinden emin misin?</string>
   <string name="change_class">Sınıfını değiştir</string>
-  <string name="change_class_description">3 elmas karşılığında sınıfını değiştir ve özellik puanlarını geri al. Özellik puanlarını websitesi üzerinden atayabilirsin</string>
+  <string name="change_class_description">3 Elmas karşılığında sınıfını değiştir ve nitelik puanlarını geri al.</string>
   <string name="enable_class">Sınıf Sistemini Aktive Et</string>
   <string name="changing_class_progress">Sınıf Değiştirme</string>
   <string name="by_email">Eposta ile</string>
@@ -346,6 +348,7 @@
   <string name="send">Gönder</string>
   <string name="invite">Arkadaşlarını Davet Et</string>
   <string name="invite_id_description">Habitica kullanan arkadaşların var ise, Kullanıcı ID\'leri ile davet edebilirsin.</string>
+  <string name="invite_username_description">Habitica kullanan arkadaşların var ise, onları kullanıcı adları ile davet edebilirsin.</string>
   <string name="invite_email_description">Epostan ile bir arkadaşın Habitica\'ya katılırsa, otomatik olarak takımına davet edilecektir.</string>
   <string name="add_invites">Davetleri Ekle</string>
   <string name="user_id">Kullanıcı ID\'si</string>
@@ -366,6 +369,8 @@
   <string name="seasonalShop">Mevsimsel Dükkan</string>
   <string name="empty_inbox">Mesaj Kutunda hiç mesajın bulunmuyor. Bir kullanıcıya açık sohbet mesaj alanından bir mesaj gönderebilirsin!</string>
   <string name="party_invite">Arkadaşlarını davet ederek kilidi aç</string>
+  <string name="login_incentive">Habiticaya düzenli girerek kilidini aç.</string>
+  <string name="create_account">Bir hesap oluşturarak kilidini aç.</string>
   <string name="no_gold">Yeterli Altın yok</string>
   <string name="no_potion">Sağlık iksiri satın almanıza gerek yoktur</string>
   <string name="successful_purchase">%1$s satın alındı</string>
@@ -493,7 +498,7 @@
   <string name="warning">Uyarı</string>
   <string name="open_settings">Ayarları Aç</string>
   <string name="dont_keep_activities_warning">Görünüşe göre Geliştirici seçeneğinde \ \"Etkinlikleri saklamayın \\" etkin. Şu anda bu seçenek, habitica uygulamasıyla ilgili sorunlara neden oluyor, bu nedenle devre dışı bırakılmasını öneriyoruz.</string>
-  <string name="inbox">Mesaj Kutusu</string>
+  <string name="inbox">Mesajların</string>
   <string name="FAQ">Sıkça Sorulan Sorular</string>
   <string name="special">Özel</string>
   <string name="gem_for_gold_description">Habitica\'ya abone olduğun için, her ay Altın karşılığı bir miktar Elmas satın alabilirsin.</string>
@@ -519,7 +524,7 @@
   <string name="login_btn_fb">Facebook ile giriş yap</string>
   <string name="login_btn_google">Google ile giriş yap</string>
   <string name="action_back">Geri</string>
-  <string name="welcome_text">Ah, burada yeni olmalısın. Ben Justin, Habitica\'da ki rehberin olacağım.\n\nBaşlamak için, bir avatar yaratman gerekecek.</string>
+  <string name="welcome_text">Ah, burada yeni olmalısın. Ben Justin, Habitica\'da ki rehberin olacağım.\n\nİlk olarak, seni ne diye çağıralım? Seçtiğim ismi istediğin gibi değiştirebilirsin. Kararını verdiğinde avatarını yaratacağız!</string>
   <string name="randomize">Rastgele</string>
   <string name="avatar_extras">Ekstralar</string>
   <string name="avatar_skin_color">Ten Rengi</string>
@@ -531,7 +536,7 @@
   <string name="weak">Zayıf</string>
   <string name="strong">Güçlü</string>
   <string name="gray">Gri</string>
-  <string name="dated">Tarihli</string>
+  <string name="dated">Planlanmış</string>
   <string name="completed">Tamamlanmış</string>
   <string name="setuP_group_other">Diğer</string>
   <string name="clear">Temizle</string>
@@ -543,24 +548,26 @@
   <string name="empty_description_todos">Yapılacak İşler yalnızca bir kez tamamlanması gereken işlerdir. Değerlerini artırmak için Yapılacak İşlerine kontrol listeleri ekle.</string>
   <string name="empty_title_rewards">Hiç Ödül sahibi değilsin</string>
   <string name="reset_walkthrough">Junstin\'in Rehberliğini Sıfırla</string>
+  <string name="read_community_guidelines">Lütfen mesaj göndermeden önce Topluluk Kuralları\'mızı oku</string>
   <string name="maintenance">Bakım</string>
   <string name="reload_content">İçeriği Yenile</string>
-  <string name="dailyDueDefaultViewDescription">Bu seçenek seçili ise, Günlük İşler işleri varsayılan olarak \'tümü\' yerine \'bitirme\' olacaktır</string>
+  <string name="dailyDueDefaultView">Günlük İşlerin varsayılan semesini ‘aktif’ olarak ayarla</string>
+  <string name="dailyDueDefaultViewDescription">Bu seçenek seçili ise, Günlük İşlerin varsayılan sekmesi \'tümü\' yerine \'aktif\' olacaktır</string>
   <string name="repeat_summary">%1$sher %2$s%3$s%4$s tekrarlanır</string>
   <string name="no_billing_gems">Cihazında desteklenen ödeme yöntemleri yok. Elmas satın almak istersen lütfen habitica web sitesini kullan.</string>
   <string name="no_billing_subscriptions">Cihazında desteklenen ödeme yöntemleri yok. Abonelik satın almak istersen lütfen habitica web sitesini kullan.</string>
   <string name="save">Kaydet</string>
   <string name="location">Konum</string>
-  <string name="gem_reward">Elmas ödülü</string>
+  <string name="gem_reward">Elmas Ödülü</string>
   <string name="tasks">İşler</string>
-  <string name="create_challenge">Mücadele Yarat</string>
-  <string name="edit_challenge">Mücadeleyi Düzenle</string>
-  <string name="challenge_create_error_tavern_one_gem">Tavernada bir mücadele yaratmak için en azından 1 elmasa ihtiyacın var.</string>
-  <string name="challenge_create_error_enough_gems">Bir mücadele oluşturacak kadar elmasınız yok.</string>
-  <string name="identify_your_challenge_with_a_tag">Bir etiketle mücadeleyi belirleyin ..</string>
-  <string name="challenge_create_error_tag">Bu Mücadeleyi oluşturmak için bir etikete ihtiyacınız var.</string>
-  <string name="challenge_create_error_no_tasks">Bu Mücadeleyi oluşturmak için en az bir göreve ihtiyacınız var.</string>
-  <string name="challenge_create_error_title">Bu Mücadeleyi oluşturmak için bir başlığa ihtiyacınız var.</string>
+  <string name="create_challenge">Mücadele Oluştur</string>
+  <string name="edit_challenge">Düzenle</string>
+  <string name="challenge_create_error_tavern_one_gem">Herkese açık bir mücadele yaratmak için en azından 1 elmasa ihtiyacın var.</string>
+  <string name="challenge_create_error_enough_gems">Bir mücadele oluşturacak kadar elmasın yok.</string>
+  <string name="identify_your_challenge_with_a_tag">Mücadeleni kısa bir ad ile tarif et.</string>
+  <string name="challenge_create_error_tag">Bu Mücadeleyi oluşturmak için bir kısa isme ihtiyacın var.</string>
+  <string name="challenge_create_error_no_tasks">Bu Mücadeleyi oluşturmak için en az bir göreve ihtiyacın var.</string>
+  <string name="challenge_create_error_title">Bu Mücadeleyi oluşturmak için bir başlığa ihtiyacın var.</string>
   <string name="description_optional">Açıklama (isteğe bağlı)</string>
   <string name="new_challenge_title">Yeni mücadele başlığı</string>
   <string name="ownership">Sahiplik</string>
@@ -602,8 +609,14 @@
   <string name="experience_reward" formatted="false">%dTecrübe Puanı</string>
   <string name="gold_reward" formatted="false">%dAltın</string>
   <string name="quest_owner_rewards">Görev Sahibinin Ödülleri</string>
+  <string name="str_abbrv">Güç</string>
+  <string name="per_abbrv">Sezgi</string>
+  <string name="int_abbrv">Zeka</string>
+  <string name="con_abbrv">Bünye</string>
   <string name="reset_account">Hesabı Sıfırla</string>
+  <string name="reset_account_description">DİKKAT! Bu seçenek hesabının birçok kısmını sıfırlar. Kullanmanı kesinlikle önermesek de, bazı kişiler siteyi biraz kurcaladıktan sonra, tam manasıyla kullanmaya başlamadan önce bunu kullanışlı bulmaktadır.\n\nTüm seviyelerini, altınını ve tecrübe puanlarını kaybedeceksin. Tüm işlerin (mücadelelere bağlı olanlar hariç) kalıcı olarak silinecek ve bunların tarihsel verilerinin tamamını yitireceksin. Tüm ekipmanını kaybedeceksin ancak şu anda sahip olduğun tüm sınırlı sürüm ekipmanların ve abonelere özel gizemli eşyaların dahil hepsini yeniden satın alabileceksin (sınıfa özel ekipmanları tekrar satın almak için doğru sınıfta yer alıyor olman gerekir). Şu anki sınıfın, hayvanların ve bineklerin korunacak. Bunların yerine daha güvenli ve işlerinle ekipmanlarını koruyacak bir tercih olan Reenkarnasyon Küresini kullanmayı tercih edebilirsin.</string>
   <string name="delete_account">Hesabı Sil</string>
+  <string name="delete_account_description">Emin misin? Bu hesabını kalıcı olarak silecek ve geri dönüşü asla olmayacak! Habitica\'yı tekrar kullanmak için yeni bir hesap oluşturman gerekecek. Hesabında bulunan veya harcanmış Elmasların geri ödenmesi yapılmayacak. Eğer kesin olarak eminsen, aşağıdaki metin kutusuna şifreni gir.</string>
   <string name="reset_account_confirmation">hesabımı sıfırla</string>
   <string name="delete_account_confirmation">hesabımı sil</string>
   <string name="danger_zone">Tehlike Bölgesi</string>
@@ -611,18 +624,177 @@
   <string name="resetting_account">Hesap Sıfırlanıyor</string>
   <string name="deleting_account">Hesap Siliniyor</string>
   <string name="insufficientGold">Bu eşyanın fiyatını karşılamak için daha çok çalışmalısın!</string>
-  <string name="insufficientGems">Bu eşyayı almak için daha çok elmasa ihtiyacın var.</string>
+  <string name="insufficientGems">Bu eşyayı almak için daha çok elmasa ihtiyacın var!</string>
   <string name="purchase_gems">Elmas satın al</string>
-  <string name="insufficientHourglasses">Bu eşyayı almak için daha çok mistik kum saatine ihtiyacın var.</string>
+  <string name="insufficientHourglasses">Bu eşyayı almak için daha çok Mistik Kum Saatine ihtiyacın var!</string>
   <string name="get_hourglasses">Mistik Kum Saatleri al</string>
-  <string name="subscribe_for_hourglasses">Kum saatleri için abone ol.</string>
+  <string name="subscribe_for_hourglasses">Kum Saatleri için abone ol</string>
+  <string name="timetravelers_closed_description">Her 3 aylık devamlı üyelik başına bir Mistik Kum Saati kazan, daha sonra onu kullanarak sınırlı sayıdaki ekipmanların, hayvanların ve bineklerin kilidini geçmişten aç.... veya gelecekten!</string>
   <string name="want_to_subscribe">Abone olmak istiyorum</string>
+  <string name="seasonal_closed_description">Büyük Galalar gündönümü ve ekinoks zamanlarına yakın gerçekleşirler, çeşit çeşit özel mevsimsel eşyalar bulmak için bu zamanlarda ziyaret et!</string>
+  <string name="come_back_soon">Umarız yakında geri dönersin!</string>
   <string name="level">Seviye</string>
-  <string name="fix_character_description">Eğer bir programlama hatası veya bir hata yanlışlıkla karakterini adaletsizce etkilemiş ise buradan düzeltebilirsin.</string>
+  <string name="streak_label">21 Gün Tamamlama Serileri</string>
+  <string name="stats">Nitelikler</string>
+  <string name="fix_character_description">Eğer bir programlama hatası ile karşılaşırsan veya karakterini adaletsizce etkileyen bir yanlışlık yaparsan, değerleri buradan el ile düzeltebilirsin.</string>
   <string name="fix_character_values">Karakter değerlerini düzelt</string>
   <string name="saving">Kaydediliyor</string>
+  <string name="forgot_password_title">Bir Şifre Sıfırlama Bağlantısı E-Postala</string>
+  <string name="forgot_password_description">Habitica hesabına kaydolurken kullandığın e-posta adresini gir.</string>
+  <string name="forgot_password_confirmation">Eğer e-postan sistemimizde kayıtlıysa, yeni bir şifre belirlemek için talimatlar e-postana gönderildi.</string>
   <string name="ok">TAMAM</string>
   <string name="profile">Profil</string>
+  <string name="profile_summary">Umumi profilini düzenle.</string>
   <string name="display_name">Görünen isim</string>
+  <string name="photo_url">Fotoğraf Linki</string>
   <string name="login_name">Kullanıcı Adı</string>
+  <string name="about">Hakkında</string>
+  <string name="app_settings">Uygulama Ayarları</string>
+  <string name="authentication">Doğrulama</string>
+  <string name="authentication_summary">Doğrulama ayarlarını değiştir.</string>
+  <string name="change_password">Şifreni Değiştir</string>
+  <string name="change_email">E-Posta Adresini Değiştir</string>
+  <string name="change_login_name">Kullanıcı Adını Değiştir</string>
+  <string name="change_username">Kullanıcı Adını Değiştir</string>
+  <string name="change">Değiştir</string>
+  <string name="character_level">Karakter Seviyesi</string>
+  <string name="auto_allocate_points">Puanları Otomatik Dağıt</string>
+  <string name="stat_guide">Özellik Rehberi</string>
+  <string name="character_build">Karakter Yapısı</string>
+  <string name="character_build_description">Her seviye sana istediğin özelliğe ataman için bir puan kazandırır. Bunu elle yapabileceğin gibi, Otomatik Paylaştırma seçeneklerinden birini kullanarak oyunun senin için tercih etmesini de sağlayabilirsin.</string>
+  <string name="strength">Güç</string>
+  <string name="strength_description">Kritik vuruşların bonusunu arttırır ve iş bitirince kritik vuruş yapma olasılığını yükseltir. Aynı zamanda canavarlara yaptığın hasarı da arttırır.</string>
+  <string name="intelligence">Zeka</string>
+  <string name="intelligence_description">İş bitirince kazandığın TP\'yi arttırır. Aynı zamanda mana limitini ve zaman içindeki mana yenilenme hızını da yükseltir.</string>
+  <string name="constitution">Bünye</string>
+  <string name="constitution_description">İşlerinden aldığın hasar miktarını azaltır. Canavarlardan alınan hasarı azaltmaz.</string>
+  <string name="perception">Sezgi</string>
+  <string name="perception_description">İş bitirince eşya bulma şansını, günlük ganimet limitini, Seri Bonuslarını ve İş başına kazanılan altın miktarını arttırır.</string>
+  <string name="buffs">Kutsamalar</string>
+  <string name="allocated">Dağıtılmış</string>
+  <string name="distribute_evenly">Eşit olarak dağıt</string>
+  <string name="distribute_class">Sınıfına göre dağıt</string>
+  <string name="distribute_task">İş aktivitesine göre dağıt</string>
+  <string name="no_points_to_allocate">Dağıtılacak puan yok</string>
+  <string name="points_to_allocate" formatted="false">Dağıtılacak %d Puan Var</string>
+  <string name="distribute_evenly_help">Her özelliğe eşit miktarda puan dağıtır.</string>
+  <string name="distribute_class_help">Sınıfına uygun özelliklere daha fazla puan dağıtır.</string>
+  <string name="distribute_task_help">Tamamladığın işlere atanmış Güç, Zeka, Bünye ve Sezgi kategorilerine göre puanları dağıtır.</string>
+  <string name="allocating_points">Puanlar Dağıtılıyor</string>
+  <string name="class_equipment">Ekipman</string>
+  <string name="equipment_empty">Tüm ekipmana zaten sahipsin! Daha fazlası gündönümü ve ekinoks zamanlarına yakın Büyük Galalarda satışa çıkacak.</string>
+  <string name="classless">Sınıfsız</string>
+  <string name="class_equipment_shop_dialog">Bu eşya yalnızca belirli bir sınıf için geçerlidir.\nAyarlardan sınıfını değiştirebilirsin.</string>
+  <string name="class_gear_disclaimer">Yalnızca şu anki sınıfın için olan ekipmanları satın alabilirsin</string>
+  <string name="available_stats" formatted="false">%d puan</string>
+  <string name="toogle_emojis">Emojileri Göster</string>
+  <string name="tavern_description">Hana hoş geldin! Sohbet etmek için bir sandalye çek veya işlerine biraz ara ver.</string>
+  <string name="check_into_inn">Han\'a Gir</string>
+  <string name="community_guidelines">Topluluk Kuralları</string>
+  <string name="view_community_guidelines">Topluluk Kuralları\'nı Gör</string>
+  <string name="guidelines_description">Habitica her yaştan ve kökenden kullanıcılar için konuksever bir çevre yaratmayı amaçlar, özellikle de Taverna gibi umumi alanlarda. Eğer herhangi bir sorun varsa, lütfen Topluluk Kuralları\'mıza göz at.</string>
+  <string name="helpful_links">Faydalı Bağlantılar</string>
+  <string name="view_faq">SSS\'yi İncele</string>
+  <string name="report_bug">Hata Bildir</string>
+  <string name="player_tiers">Oyuncu Rütbeleri</string>
+  <string name="staff_moderators">Yetkililer ve Moderatörler</string>
+  <string name="tiers_descriptions">Handaki sohbette gördüğün renkli kullanıcı adları o kişinin katkı rütbesini gösterir. Katkı rütbesi olan kullanıcılar habitica\'ya sanat, kod veya iletişim ve başka konularda katkıda bulunmuşlardır.</string>
+  <string name="navigation_drawer_open">Navigasyon çekmecesini aç</string>
+  <string name="navigation_drawer_close">Navigasyon çekmecesini kapat</string>
+  <string name="world_boss">Dünya Canavarı</string>
+  <string name="world_boss_art">Canavar Görseli</string>
+  <string name="boss_art">Canavar Görseli</string>
+  <string name="world_boss_description">Dünya Canavarı Tanımı</string>
+  <string name="rage_strike_count" formatted="false">Öfke Saldırıları: %d/%d</string>
+  <string name="pending_strike_description">Bu Saldırı henüz gerçekleşmedi!\nDünya Canavarı öfke barı dolduğunda ayaklanıp cana yakın dükkan sahiplerimizden birine saldırır. Bunun gerçekleşmesini önlemek için Günlük İşlerini tamamlamaya devam et!</string>
+  <string name="pending_strike_title">Bekleyen Saldırı</string>
+  <string name="strike_description_title">Öfke Saldırısı nedir?</string>
+  <string name="strike_description_subtitle">3 tane potansiyel Öfke Saldırısı bulunuyor.</string>
+  <string name="strike_description_description">Bu bar Habiticalılar Günlük İşlerini aksattıkça dolar. Eğer tamamen dolarsa, KalpKıran Kahredici Kalp Kırıklığı saldırısını Habitica\'nın dükkan sahiplerinden birine yöneltir, bu yüzden işlerini tamamladığından emin ol!</string>
+  <string name="pending_strike_subtitle">Bu Saldırı henüz gerçekleşmedi!</string>
+  <string name="strike_active_title" formatted="false">%s Saldırıya uğradı!</string>
+  <string name="strike_active_subtitle" formatted="false">%s artık Kalbi Kırık!</string>
+  <string name="strike_active_description" formatted="false">Çok sevdiğimiz %s hüsrana uğradı çünkü %s, %s ve çevresini paramparça etti. Çabuk, canavarı yenmek ve yeniden inşaya yardım etmek için işlerine sarıl!</string>
+  <string name="questShop">Görev Dükkanı</string>
+  <string name="market_owner_long">Tüccar Alex</string>
+  <string name="tavern_owner_long">Hancı Daniel</string>
+  <string name="stable_owner_long">Hayvan Terbiyecisi Matt</string>
+  <string name="hide_boss_art">Canavar Görselini Gizle</string>
+  <string name="active_world_boss">Etkin Dünya Canavarı</string>
+  <string name="no_party_description">Arkadaşlarınla veya tek başına inanılmaz görevlere çık. Canavarlarla savaş, Mücadeleler yarat ve Takımlar sayesinde sorumluluk sahibi kal.</string>
+  <string name="no_party_title">Habitica\'yı bir Takımla Oyna!</string>
+  <string name="join_party_description">Bir Takım üyesine aşağıdaki kullanıcı adını verirsen seni takımına davet edebilir</string>
+  <string name="join_party_description_id">Davet edilmek için Kullanıcı ID\'ni karşındakiyle paylaş veya QR kodunu tarat</string>
+  <string name="join_party_title">Bir takıma katılmak ister misin?</string>
+  <string name="create_party_website">Bir takım oluşturmak için web sitesini aç</string>
+  <string name="id_copied">ID panoya kopyalandı</string>
+  <string name="insufficientSubscriberGems">Bu ay satın alabileceğin bütün Elmasları satın aldın. Her ayın ilk üç gününde daha fazlası erişimine açılacaktır. Aboneliğin için teşekkür ederiz!</string>
+  <string name="insufficientSubscriberGemsTitle">Aylık Elmas Limitine Ulaşıldı</string>
+  <string name="chat_message">Sohbet Mesajı</string>
+  <string name="world_boss_description_title">Dünya Canavarı nedir?</string>
+  <string name="world_boss_description_description">Dünya Canavarı Habitica topluluğunu, işleriyle güçlü bir canavarı haklamak için bir araya getiren özel bir etkinliktir!\nCanavara hasar vermek için işlerini tamamla\nDünya Canavarı, aksattığın işlerin yüzünden sana hasar vermez ama Öfke barı yükselir. Eğer bar dolarsa, Canavar Habitica\'nın mağaza sahiplerinden birine saldırır!\nNormal Görev Canavarları ile devam edebilirsin, vereceğin hasar ikisine de etki eder\nDünya Canavarı ilerlemesini ve Öfke saldırılarını görmek için Tavernayı düzenli olarak kontrol et</string>
+  <string name="world_boss_description_intro">Dünya Canavarı Habitica topluluğunu, işleriyle güçlü bir canavarı haklamak için bir araya getiren özel bir etkinliktir!</string>
+  <string name="world_boss_description_1">Canavara hasar vermek için işlerini tamamla</string>
+  <string name="world_boss_description_2">Dünya Canavarı, aksattığın işlerin yüzünden sana hasar vermez ama Öfke barı yükselir. Eğer bar dolarsa, Canavar Habitica\'nın mağaza sahiplerinden birine saldırır!</string>
+  <string name="world_boss_description_3">Normal Görev Canavarları ile devam edebilirsin, vereceğin hasar ikisine de etki eder</string>
+  <string name="world_boss_description_4">Dünya Canavarı ilerlemesini ve Öfke saldırılarını görmek için Tavernayı düzenli olarak kontrol et</string>
+  <string name="world_boss_action_prompt" formatted="false">Özel ödüller kazanmak ve Habitica\'yı %s gazabından kurtarmak için Canavarı yen!</string>
+  <string name="world_boss_description_subtitle">%s saldırdı!</string>
+  <string name="questShop_owner_long">Görev Rehberi Ian</string>
+  <string name="seasonalShop_owner_long">Mevsimsel Büyücü</string>
+  <string name="rage_attack">Öfke saldırısı:</string>
+  <string name="tavern_description_world_boss">Ah canım, aşağıdaki canavarı görmezden gel — burası hala molalarında sohbet etmen için güvenli bir bölge.</string>
+  <string name="report">Bildir</string>
+  <string name="like">Beğen</string>
+  <string name="reply">Cevapla</string>
+  <string name="challenge_prize">Mücadele Ödülü</string>
+  <string name="challenge_categories">Mücadele Kategorileri</string>
+  <string name="created_challenge">Mücadele Oluşturuldu</string>
+  <string name="joined">Katıldın</string>
+  <string name="public_challenge">Herkese Açık Mücadele</string>
+  <string name="short_name">Kısa İsim</string>
+  <string name="unlock_attribute_points">Özellik puanı paylaştırma 10. seviyede açılır</string>
+  <string name="same_day_reminder_title">İşlerini ekledin mi?</string>
+  <string name="same_day_reminder_text">Ne kadar eklersen o kadar ödüllendirileceksin. Küçük alışkanlıklar bile büyük bir değişime yol açar.</string>
+  <string name="next_day_reminder_title">Bugün işlerini işaretledin mi?</string>
+  <string name="next_day_reminder_text">Kilidini açacağın ve keşfedeceğin çok şey var, bu yüzden işlerinde geri kalma ve eğlenmene bak!</string>
+  <string name="daily_tip_0">Yeni bir şey denemek ister misin? İş listeni genişletmek için bir Mücadeleye katıl ve biraz Elmas kazan!</string>
+  <string name="daily_tip_1">Ödüllerini çoğaltmak için Yapılacak İşlerine yapılacak iş maddesi ekle!</string>
+  <string name="daily_tip_2">Bir Günlük İşin ne sıklıkla tekrar edeceğini değiştirebilirsin. Nadir yapılan işler bile programlanabilir.</string>
+  <string name="daily_tip_3">Günlük İşlerin için özel hatırlatmalar da ayarlayabilirsin.</string>
+  <string name="daily_tip_4">Ara sıra işlerini yeniden değerlendirmenin seni doğru yolda tutma konusunda yardımı olabilir.</string>
+  <string name="daily_tip_5">Odaklanmana yardım etmesi için derin derin nefes al. Bunu yapabilirsin!</string>
+  <string name="daily_tip_6">On dakikalık bir zamanlayıcı kurup bu süre zarfında ne kadarını bitirebildiğini görmeyi bir dene!</string>
+  <string name="daily_tip_7">Seni onları kazanmaya isteklendirmesi için Ödüllerine Pazardan eşyalar tutturmayı dene!</string>
+  <string name="daily_tip_8">Zorlu işlerde kendini daha çok ödüllendirmek için İş\'inin zorluk düzeyini değiştirebilirsin!</string>
+  <string name="daily_tip_9">Eğer zorlanıyorsan, işlerini daha küçük parçalara ayırmayı dene.</string>
+  <string name="moderator">Moderatör</string>
+  <string name="staff">Yetkili</string>
+  <string name="expand_notes">Daha Fazla</string>
+  <string name="collapse_notes">Daha Az</string>
+  <string name="reset_streak">Tamamlama serisini sıfırla</string>
+  <string name="week_reminder_title">İşlerin nasıl gidiyor?</string>
+  <string name="week_reminder_text">Molalar gayet sağlıklı ama hâlâ basit aktivitelerinden puan kazanıp seviye atlayabilir ve havalı eşyalar alabilirsin! </string>
+  <string name="last_login">Son Giriş</string>
+  <string name="total_checkins">Toplam Giriş Sayısı</string>
+  <string name="two_handed">Çift Elli</string>
+  <string name="usernamePromptTitle">Kullanıcı adına karar verme vakti!</string>
+  <string name="usernamePromptBody">Giriş isimleri artık görünen adının yanında görünecek ve davetiyelerde, sohbet @bahsetmelerinde ve mesajlaşmalarda kullanılacak eşsiz kullanıcı adlarına dönüştü.</string>
+  <string name="usernamePromptWiki">Eğer bu değişim hakkında daha fazla şey öğrenmek istiyorsan, <a href="https://habitica.wikia.com/wiki/Player_Names">wikimizi ziyaret et.</a></string>
+  <string name="confirmUsername">Kullanıcı adını onayla</string>
+  <string name="usernamePromptDisclaimer">Kullanıcı Adları <a href="https://habitica.com/static/terms">Hizmet Koşulları\'mıza</a> ve <a href="https://habitica.com/static/community-guidelines">Topluluk İlkeleri\'mize</a> uygun olmalıdır. Daha önce bir Giriş Adı belirlemediysen, Kullanıcı Adın otomatik olarak oluşturulmuştur.</string>
+  <string name="confirm_username_title">Geçerli kullanıcı adını onaylamak istediğine emin misin?</string>
+  <string name="confirm_username_description">Kullanıcı adını onaylayarak onu davetlerde, sohbetlerde ve mesajlaşmalarda aleni hâle getiriyorsun. Kullanıcı adını istediğin her an ayarlardan değiştirebilirsin.</string>
+  <string name="cancel">İptal </string>
+  <string name="confirm_username">Kullanıcı adını onayla</string>
+  <string name="username_not_confirmed">Kullanıcı adı onaylanmadı</string>
+  <string name="username_confirmed">Kullanıcı Adı Onaylandı</string>
+  <string name="username_level">\@%s ・Svy %d</string>
+  <string name="enter_recipient_username">Alıcının kullanıcı adını gir</string>
+  <string name="username_copied">Kullanıcı adı panoya kopyalandı</string>
+  <string name="verification_pet">Onaylamayı tamamladığında Kıdemli Hayvanlardan biri seni bekliyor olacak!</string>
+  <string name="welcomeNameTitle">Sana nasıl hitap edelim?</string>
+  <string name="display_name_length_error">Görünür isimler 1 ile 30 karakter arası uzunlukta olmalıdır.</string>
+  <string name="setup_task_join_habitica">Habitica\'ya Katıl (Beni işaretle!)</string>
+  <string name="setup_task_join_habitica_notes">Bu Yapılacak İşi tamamlayabilir, düzenleyebilir ya da kaldırabilirsin.</string>
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.profile.xml b/Habitica/res/values-zh-rTW/strings.profile.xml
index 2dbf1c56e..7c7af1012 100644
--- a/Habitica/res/values-zh-rTW/strings.profile.xml
+++ b/Habitica/res/values-zh-rTW/strings.profile.xml
@@ -3,11 +3,16 @@
     <string name="profile_pets_and_mounts">寵物＆座騎</string>
     <string name="profile_pets_found">已找到寵物</string>
     <string name="profile_mounts_tamed">已馴養的坐騎</string>
+    <string name="profile_loading_data">讀取數據資料中。</string>
     <string name="profile_send_message_to">發送訊息到 %s</string>
     <string name="profile_message_sent_to">訊息發送至 %s</string>
     <string name="profile_level">等級：</string>
     <string name="profile_class_bonus">加成獎勵：</string>
     <string name="profile_allocated">已分配</string>
+    <string name="profile_boosts">增益：</string>
     <string name="profile_private_message">私人訊息</string>
     <string name="profile_achievements">成就</string>
-    </resources>
+    <string name="profile_achievement_ok">了解 </string>
+    <string name="profile_qrcode_close">關閉</string>
+
+</resources>
diff --git a/Habitica/res/values-zh-rTW/strings.sidebar.xml b/Habitica/res/values-zh-rTW/strings.sidebar.xml
index 0138aa5a9..31a3024f6 100644
--- a/Habitica/res/values-zh-rTW/strings.sidebar.xml
+++ b/Habitica/res/values-zh-rTW/strings.sidebar.xml
@@ -3,7 +3,7 @@
   <string name="sidebar.tasks">任務</string>
   <string name="sidebar.skills">技能</string>
   <string name="sidebar.section.social">社交</string>
-  <string name="sidebar.inbox">收信匣</string>
+  <string name="sidebar.inbox">訊息</string>
   <string name="sidebar.tavern">酒館</string>
   <string name="sidebar.party">隊伍</string>
   <string name="sidebar.purchaseGems">購買寶石</string>
@@ -17,4 +17,5 @@
   <string name="sidebar.settings">設定</string>
   <string name="sidebar.about">關於</string>
   <string name="sidebar_shops">商店</string>
+  <string name="sidebar_stats">馬廄</string>
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.tutorial.xml b/Habitica/res/values-zh-rTW/strings.tutorial.xml
index 54e594ba9..fefe180a8 100644
--- a/Habitica/res/values-zh-rTW/strings.tutorial.xml
+++ b/Habitica/res/values-zh-rTW/strings.tutorial.xml
@@ -1,9 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="tutorial_overview">我們在這兒！我已經根據你的興趣給你添加了幾個任務~也試試自己添加幾個吧！你還可以點擊任務標題來修改它們。</string>
+  <string name="tutorial_habits_1">首先是習慣。它們可以是你想養成的好習慣，也可以是你想戒掉的壞習慣。</string>
+  <string name="tutorial_habits_2">每當你完成一次好的習慣，點擊習慣前的加號，就可以獲得經驗和金幣啦！</string>
+  <string name="tutorial_habits_3">如果你一不留神完成了一次壞習慣，點擊減號，這會減少角色的生命值來幫助你戒掉壞習慣。</string>
+  <string name="tutorial_habits_4">試試看吧！你可以在下方導航列中發掘更多任務類型。</string>
+  <string name="tutorial_dailies_1">有一定規律的、或是時間緊迫的任務，可以將其新增至每日任務。</string>
+  <string name="tutorial_dailies_2">小心 - 如果你沒有完成，你的角色會在一夜之間受到傷害。</string>
+  <string name="tutorial_todos_1">待辦事項是只需要執行一次的任務。</string>
+  <string name="tutorial_todos_2">如果您的待辦事項必須在特定時間內完成，請設置截止日期。</string>
+  <string name="tutorial_rewards_1">用金幣為你的角色添購裝備吧！</string>
+  <string name="tutorial_rewards_2">你也可以自定義獎勵。</string>
+  <string name="tutorial_tasks_complete">目前為止就這樣了。如果您想了解更多，請查看FAQ部分。</string>
+  <string name="tutorial_equipment">在你購買裝備後會在這裡顯示。你的戰鬥裝備會影響你的屬性，你的服裝(如果有裝備的話)會在你的角色上顯示。</string>
   <string name="tutorial_items">通過升級和完成任務獲得物品。點擊一個物品來使用。</string>
   <string name="tutorial_pets">完成現實任務後，隨機掉落寵物蛋和藥水。將藥水灑在寵物蛋上孵化寵物。</string>
   <string name="tutorial_skills">技能是有強大作用的特殊能力！點擊技能使用。使用技能需要消耗魔法值(藍色條)，魔力可由每日打卡和完成現實任務來獲得。更多信息請查詢FAQ。</string>
   <string name="tutorial_party">在這裡，你和你的朋友可以互相激勵完成目標並通過完成任務組團打BOSS。</string>
   <string name="tutorial_tavern">歡迎來到酒館，這裡是一個公開的不分年齡的聊天室！這裡，可以聊聊心得，問問問題。祝您玩的愉快！</string>
   <string name="tutorial_classes">選擇成為戰士、法師、醫者或者盜賊！每個職業有獨特的裝備和技能。點擊(?)查看更多！</string>
+  <string name="tutorial_stats">按灰色的按鈕可以把所有的能力點用於一次升級某項能力，或是按箭頭以批次分配能力點。</string>
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index e65a7bd0f..1ffe52ba0 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -16,9 +16,10 @@
   <string name="Language_summary">更改Habitica的語言</string>
   <string name="SP_user_qr_code">你的 QR 碼</string>
   <string name="PS_contact_title">聯絡我</string>
+  <string name="unknown_error">發生錯誤……</string>
   <string name="pref_account_header">帳號</string>
   <string name="pref_first_day_of_the_week_title">每周的第一天</string>
-  <string name="pref_first_day_of_the_week_summary">所有日曆中第一周的第一天</string>
+  <string name="pref_first_day_of_the_week_summary">毎周的第一天</string>
   <string name="pref_reminder_header">每日任務提醒</string>
   <string name="pref_reminder_checkbox">啟用提醒</string>
   <string name="pref_reminder_picker">設置提醒時間</string>
@@ -29,12 +30,18 @@
   <string name="push_notifications_sum">設定你的推送通知設置</string>
   <string name="preference_push_you_won_challenge">你贏得了一個挑戰！</string>
   <string name="preference_push_received_a_private_message">你收到一則私人訊息</string>
+  <string name="preference_push_gifted_gems">贈送的寶石</string>
+  <string name="preference_push_gifted_subscription">贈送的訂閱</string>
   <string name="preference_push_invited_to_party">你受邀加入隊伍</string>
   <string name="preference_push_invited_to_guild">你受邀請到公會</string>
   <string name="preference_push_your_quest_has_begun">你的任務開始了</string>
-  <string name="preference_push_invited_to_quest">你受邀參加任務</string>
+  <string name="preference_push_invited_to_quest">邀請參加任務</string>
   <!--Adding tasks-->
   <string name="task_value">數值</string>
+  <string name="new_todo">新待辦事項</string>
+  <string name="new_reward">新獎勵</string>
+  <string name="new_daily">新每日任務</string>
+  <string name="new_habit">新習慣</string>
   <string name="action_edit">編輯</string>
   <string name="action_delete">刪除</string>
   <string name="action_cancel">取消</string>
@@ -59,6 +66,7 @@
   <string name="about.give_us_feedback">請給我們提交建議！</string>
   <string name="about.bugreport">回報問題與漏洞</string>
   <string name="about.source_code">原始程式碼</string>
+  <string name="repeatEvery">每... 重複</string>
   <!--Network Errors-->
   <string name="network_error_title">連接錯誤</string>
   <string name="network_error_no_network_body">您沒有連接到網路。</string>
@@ -84,9 +92,22 @@
   <string name="reminders">提醒</string>
   <string name="actions">動作</string>
   <string name="attributes">屬性</string>
+  <string name="physical">力量</string>
+  <string name="mental">智力</string>
+  <string name="social">體質</string>
+  <string name="other">感知</string>
   <string name="frequency">頻率</string>
   <string name="frequency_weekly">每周中的特定日期</string>
   <string name="frequency_daily">每x日</string>
+  <string name="repeatables_summary_title">概要</string>
+  <string name="repeatables_title">設定週期</string>
+  <string name="repeatables_on_title">開啟重複</string>
+  <string name="repeatables_frequency_daily">每日任務</string>
+  <string name="repeatables_frequency_weekly">每週任務</string>
+  <string name="repeatables_frequency_monthly">每月任務</string>
+  <string name="repeatables_frequency_yearly">每年任務</string>
+  <string name="repeatables_frequency_day_of_month">一個月中的一天</string>
+  <string name="repeatables_frequency_day_of_week">一週中的一天</string>
   <string name="monday">星期一</string>
   <string name="tuesday">星期二</string>
   <string name="wednesday">星期三</string>
@@ -94,12 +115,8 @@
   <string name="friday">星期五</string>
   <string name="saturday">星期六</string>
   <string name="sunday">星期日</string>
-  <string name="levelup_header">你升級了！</string>
-  <string name="levelup_detail">通過完成您現實生活中的目標，您已升至 %1$d 級！</string>
-  <string name="levelup_health">你被完全治癒了！</string>
   <string name="levelup_button">吼啊~！</string>
   <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>
@@ -109,7 +126,6 @@
   <string name="used_skill_without_mana">你使用了 %1$s。</string>
   <string name="new_checklist_item">新增清單內容</string>
   <string name="add_checklist_item">添加</string>
-  <string name="reminder_title">記得完成你的每日任務！</string>
   <string name="skill_progress_title">使用技能</string>
   <string name="coming_soon">即將推出</string>
   <string name="chat_flag_confirmation">你確認要舉報這條消息嗎？</string>
@@ -156,10 +172,10 @@
   <string name="due_date">截止日期</string>
   <string name="quest.accept">接受</string>
   <string name="quest.reject">拒絕</string>
-  <string name="quest.begin">開始</string>
+  <string name="quest.begin">開始執行任務</string>
   <string name="quest.cancel">取消</string>
-  <string name="quest.abort">舍棄</string>
-  <string name="quest.leave">放棄任務</string>
+  <string name="quest.abort">放棄任務</string>
+  <string name="quest.leave">離開任務</string>
   <string name="quest.pending">等待中</string>
   <string name="quest.accepted">接受了</string>
   <string name="quest.rejected">拒絕的</string>
@@ -170,8 +186,12 @@
   <string name="dismiss_tutorial">再次提醒我</string>
   <string name="intro_1_subtitle">歡迎來到</string>
   <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">和%s玩家一起用游戲戰勝拖延症！你可以創建一個賬戶，用它來跟蹤你生活中的點滴瑣事。</string>
   <string name="intro_2_subtitle">遊戲進度</string>
   <string name="intro_2_title">生活進度</string>
+  <string name="intro_2_description">通過完成現實生活中的任務來解鎖游戲內容。得到裝備、寵物和更多的獎勵來促使你完成目標吧！</string>
+  <string name="intro_3_subtitle">對抗怪獸</string>
+  <string name="intro_3_title">與小夥伴一起，並肩擊退怪獸</string>
   <string name="intro_3_description">和朋友們一起為目標努力吧。在生活和戰鬥中互相支持，共同進步！</string>
   <string name="intro_finish_button">開始吧!</string>
   <string name="previous_button">上一頁</string>
@@ -179,8 +199,13 @@
   <string name="skip_button">跳過</string>
   <string name="setup_welcome_description">歡迎來到Habitica，在游戲中打怪升級的同時改善自己的真實生活。完成現實生活中的目標，解鎖大量裝備、寵物、任務卷軸，更多特色等你探索。</string>
   <string name="setup_welcome_title">歡迎你</string>
+  <string name="avatar_setup_description">首先，你需要創建一個角色。之後可以隨時更改。</string>
+  <string name="task_setup_description">太棒了！現在開始設定你的任務，開始賺取經驗和金幣吧。
+
+首先，你想改善生活中的哪一部分呢？</string>
   <string name="setup_group_work">工作</string>
   <string name="setup_group_exercise">運動</string>
+  <string name="setup_group_health">健康</string>
   <string name="setup_group_school">學校</string>
   <string name="setup_group_teams">團隊</string>
   <string name="setup_group_chores">雜務</string>
@@ -214,11 +239,13 @@
   <string name="join">加入</string>
   <string name="leader">會長</string>
   <string name="gems">寶石</string>
+  <string name="copy_as_todo">複製為待辦事項</string>
   <string name="send_pm">發送私人信息</string>
   <string name="flag">標示</string>
   <string name="delete">刪除</string>
   <string name="name">名稱</string>
-  <string name="description">Description</string>
+  <string name="description">描述</string>
+  <string name="add_tag">添加新標簽</string>
   <string name="privacy">隱私</string>
   <string name="write_message">寫消息</string>
   <string name="post">公告</string>
@@ -240,13 +267,14 @@
   <string name="equipped">裝備</string>
   <string name="quest_cancel_message">你確定要取消任務? 所有邀請將會消失，任務擁有者會收到退還的任務卷軸</string>
   <string name="quest.invitation">任務邀請</string>
-    <string name="quest.invitation.text">你已經被邀請加入任務!</string>
-  <string name="ago_1day">1 天前</string>
-  <string name="ago_days">%d 天前</string>
-  <string name="ago_1Minute">1 分鐘之前</string>
-  <string name="ago_minutes">%d 分鐘之前</string>
-  <string name="ago_hours">%d 小時之前</string>
-  <string name="ago_1hour">1 小時之前</string>
+  <string name="quest_begin_message">當所有玩家加入或拒絕邀請時，任務會自動開始。只有%1$d你的%2$d團隊成員加入了這個任務！你是否確定要直接開始這個探索任務？一旦開始，其他隊伍成員就不能加入這個探索任務。</string>
+  <string name="quest.invitation.text">你已經被邀請加入任務!</string>
+  <string name="ago_1day">一天以前</string>
+  <string name="ago_days">%d天以前</string>
+  <string name="ago_1Minute">一個月以前</string>
+  <string name="ago_minutes">%d個月以前</string>
+  <string name="ago_hours">%d個小時以前</string>
+  <string name="ago_1hour">一小時以前</string>
   <string name="today">今天</string>
   <string name="sidebar_items">物品</string>
   <string name="eggs">寵物蛋</string>
@@ -271,9 +299,12 @@
   <string name="feed">餵</string>
   <string name="hatch_with">用 %s 孵化寵物</string>
   <string name="hatched_pet_title">你孵化了一隻 %1$s %2$s！</string>
+  <string name="evolved_pet_title">你馴服了%1$s%2$s，讓我們騎上牠吧！</string>
   <string name="close">關閉</string>
   <string name="share">分享</string>
   <string name="notification_pet_fed">你餵食了你的%1$s %2$s！</string>
+  <string name="notification_purchase">你購買了%s</string>
+  <string name="notification_purchase_reward">你購買了一個獎勵</string>
   <string name="sectionpets">基本寵物</string>
   <string name="sectionpremiumPets">神奇藥水寵物</string>
   <string name="sectionquestPets">劇情任務寵物</string>
@@ -283,7 +314,7 @@
   <string name="sectionquestMounts">劇情任務坐騎</string>
   <string name="sectionspecialMounts">稀有坐騎</string>
   <string name="world_quest">世界任務</string>
-  <string name="inn_description">在客棧休息讓你未完成的每日任務不會傷害你！ (注意：它不能阻止來自任務怪物的傷害。)</string>
+  <string name="inn_description">在客棧休息讓你未完成的每日任務不會傷害你！ （注意：它不能阻止來自任務怪物的傷害。）</string>
   <string name="empty_items">你沒有擁有任何的%s</string>
   <string name="user_level">%d等級</string>
   <string name="user_level_with_class">等級 %1$d - %2$s</string>
@@ -291,7 +322,6 @@
   <string name="rogue">盜賊</string>
   <string name="mage">法師</string>
   <string name="healer">醫師</string>
-  <string name="warrior_description">戰士們會有更大的機率觸發暴擊並在完成任務時隨機獲得額外的金幣，經驗和掉率。他們還能對boss造成嚴重的傷害。如果你希望獲得隨機性的獎勵，或者在boss任務中重創boss，來玩戰士吧！</string>
   <string name="mage_description">法師非常善於學習，獲得經驗值和升級比其他職業快。他們也會獲得大量的魔力值來使用一些特殊的法術。如果你喜歡玩得有策略性，或者你強烈地希望升級解鎖更多的遊戲內容，來玩法師吧！</string>
   <string name="rogue_description">盜賊熱衷於積累財富，比其他人獲得更多的金幣，還擅長尋找隨機物品。他們標誌性的潛行技能使得他們能夠躲避未完成的日常帶來的傷害。如果你希望獲得更多的獎勵，成就，掉落以及徽章，來玩盜賊吧！</string>
   <string name="healer_description">醫師們對傷害的抗性很強，也可以保護其他的人。錯過的日常任務和壞習慣無法傷害他們太多，而且他們有很多回血的技能。如果你熱衷於輔助其他的隊友，或者是享受那種從死神手里奪取生命的快感，那就成為一名醫師吧！</string>
@@ -300,11 +330,12 @@
   <string name="opt_out_description">不知道選什麼職業？想以後再選？沒問題 - 你現在可以先做一個沒有特殊技能的戰士。我們的維基頁面上有關於職業系統的介紹，之後隨時可以定你的職業。</string>
   <string name="class_confirmation">你確定想要成為%1$s嗎？</string>
   <string name="class_changed">你成為了%s!</string>
+  <string name="class_changed_description">你有新的默認的戰鬥裝備，你可以在裝備裡替換！</string>
   <string name="choose_class">選擇職業</string>
   <string name="dialog_go_back">返回</string>
   <string name="opt_out_confirmation">你確定要退出嗎？</string>
   <string name="change_class">更換你的職業</string>
-  <string name="change_class_description">變更職業並重新分配屬性點，這會花費3寶石。你可以在網頁版上分配屬性點。</string>
+  <string name="change_class_description">變更職業並重新分配屬性點，這會花費3寶石。</string>
   <string name="enable_class">開啟職業系統</string>
   <string name="changing_class_progress">更換職業</string>
   <string name="by_email">通過電子郵件</string>
@@ -318,20 +349,25 @@
   <string name="email">電子郵件</string>
   <string name="invite_users">邀請加入隊伍</string>
   <string name="share_using">分享使用</string>
+  <string name="share_levelup">我在Habitica中通過改善我現實生活中的習慣到達了%d級！</string>
   <string name="share_hatched">我剛剛在Habitica中通完成我現實生活中的任務孵化了一隻寵物%1$s %2$s！</string>
   <string name="share_raised">我剛剛在Habitica中通完成我現實生活中的任務得到了一匹坐騎%1$s %2$s！</string>
   <string name="open_in_store">開啟Play sotre</string>
   <string name="change_class_confirmation">你確定要變更職業嗎？這會花費3寶石。</string>
+  <string name="change_class_equipment_warning">提示：你無法再購買%s職業的裝備了（已頂級）。</string>
   <string name="leaderMessage">訊息來自%1$s</string>
   <string name="leaderName">隊長: %1$s</string>
   <string name="confirm">確認</string>
   <string name="market">市集</string>
   <string name="timeTravelers">時光旅人</string>
   <string name="seasonalShop">季節限定商店</string>
-  <string name="empty_inbox">你的收件匣裡面沒有任何信息。你可以利用聊天去傳送訊息給大家</string>
+  <string name="empty_inbox">你的收件匣裡面沒有任何訊息。您可以通過公共聊天向其他人發送新訊息！</string>
   <string name="party_invite">解鎖 邀請朋友</string>
+  <string name="login_incentive">定期登錄Habitica解鎖</string>
+  <string name="create_account">通過創建一個帳戶解鎖</string>
   <string name="no_gold">金幣不足</string>
   <string name="no_potion">你不需要購買治療藥水</string>
+  <string name="successful_purchase">成功購入 %1$s</string>
   <string name="purchase_confirmation_title">確認購買</string>
   <string name="confirm_purchase_text">購買 %1$s 用了 %2$s %3$s</string>
   <string name="gem">寶石</string>
@@ -350,6 +386,7 @@
   <string name="filter_drawer_edit_tags">編輯標籤</string>
   <string name="filter_drawer_filter_tags">過濾標籤</string>
   <!--QR Strings-->
+  <string name="qr_section_title">有人邀請您使用此QR碼</string>
   <string name="qr_save_message">QR碼保存在</string>
   <string name="qr_dialogue_title">你的QR碼</string>
   <string name="download">下載</string>
@@ -368,18 +405,22 @@
   <string name="all_dailies_completed">你完成了所有每日任務。做得好！</string>
   <string name="widget_habit_button">Habitica 做習慣</string>
   <string name="widget_dailies">Habitica 每日任務</string>
+  <string name="widget_todo_list">Habitica 待辦事項列表</string>
   <string name="widget_add_task">Habitica 添加獎勵</string>
   <string name="google_services_missing">找不到 Google play 服務。</string>
   <string name="gem.purchase.toolbartitle">支付</string>
   <string name="gem.purchase.title">購買寶石會幫助開發者維持Habitica</string>
+  <string name="gem.purchase.subtitle">寶石允許你為你的帳戶購買有趣的項目，包括：</string>
   <string name="gem.purchase.listitem1">為你的角色穿上酷衣裝</string>
   <string name="gem.purchase.listitem2">超讚的背景</string>
+  <string name="gem.purchase.listitem3">任務獎勵：寵物蛋</string>
   <string name="gem.purchase.listitem4">可以在100等級以前更換職業的能力</string>
   <string name="support_habitica">贊助Habitica</string>
   <string name="skill_transformation_use">使用</string>
   <string name="hatching_market_info">沒有得到想要的掉落物嗎？立刻查看市集！</string>
   <string name="feeding_market_info">需要不一樣的食物嗎？到市集中購買更多食物！</string>
   <string name="open_market">打開市集</string>
+  <string name="cds_description">你的每日任務將會在%1$s後第一次打開 Habitica 時進行結算並被重置。請確保在此之前完成所有的每日任務！</string>
   <string name="AudioTheme_title">聲音主題</string>
   <string name="AudioTheme_summary">更改Habitica的聲音主題</string>
   <!--Login Incentives-->
@@ -387,21 +428,52 @@
   <string name="belongs_to_challenge">屬於挑戰</string>
   <string name="has_reminder">有提醒</string>
   <string name="has_tag">有標籤</string>
+  <string name="subscribe.title">捐助支持開發者以幫助維持Habitica運行</string>
+  <string name="subscribe_prompt">成為捐助者你會得到這些好處：</string>
   <string name="subscribe.listitem1">使用金幣購買寶石</string>
+  <string name="subscribe.listitem2">獨家每月項目</string>
   <string name="subscribe.listitem3">保留外加歷史條目</string>
+  <string name="subscribe.listitem4">每日掉落上限翻倍</string>
+  <string name="subscriptions">捐助</string>
+  <string name="subscription_duration">每%s重複出現</string>
   <string name="subscribe">加入會員</string>
+  <string name="subscribe.listitem1.description">商人亞歷山大可以按每個寶石20金幣的價格向你出售寶石！\n\n他每個月的初始進貨量是25個寶石，進貨量會隨著您的捐助額度增長！\n\n 每三個月寶石上限就會增加5，直到最大值1個月50顆寶石！</string>
+  <string name="subscribe.listitem2.description">每個月你將會收到一件獨特的角色飾品！另外，每連續捐助三個月，神秘的時間旅行者將授予你得到過去(和未來)的飾品的資格。</string>
+  <string name="subscribe.listitem3.description">使完成的待辦事項和任務的歷史記錄保留更長時間</string>
+  <string name="subscribe.listitem4.description">雙倍掉落讓你每天能夠從完成的任務中得到更多的物品，幫助你更快地馴服坐騎！</string>
+  <string name="subscribe1month.gemcap">寶石上限起始為25</string>
+  <string name="subscribe3month.gemcap">寶石上限增加到30</string>
+  <string name="subscribe6month.gemcap">寶石上限增加到35</string>
+  <string name="subscribe12month.gemcap">寶石上限增加到45</string>
+  <string name="subscription_hourglasses">%d神秘沙漏</string>
+  <string name="payment_method">付款方式</string>
+  <string name="subscription">捐助</string>
+  <string name="active">活躍的</string>
   <string name="cancel_subscription">取消會員</string>
+  <string name="cancel_subscription_google.description">想要取消訂閱嗎？你可以在Google Play裡的「我的應用程式」取消訂閱。</string>
+  <string name="cancel_subscription_notgoogle.description">想要取消訂閱嗎？由於你的支付方式，你只能在網站上取消訂閱，點擊下方的按鈕以打開網頁。</string>
   <string name="visit_habitica_website">查訪Habitica官方網站</string>
+  <string name="current_bonuses">現在的加成獎勵</string>
+  <string name="months_subscribed">月訂閱</string>
+  <string name="current_hourclasses">現有的神秘沙漏</string>
+  <string name="monthly_gem_cap">每月寶石上限</string>
+  <string name="inactive">不活躍的</string>
   <string name="one_month">1個月</string>
   <string name="months">%d個月</string>
   <string name="month">月</string>
   <string name="three_months">3個月</string>
   <string name="six_months">6個月</string>
   <string name="twelve_months">12個月</string>
+  <string name="subscribe_prompt_thanks">只要訂閱的話，你就可以享有這些禮遇：</string>
+  <string name="subscription_status">訂閱費用細節</string>
   <string name="byLeader">按照%s</string>
   <string name="challenge_details">挑戰細節</string>
   <string name="challenge_leave_title">離開挑戰</string>
   <string name="challenge_leave_text">你確認你要離開\"%s\"挑戰嗎？</string>
+  <string name="challenge_remove_tasks_title">刪除任務</string>
+  <string name="challenge_remove_tasks_text">你確定要刪除這個任務嗎？</string>
+  <string name="remove_tasks">刪除</string>
+  <string name="keep_tasks">保持</string>
   <string name="my_challenges">我的挑戰</string>
   <string name="public_challenges">公開</string>
   <string name="challenges">挑戰</string>
@@ -409,12 +481,266 @@
   <string name="habit">習慣</string>
   <string name="reward">獎勵</string>
   <string name="todo">待辦事項</string>
+  <string name="official">官方的</string>
+  <string name="participating">参加</string>
   <string name="challenge">挑戰</string>
   <string name="go_to_challenge">查看挑戰</string>
   <string name="not_part_of_a_challenge">你現在沒有加入任何挑戰！</string>
+  <string name="join_a_challenge">加入一個挑戰會將它的任務加入你的任務列表，然後去完成任務戰勝其他habitica玩家贏得成就和寶石吧！</string>
+  <string name="check_the_public_challenge_tab">點擊“公會挑戰”按鈕來尋找其他勇士創建的挑戰吧！也許會有適合你的喲！</string>
   <string name="add_reminder">添加提醒</string>
   <string name="warning">注意</string>
   <string name="open_settings">打開設定</string>
+  <string name="dont_keep_activities_warning">看來您將開發者選項 \"不要保留活動”打開了。 英語: \Don\'t keep Activities\ 打開了。啟用這個選項將會對應用造成不必要的影響。我們建議您將其關閉。</string>
   <string name="inbox">收件匣</string>
+  <string name="FAQ">常見問題</string>
+  <string name="special">特殊的</string>
+  <string name="gem_for_gold_description">由於你捐助了Habitica，你每月可以用一定數量的金幣購買寶石。</string>
+  <string name="limited_count">剩下%d</string>
   <string name="gem_shop">寶石</string>
+  <string name="mystery_item">神秘物品</string>
+  <string name="myster_item_notes">訂閱者在每個月的最後一周都會收到神秘物品。</string>
+  <string name="open">打開</string>
+  <string name="notification_mystery_item">你打開了盒子並發現了%s！</string>
+  <string name="checkInRewardEarned">由於你投入改善你的生活，你得到%1$s。</string>
+  <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">你的下一次獎勵在簽到%1$d後解鎖</string>
+  <string name="pending_approval">等待審批的任務</string>
+  <string name="filters">過濾器</string>
+  <string name="done">完成</string>
+  <string name="group_tasks_edit_description">團隊任務無法被編輯。</string>
+  <string name="group_tasks_edit_title">無法編輯這個任務</string>
+  <string name="groups">團隊</string>
+  <string name="all">所有</string>
+  <string name="none">無</string>
+  <string name="owned">已擁有的</string>
+  <string name="not_owned">未擁有的</string>
+  <string name="new_game">新遊戲</string>
+  <string name="login_btn_fb">Facebook登錄</string>
+  <string name="login_btn_google"> Google登錄</string>
+  <string name="action_back">返回</string>
+  <string name="randomize">隨機</string>
+  <string name="avatar_extras">額外收益</string>
+  <string name="avatar_skin_color">膚色</string>
+  <string name="avatar_hair_color">髮色</string>
+  <string name="avatar_hair_bangs">劉海</string>
+  <string name="avatar_hair_ponytail">馬尾</string>
+  <string name="avatar_glasses">眼鏡</string>
+  <string name="avatar_wheelchair">輪椅</string>
+  <string name="weak">虛弱</string>
+  <string name="strong">強的</string>
+  <string name="gray">灰色</string>
+  <string name="dated">已排程</string>
+  <string name="completed">已完成</string>
+  <string name="setuP_group_other">其他</string>
+  <string name="clear">清除</string>
+  <string name="empty_title_habits">你沒有任何習慣</string>
+  <string name="empty_description_habits">習慣是沒有固定時間表的任務。你可以在一天當中完成它們無數次，或者一次也沒有。</string>
+  <string name="empty_title_dailies">你沒有任何每日任務</string>
+  <string name="empty_description_dailies">每日任務是會定期重複的任務。選擇適合你的時間表！</string>
+  <string name="empty_title_todos">你沒有任何待辦事項</string>
+  <string name="empty_description_todos">待辦事項是只需要完成一次的任務。在待辦事項當中增加檢核清單以提昇待辦事項的價值。</string>
+  <string name="empty_title_rewards">你沒有任何獎勵</string>
+  <string name="reset_walkthrough">重置Justin的教學</string>
+  <string name="read_community_guidelines">請在發表之前閱讀我們的社區守則。</string>
+  <string name="maintenance">維護</string>
+  <string name="reload_content">重整留言</string>
+  <string name="dailyDueDefaultView">默認設置每日任務出現於即將到期頁面</string>
+  <string name="dailyDueDefaultViewDescription">開啟這項設置，每日任務會從即將到期頁面移至全部一覽表</string>
+  <string name="repeat_summary">重複%1$s每%2$s%3$s%4$s</string>
+  <string name="no_billing_gems">你的裝置沒有任何支持的支付方式。如果你要購買寶石，請使用Habitica網站。</string>
+  <string name="no_billing_subscriptions">你的裝置沒有任何支持的支付方式。如果你要訂閱，請使用Habitica網站。</string>
+  <string name="save">儲存</string>
+  <string name="location">位置</string>
+  <string name="gem_reward">獎勵寶石</string>
+  <string name="tasks">任務</string>
+  <string name="create_challenge">建立挑戰</string>
+  <string name="edit_challenge">編輯</string>
+  <string name="challenge_create_error_tavern_one_gem">你最少需要 1 個寶石來建立公眾挑戰</string>
+  <string name="challenge_create_error_enough_gems">你沒有足夠的寶石以創建挑戰。</string>
+  <string name="identify_your_challenge_with_a_tag">給你的挑戰一個簡短的名稱</string>
+  <string name="challenge_create_error_tag">你需要給你的挑戰一個簡短的名字。</string>
+  <string name="challenge_create_error_no_tasks">你必須至少為這個挑戰新增一個任務。</string>
+  <string name="challenge_create_error_title">你需要為挑戰新增標題。</string>
+  <string name="description_optional">描述（選填）</string>
+  <string name="new_challenge_title">新的挑戰名稱</string>
+  <string name="ownership">所有權</string>
+  <string name="inn">旅館</string>
+  <string name="system">系統</string>
+  <string name="start_quest">開始一個新任務</string>
+  <string name="leave_party">離開隊伍</string>
+  <string name="party_description">隊伍描述</string>
+  <string name="abort_confirmation">你確定要放棄此次任務？你和你隊伍中的成員進度將會全數歸零，任務捲軸將會歸還給任務主人。</string>
+  <string name="leave_quest_confirmation">你確定要放棄正在進行中的任務？你的任務進度將會全數歸零。</string>
+  <string name="number_participants">%1$d成員</string>
+  <string name="welcome_back">歡迎回來</string>
+  <string name="yesterdaililes_prompt">你昨天有進行任何以下的每日任務嗎？</string>
+  <string name="start_day">開始我的一天</string>
+  <string name="leave_party_confirmation">你確定你想要離開隊伍？</string>
+  <string name="nextPrizeUnlocksIn" formatted="false">%d次簽到後的獎品</string>
+  <string name="pending">等待中</string>
+  <string name="accepted">接受</string>
+  <string name="declined">拒絕</string>
+  <string name="participants">參與者</string>
+  <string name="invitations">邀請</string>
+  <string name="quest_leader_header" formatted="false">在%s後開始</string>
+  <string name="quest_abort_message">你確定要放棄此次任務？你和你隊伍中的成員進度將會全數歸零，任務捲軸將會歸還給任務主人。</string>
+  <string name="reloading_content">正在重整留言</string>
+  <string name="thousand_abbrev">千</string>
+  <string name="million_abbrev">百萬</string>
+  <string name="billion_abbrev">十億</string>
+  <string name="your_balance">你的餘額：</string>
+  <string name="available_until" formatted="false">可供購買直到%s</string>
+  <string name="gems_left_max" formatted="false">月寶石：剩下%1$d/%2$d</string>
+  <string name="gems_left_nomax" formatted="false">月寶石：剩下%d</string>
+  <string name="health">生命</string>
+  <string name="collect">收集</string>
+  <string name="rage_meter">狂暴值</string>
+  <string name="boss_quest">Boss任務</string>
+  <string name="collection_quest">收集任務</string>
+  <string name="quest_reward_count" formatted="false">%1$sx%2$d</string>
+  <string name="experience_reward" formatted="false">%d經驗值</string>
+  <string name="gold_reward" formatted="false">%d金幣</string>
+  <string name="quest_owner_rewards">任務擁有者獎勵</string>
+  <string name="str_abbrv">力量</string>
+  <string name="per_abbrv">感知</string>
+  <string name="int_abbrv">智力</string>
+  <string name="con_abbrv">體質</string>
+  <string name="reset_account">重置帳戶</string>
+  <string name="reset_account_description">警告！這會重置你帳號的很多地方，這聽起來很讓人沮喪，但有些短時間使用網頁版的人覺得很有用途\n\n你會失去所有的等級、金幣和經驗值。你所有的任務（除了挑戰任務）會被永久刪除，還會失去所有歷程記錄。你會失去所有道具，但你還是可以將其買回，包括你曾擁有的限時道具或訂閱專屬的神秘道具（你必須選擇相同的職業來購買限定職業的道具重生球），你將會保有現有的職業、寵物、馬匹。你應該會想要使用重生球來代替，這是一個相對安全的方案，且會保留你所有的任務和道具。</string>
+  <string name="delete_account">刪除帳號</string>
+  <string name="delete_account_description">你確定嗎？這會永久刪除你的帳號，而且無法復原！如果你想再次使用Habitica，你必須重新註冊一個新帳號。原帳號的寶石將恕不歸還，如果你已下定決心，請在下方輸入密碼確認。</string>
+  <string name="reset_account_confirmation">重置我的帳號</string>
+  <string name="delete_account_confirmation">刪除我的帳號</string>
+  <string name="danger_zone">危險區域</string>
+  <string name="nevermind">別在意</string>
+  <string name="resetting_account">重置帳號</string>
+  <string name="deleting_account">刪除帳號</string>
+  <string name="insufficientGold">你需要完成更多任務才足以負擔這件物品！</string>
+  <string name="insufficientGems">你需要更多寶石來購買這件物品！</string>
+  <string name="purchase_gems">購買寶石</string>
+  <string name="insufficientHourglasses">你需要更多神秘沙漏以購買此物品！</string>
+  <string name="get_hourglasses">獲得神秘沙漏</string>
+  <string name="subscribe_for_hourglasses">訂閱以取得神秘沙漏</string>
+  <string name="timetravelers_closed_description">每三個月獲得一次神秘沙漏，然後用它們解鎖過去和未來的限量版物品，寵物和坐騎！</string>
+  <string name="want_to_subscribe">我想要訂閱</string>
+  <string name="seasonal_closed_description">盛大慶典分別在春分，夏至，秋分，冬至舉行，到時再來看看各種各樣的特殊季節物品吧！</string>
+  <string name="come_back_soon">稍後再來！</string>
+  <string name="level">等級</string>
+  <string name="streak_label">21天連擊</string>
+  <string name="stats">屬性</string>
+  <string name="fix_character_description">如果您遇到Bug或不小心變更到您的角色，您可以在這裏手動更正這些值。</string>
+  <string name="fix_character_values">修改角色數值</string>
+  <string name="saving">儲存中</string>
+  <string name="forgot_password_title">Email寄出密碼重置連結</string>
+  <string name="forgot_password_description">輸入Email以註冊帳號。</string>
+  <string name="forgot_password_confirmation">如果你有Email，重設密碼的信函將會寄至你的信箱。</string>
+  <string name="ok">OK</string>
+  <string name="profile">個人檔案</string>
+  <string name="profile_summary">編輯你的公開檔案</string>
+  <string name="display_name">顯示名稱</string>
+  <string name="photo_url">照片網址</string>
+  <string name="login_name">登入名稱</string>
+  <string name="about">關於</string>
+  <string name="app_settings">APP設定</string>
+  <string name="authentication">認證</string>
+  <string name="authentication_summary">變更你的認證設定</string>
+  <string name="change_password">變更密碼</string>
+  <string name="change_email">變更電子郵件地址</string>
+  <string name="change_login_name">變更登入名稱</string>
+  <string name="change">變更</string>
+  <string name="character_level">角色等級</string>
+  <string name="auto_allocate_points">自動分配點數</string>
+  <string name="stat_guide">屬性概要</string>
+  <string name="character_build">角色屬性</string>
+  <string name="character_build_description">等級100以內的玩家，每次升級可以獲得1點可以自由分配的屬性。在10級解鎖屬性分配之後，可以手動配點；或者使用“自動分配點數”。</string>
+  <string name="strength">力量</string>
+  <string name="strength_description">這個屬性增加玩家完成任務時觸發暴擊的幾率，並且增加通過暴擊獲得的額外獎勵的數量和對Boss造成的傷害。</string>
+  <string name="intelligence">智力</string>
+  <string name="intelligence_description">更高的智力允許玩家從任務中獲得更多經驗值，等級提升更快。魔法值的最大值和再生速度也會上升。</string>
+  <string name="constitution">體質</string>
+  <string name="constitution_description">這個屬性減少玩家從自己的任務中受到的傷害，例如負面習慣或者未完成每日任務，但不能減少Boss造成的傷害。</string>
+  <string name="perception">感知</string>
+  <string name="perception_description">這個屬性增加玩家完成任務時獲得掉落物品的幾率，包括一般掉落和任務品掉落。增加玩家每日的掉落上限，完成任務時的連擊獎勵和獲得的金幣的數量。</string>
+  <string name="buffs">增益效果</string>
+  <string name="allocated">已分配</string>
+  <string name="distribute_evenly">平均分配</string>
+  <string name="distribute_class">根據職業分配</string>
+  <string name="distribute_task">根據任務活動分配</string>
+  <string name="no_points_to_allocate">沒有可以分配的屬性點</string>
+  <string name="points_to_allocate" formatted="false">%d點可以分配</string>
+  <string name="distribute_evenly_help">給每個屬性分配相同數量的點數。</string>
+  <string name="distribute_class_help">給對你的職業重要的屬性分配更多的點數。</string>
+  <string name="distribute_task_help">基於你完成的任務有關的力量、智力、體質和感知種類分配點數。</string>
+  <string name="allocating_points">點數分配中</string>
+  <string name="class_equipment">裝備</string>
+  <string name="equipment_empty">你已經擁有了所有裝備！春分，夏至，秋分，冬至的盛大慶典時會推出更多裝備。</string>
+  <string name="classless">無職業</string>
+  <string name="class_equipment_shop_dialog">這個物品只對特定職業開放。\n你可以在設置改變你的職業。</string>
+  <string name="class_gear_disclaimer">你只能購買當前職業的裝備。</string>
+  <string name="available_stats" formatted="false">%d點</string>
+  <string name="toogle_emojis">切換Emojis</string>
+  <string name="tavern_description">歡迎來到客棧！拉張椅子坐下聊天，或者暫停任務休息一下。</string>
+  <string name="check_into_inn">進入客棧</string>
+  <string name="community_guidelines">社群守則</string>
+  <string name="view_community_guidelines">查看社群守則</string>
+  <string name="guidelines_description">Habitica盡力創造一個對所有年齡和背景的玩家都友好的環境，特別是公共空間，比如說酒館。如果你有疑問，請查看我們的準則。</string>
+  <string name="helpful_links">幫助連結</string>
+  <string name="view_faq">查看常見問題</string>
+  <string name="report_bug">回報Bug</string>
+  <string name="player_tiers">玩家層級</string>
+  <string name="staff_moderators">成員和管理員</string>
+  <string name="tiers_descriptions">聊天中你見到的彩色用戶名代表一個玩家的貢獻等級。等級越高，說明這個玩家對Habitica的貢獻越大，無論是美術，編程，社區，還是別的貢獻！</string>
+  <string name="navigation_drawer_open">開啟導航欄</string>
+  <string name="navigation_drawer_close">關閉導航欄</string>
+  <string name="world_boss">世界Boss</string>
+  <string name="world_boss_art">Boss圖片</string>
+  <string name="boss_art">Boss圖片</string>
+  <string name="world_boss_description">世界Boss說明</string>
+  <string name="rage_strike_count" formatted="false">暴走攻擊：%d/%d</string>
+  <string name="pending_strike_description">攻擊尚未發生！\n世界Boss會在暴走值到達滿值時，毒打店主。持續完成每日任務，來避免此事發生！</string>
+  <string name="pending_strike_title">即將造成的攻擊</string>
+  <string name="strike_description_title">暴走攻擊是什麽？</string>
+  <string name="strike_description_subtitle">Boss可以有3次暴走攻擊。</string>
+  <string name="strike_description_description">這個進度條會在有玩家錯失他們的任務時提升，如果達到上限，DysHeartener會釋放驚天動地的心碎攻擊，攻擊Habitica上隨機的一個店主，所以努力完成你的任務！</string>
+  <string name="pending_strike_subtitle">攻擊尚未發生！</string>
+  <string name="strike_active_title" formatted="false">%s被攻擊了！</string>
+  <string name="strike_active_subtitle" formatted="false">%s心碎了！</string>
+  <string name="strike_active_description" formatted="false">我們心愛的%s在%s時被徹底摧毀了！殘破的%s，快點！完成你的任務來打敗怪物，幫忙重建！</string>
+  <string name="questShop">任務商店</string>
+  <string name="market_owner_long">商人Alex</string>
+  <string name="tavern_owner_long">客棧老板Daniel</string>
+  <string name="stable_owner_long">馴獸師Matt</string>
+  <string name="hide_boss_art">隱藏boss圖像</string>
+  <string name="active_world_boss">活躍的世界boss</string>
+  <string name="no_party_description">和朋友一同完成任務或單獨完成。和怪物戰鬥，創建挑戰，在隊伍中挑起大梁！</string>
+  <string name="no_party_title">在Habitica和隊伍的成員一起玩吧！</string>
+  <string name="join_party_title">想要加入隊伍？</string>
+  <string name="create_party_website">打開網頁來創建隊伍</string>
+  <string name="id_copied">ID已覆制到剪貼板</string>
+  <string name="insufficientSubscriberGems">你已經將這個月可購買的寶石全數掃空，每個月的前三天將會有更多寶石可供購買！謝謝你的熱情訂閱！</string>
+  <string name="insufficientSubscriberGemsTitle">已達到每月寶石上限</string>
+  <string name="chat_message">聊天訊息</string>
+  <string name="world_boss_description_title">什麼是世界Boss？</string>
+  <string name="world_boss_description_description">世界Boss是一個全體玩家一同參與的特殊活動，大家每天同心協力完成任務來打敗強力的怪物！完成任務即可對Boss造成傷害！\n你沒完成任務時，Boss不會攻擊你，但是暴走值會提升，當暴走值達到上限時，將會隨機攻擊一個店主！\n你可以同時挑戰一般任務的Bosses，傷害會同時灌注在兩者身上。\n點擊酒館來確認Boss的攻略進度和暴走攻擊。</string>
+  <string name="world_boss_description_intro">世界Boss是一個全體玩家一同參與的特殊活動，大家每天同心協力完成任務來打敗強力的怪物！</string>
+  <string name="world_boss_description_1">完成任務來對Boss造成傷害</string>
+  <string name="world_boss_description_2">你沒完成任務時，Boss不會攻擊你，但是暴走值會提升，當暴走值達到上限時，將會隨機攻擊一個店主！</string>
+  <string name="world_boss_description_3">你可以同時挑戰一般任務的Bosses，傷害會同時灌注在兩者身上。</string>
+  <string name="world_boss_description_4">點擊酒館來確認Boss的攻略進度和暴走攻擊</string>
+  <string name="world_boss_action_prompt" formatted="false">想要獲得特殊獎勵、從%s的魔爪中拯救Habittica嗎？那就來打敗Boss吧！</string>
+  <string name="world_boss_description_subtitle">%s攻擊了！</string>
+  <string name="questShop_owner_long">探索任務教學</string>
+  <string name="seasonalShop_owner_long">季節性女巫</string>
+  <string name="rage_attack">憤怒攻擊：</string>
+  <string name="report">檢舉</string>
+  <string name="like">讚</string>
+  <string name="reply">回覆</string>
+  <string name="challenge_prize">挑戰獎勵</string>
+  <string name="challenge_categories">挑戰類別</string>
+  <string name="created_challenge">創建挑戰</string>
+  <string name="joined">加入</string>
+  <string name="public_challenge">公眾挑戰</string>
+  <string name="short_name">簡短的名稱</string>
+  <string name="unlock_attribute_points">分配屬性點在10等時解鎖</string>
+  <string name="moderator">管理員</string>
 </resources>
diff --git a/Habitica/res/values-zh/strings.profile.xml b/Habitica/res/values-zh/strings.profile.xml
index deb631548..b5151aa23 100644
--- a/Habitica/res/values-zh/strings.profile.xml
+++ b/Habitica/res/values-zh/strings.profile.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="profile_pets_and_mounts">宠物 &amp; 坐骑</string>
+    <string name="profile_pets_and_mounts">宠物和坐骑</string>
     <string name="profile_pets_found">发现的宠物</string>
     <string name="profile_mounts_tamed">驯养的坐骑</string>
+    <string name="profile_loading_data">正在加载成员数据...</string>
     <string name="profile_send_message_to">给%s发送信息</string>
     <string name="profile_message_sent_to">发送给%s的信息</string>
     <string name="profile_level">级别：</string>
diff --git a/Habitica/res/values-zh/strings.sidebar.xml b/Habitica/res/values-zh/strings.sidebar.xml
index 6e24cdd06..5c69ca9c6 100644
--- a/Habitica/res/values-zh/strings.sidebar.xml
+++ b/Habitica/res/values-zh/strings.sidebar.xml
@@ -3,7 +3,7 @@
   <string name="sidebar.tasks">任务</string>
   <string name="sidebar.skills">技能</string>
   <string name="sidebar.section.social">社交</string>
-  <string name="sidebar.inbox">收件箱</string>
+  <string name="sidebar.inbox">讯息</string>
   <string name="sidebar.tavern">酒馆</string>
   <string name="sidebar.party">队伍</string>
   <string name="sidebar.purchaseGems">宝石;捐赠</string>
diff --git a/Habitica/res/values-zh/strings.tutorial.xml b/Habitica/res/values-zh/strings.tutorial.xml
index ccd660700..9c0779ca0 100644
--- a/Habitica/res/values-zh/strings.tutorial.xml
+++ b/Habitica/res/values-zh/strings.tutorial.xml
@@ -4,6 +4,14 @@
   <string name="tutorial_habits_1">首先是习惯。它们可以是你想养成的积极习惯，也可以是你想停止的消极习惯。</string>
   <string name="tutorial_habits_2">每当你完成一次积极的习惯，点击习惯前的加号，就可以获得经验和金币啦！</string>
   <string name="tutorial_habits_3">如果你一不留神完成了一次消极习惯，点击减号，这会减少你的角色的生命值来帮助你保持责任感。</string>
+  <string name="tutorial_habits_4">试试看！你可以通过底部导航来探索其他类型的任务。</string>
+  <string name="tutorial_dailies_1">将需要定期完成、与时间息息相关的任务写入每日任务。</string>
+  <string name="tutorial_dailies_2">小心——如果你错过一个任务，你的虚拟化身就会彻夜受到伤害。坚持不懈地做完任务会带来巨大回报！</string>
+  <string name="tutorial_todos_1">使用待办事项记录你要做的一次性任务。</string>
+  <string name="tutorial_todos_2">如果你的待办事项有时间限制，那就设置一个到期日。看起来你可以完成一个了——继续吧！</string>
+  <string name="tutorial_rewards_1">用你获得的金币给你的人物购买装备！</string>
+  <string name="tutorial_rewards_2">你也可以根据你的动力源创造现实中的自定义奖励。</string>
+  <string name="tutorial_tasks_complete">暂时就是这么多了。如果你需要再次提醒，去看看FAQ部分。</string>
   <string name="tutorial_equipment">在你购买装备后，在这里显示。你的战斗装备会影响你的属性，你的服装(如果装备)会在你的角色上显示。</string>
   <string name="tutorial_items">通过升级和完成任务获得物品。点击一个物品来使用。</string>
   <string name="tutorial_pets">完成现实任务后，随机掉落宠物蛋和药水。将药水洒在宠物蛋上孵化宠物。</string>
@@ -11,4 +19,5 @@
   <string name="tutorial_party">在这里，你和你的朋友可以互相督促完成目标并通过完成任务组团打小怪兽。</string>
   <string name="tutorial_tavern">欢迎来到酒馆，这里是一个公开的不分年龄的聊天室！这里，可以聊聊心得，问问问题。祝您玩的愉快！</string>
   <string name="tutorial_classes">选择成为战士、法师、医者或者盗贼！每个职业有独特的装备和技能。点击(?)查看更多！</string>
+  <string name="tutorial_stats">按灰色按钮来一次分配你的属性，或者按箭头一次加一点。</string>
 </resources>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 81afbb26e..a1b73529f 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -57,7 +57,7 @@
   <string name="account_details">账号信息</string>
   <string name="LoginActivityName">欢迎</string>
   <string name="string_revive">重生</string>
-  <string name="please_connect">请在使用小部件之前与应用链接</string>
+  <string name="please_connect">请先用应用本体连接服务器后再使用桌面小工具。</string>
   <string name="about.title">关于</string>
   <string name="about.libraries">资源库</string>
   <string name="about.versionhistory">版本历史</string>
@@ -66,11 +66,12 @@
   <string name="about.give_us_feedback">请给我们提交建议！</string>
   <string name="about.bugreport">反馈漏洞</string>
   <string name="about.source_code">源代码</string>
+  <string name="repeatEvery">于每……重复</string>
   <!--Network Errors-->
   <string name="network_error_title">连接错误</string>
   <string name="network_error_no_network_body">您没有连接到互联网。</string>
   <string name="internal_error_api">与服务器通信故障，请稍后再试。</string>
-  <string name="authentication_error_title">鉴定错误</string>
+  <string name="authentication_error_title">认证出现错误</string>
   <string name="authentication_error_body">您的用户名和/或密码错误。</string>
   <string name="login_validation_error_title">认可错误</string>
   <string name="login_validation_error_fieldsmissing">请填写所有内容。</string>
@@ -87,7 +88,7 @@
   <string name="start_date">开始日期</string>
   <string name="positive_habit_form">正面的(+)</string>
   <string name="negative_habit_form">负面的(-)</string>
-  <string name="checklist">检查单</string>
+  <string name="checklist">清单</string>
   <string name="reminders">提醒</string>
   <string name="actions">动作</string>
   <string name="attributes">属性</string>
@@ -98,6 +99,15 @@
   <string name="frequency">频率</string>
   <string name="frequency_weekly">每周中的特定日期</string>
   <string name="frequency_daily">每x日</string>
+  <string name="repeatables_summary_title">概要</string>
+  <string name="repeatables_title">重复</string>
+  <string name="repeatables_on_title">于……重复</string>
+  <string name="repeatables_frequency_daily">每日</string>
+  <string name="repeatables_frequency_weekly">每周</string>
+  <string name="repeatables_frequency_monthly">每月</string>
+  <string name="repeatables_frequency_yearly">每年</string>
+  <string name="repeatables_frequency_day_of_month">日</string>
+  <string name="repeatables_frequency_day_of_week">星期</string>
   <string name="monday">星期一</string>
   <string name="tuesday">星期二</string>
   <string name="wednesday">星期三</string>
@@ -105,26 +115,23 @@
   <string name="friday">星期五</string>
   <string name="saturday">星期六</string>
   <string name="sunday">星期日</string>
-  <string name="levelup_header">你升级了！</string>
-  <string name="levelup_detail">通过完成您现实生活中的目标，你已升至 %1$d 级！</string>
-  <string name="levelup_health">你被完全治愈了！</string>
   <string name="levelup_button">吼啊~！</string>
   <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="filter">筛选</string>
   <string name="profile_image">头像</string>
-  <string name="mana_price_button">%d MP</string>
+  <string name="mana_price_button">%d 魔法值</string>
   <string name="used_skill">你在 %1$s 用了 %2$d 魔法值。</string>
   <string name="used_skill_without_mana">你使用了 %1$s.</string>
   <string name="new_checklist_item">新增清单内容</string>
   <string name="add_checklist_item">添加</string>
-  <string name="reminder_title">记得完成你的每日任务！</string>
+  <string name="reminder_title">记得完成你的任务！</string>
   <string name="skill_progress_title">使用技能</string>
   <string name="coming_soon">即将推出</string>
   <string name="chat_flag_confirmation">你确认要举报这条消息吗？</string>
-  <string name="flag_confirm">旗标消息</string>
+  <string name="flag_confirm">举报消息</string>
   <string name="unlock_lvl_11">11级时解锁</string>
   <string name="no_party_message">你没有加入任何队伍。如想加入队伍，请访问网页版。</string>
   <string name="forgot_pw_btn">忘记密码</string>
@@ -181,9 +188,12 @@
   <string name="dismiss_tutorial">再次提醒我</string>
   <string name="intro_1_subtitle">欢迎来到</string>
   <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">和 %s 玩家一起，用游戏战胜拖延症！你可以创建一个账户，用它来跟踪你生活中的点滴琐事。</string>
   <string name="intro_2_subtitle">游戏进度</string>
   <string name="intro_2_title">生活进度</string>
   <string name="intro_2_description">通过完成现实生活中的任务来解锁游戏内容。得到装备、宠物和更多的奖励来促使你完成你的目标吧！</string>
+  <string name="intro_3_subtitle">对抗怪物</string>
+  <string name="intro_3_title">交些朋友</string>
   <string name="intro_3_description">和朋友们一起为目标努力吧。在生活和战斗中互相支持，共同进步！</string>
   <string name="intro_finish_button">让我们开始吧！</string>
   <string name="previous_button">上一页</string>
@@ -191,8 +201,13 @@
   <string name="skip_button">跳过</string>
   <string name="setup_welcome_description">欢迎来到Habitica，在游戏中打怪升级的同时改善自己的真实生活。完成现实生活中的目标，解锁大量装备、宠物、任务卷轴，更多特色等你探索。</string>
   <string name="setup_welcome_title">欢迎你</string>
+  <string name="avatar_setup_description">首先，你需要创建一个角色。之后可以随时更改。</string>
+  <string name="task_setup_description">太棒了！现在开始设定你的任务，开始赚取经验和金币吧。
+
+首先，你想改善生活中的哪一部分呢？</string>
   <string name="setup_group_work">工作</string>
   <string name="setup_group_exercise">运动</string>
+  <string name="setup_group_health">健康</string>
   <string name="setup_group_school">学校</string>
   <string name="setup_group_teams">团队</string>
   <string name="setup_group_chores">杂务</string>
@@ -226,11 +241,13 @@
   <string name="join">加入</string>
   <string name="leader">会长</string>
   <string name="gems">宝石</string>
+  <string name="copy_as_todo">复制为待办事项</string>
   <string name="send_pm">发送私人信息</string>
   <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>
   <string name="post">公告</string>
@@ -244,7 +261,7 @@
   <string name="outfit_headAccessory">头部配件</string>
   <string name="outfit_eyewear">护目镜</string>
   <string name="outfit_armor">盔甲</string>
-  <string name="outfit_back">返回</string>
+  <string name="outfit_back">背部</string>
   <string name="outfit_body">身体</string>
   <string name="outfit_shield">盾牌</string>
   <string name="outfit_weapon">武器</string>
@@ -252,7 +269,8 @@
   <string name="equipped">装备</string>
   <string name="quest_cancel_message">你是否确定要放弃这个探索任务？这将会失去所有已接受的邀请。探索任务拥有者将拿回探索任务卷轴。</string>
   <string name="quest.invitation">任务邀请</string>
-    <string name="quest.invitation.text">你被邀请参加一个探索任务！</string>
+  <string name="quest_begin_message">当所有玩家加入或拒绝邀请时，任务会自动开始。只有%1$d你的%2$d团队成员加入了这个任务！你是否确定要直接开始这个探索任务？一旦开始，其他队伍成员就不能加入这个探索任务。</string>
+  <string name="quest.invitation.text">你被邀请参加一个探索任务！</string>
   <string name="ago_1day">1天前</string>
   <string name="ago_days">%d天前</string>
   <string name="ago_1Minute">1分钟前</string>
@@ -283,10 +301,12 @@
   <string name="feed">喂食</string>
   <string name="hatch_with">用%s孵化宠物</string>
   <string name="hatched_pet_title">你孵化了一个 %1$s %2$s！</string>
-  <string name="evolved_pet_title">你驯养了%1$s %2$s，去骑几圈吧！</string>
+  <string name="evolved_pet_title">您驯服了%1$s%2$s，我们去骑一圈吧！</string>
   <string name="close">关闭</string>
   <string name="share">分享</string>
   <string name="notification_pet_fed">你喂食了你的%1$s %2$s！</string>
+  <string name="notification_purchase">你购买了%s</string>
+  <string name="notification_purchase_reward">你购买了一个奖励</string>
   <string name="sectionpets">基本宠物</string>
   <string name="sectionpremiumPets">神奇药水宠物</string>
   <string name="sectionquestPets">剧情任务宠物</string>
@@ -296,15 +316,18 @@
   <string name="sectionquestMounts">剧情任务坐骑</string>
   <string name="sectionspecialMounts">稀有坐骑</string>
   <string name="world_quest">世界任务</string>
-  <string name="inn_description">在客栈休息让你未完成的每日任务不会伤害你！(注意：它不能阻止来自任务怪物的伤害。)</string>
-  <string name="empty_items">你没有拥有任何的%s</string>
+  <string name="inn_description">需要休息？进入Daniel的客栈并暂停Habitica的一些困难机制吧。\n\n
+• 未完成的每日任务不会造成伤害\n
+• 任务连击不会断，颜色也不会变\n
+• Boss不会因你未完成每日任务而造成伤害。\n
+• 你对boss的伤害和收集任务物品会保持不变，直到你离开客栈。</string>
+  <string name="empty_items">你没有任何的%s</string>
   <string name="user_level">Lvl %d</string>
   <string name="user_level_with_class">Lvl %1$d %2$s</string>
   <string name="warrior">战士</string>
   <string name="rogue">盗贼</string>
   <string name="mage">法师</string>
   <string name="healer">医师</string>
-  <string name="warrior_description">战士们会有更大的机率触发暴击并在完成任务时随机获得额外的金币，经验和掉率。他们还能对boss造成严重的伤害。如果你希望获得随机性的奖励，或者在boss任务中重创boss，来玩战士吧！</string>
   <string name="mage_description">法师非常善于学习，获得经验值和升级比其他职业快。他们也会获得大量的魔力值来使用一些特殊的法术。如果你喜欢玩得有策略性，或者你强烈地希望升级解锁更多的游戏内容，来玩法师吧！</string>
   <string name="rogue_description">盗贼热衷于积累财富，比其他人获得更多的金币，还擅长寻找随机物品。他们标志性的潜行技能使得他们能够躲避未完成的日常带来的伤害。如果你希望获得更多的奖励，成就，掉落以及徽章，来玩盗贼吧！</string>
   <string name="healer_description">医师们对伤害的抗性很强，也可以保护其他的人。错过的日常任务和坏习惯无法伤害他们太多，而且他们有很多回血的技能。如果你热衷于辅助其他的队友，或者是享受那种从死神手里夺取生命的快感，那就成为一名医师吧！</string>
@@ -313,12 +336,12 @@
   <string name="opt_out_description">不知道选什么职业？想以后再选？没问题 - 你现在可以先做一个没有特殊技能的战士。我们的维基页面上有关于职业系统的介绍，之后随时可以定你的职业。</string>
   <string name="class_confirmation">你确定想要成为%s吗？</string>
   <string name="class_changed">你现在是 %s级了！</string>
-  <string name="class_changed_description">你有新的默认战斗装备，你可以改变下了！</string>
+  <string name="class_changed_description">你有新的默认战斗装备，你可以在装备栏换上它们！</string>
   <string name="choose_class">选择职业</string>
   <string name="dialog_go_back">返回</string>
   <string name="opt_out_confirmation">你确定要退出吗？</string>
   <string name="change_class">更换你的职业</string>
-  <string name="change_class_description">更换你的职业并重置属性点需要3颗宝石。你能通过网页分配属性点</string>
+  <string name="change_class_description">花费3颗宝石改变您的职业并重置属性点。</string>
   <string name="enable_class">开启职业系统</string>
   <string name="changing_class_progress">更换职业</string>
   <string name="by_email">通过电子邮件</string>
@@ -335,19 +358,22 @@
   <string name="share_levelup">我在Habitica中通过改善我现实生活中的习惯到达了%d级！</string>
   <string name="share_hatched">我刚刚在Habitica中通完成我现实生活中的任务孵化了一只宠物%1$s %2$s！</string>
   <string name="share_raised">我刚刚在Habitica中通完成我现实生活中的任务得到了一匹坐骑%1$s %2$s！</string>
-  <string name="open_in_store">在应用商店开放</string>
+  <string name="open_in_store">在应用商店中打开</string>
   <string name="change_class_confirmation">你确定想要转变职业吗？这将花费3颗宝石。</string>
-  <string name="change_class_equipment_warning">提示：你无法再购买%s职业的装备了（已顶级╮(╯_╰)╭）。</string>
+  <string name="change_class_equipment_warning">提示：你无法再购买%s职业的装备了。</string>
   <string name="leaderMessage">从%1$s来的消息</string>
   <string name="leaderName">%1$s的会长</string>
   <string name="confirm">确认</string>
   <string name="market">市场</string>
   <string name="timeTravelers">时光旅行</string>
   <string name="seasonalShop">四季商店</string>
-  <string name="empty_inbox">收件箱里没有消息。您可以在用户的公共聊天窗口中给他发送新消息！</string>
+  <string name="empty_inbox">你没有任何新消息。你可以从玩家们的公开聊天窗口中给他们发送新消息！</string>
   <string name="party_invite">通过邀请朋友来解锁</string>
+  <string name="login_incentive">定期登录Habitica可解锁</string>
+  <string name="create_account">创建帐户可以解锁</string>
   <string name="no_gold">没有足够的金币</string>
   <string name="no_potion">你不需要购买生命药水</string>
+  <string name="successful_purchase">购买%1$s</string>
   <string name="purchase_confirmation_title">确认购买</string>
   <string name="confirm_purchase_text">为 %2$s %3$s 购买 %1$s</string>
   <string name="gem">宝石</string>
@@ -385,6 +411,7 @@
   <string name="all_dailies_completed">你完成了所有没有任务。干得漂亮！</string>
   <string name="widget_habit_button">Habitica完成习惯</string>
   <string name="widget_dailies">Habitica每日任务</string>
+  <string name="widget_todo_list">Habitica 待办事项</string>
   <string name="widget_add_task">Habitica增加任务</string>
   <string name="google_services_missing">没有找到Google play服务。</string>
   <string name="gem.purchase.toolbartitle">购买</string>
@@ -471,7 +498,7 @@
   <string name="warning">警告</string>
   <string name="open_settings">打开设置</string>
   <string name="dont_keep_activities_warning">看来您将开发者选项 \"不要保留活动” 英语: \Don\'t keep Activities\ 打开了。启用这个选项将会对应用造成不必要的影响。我们建议您将其关闭。</string>
-  <string name="inbox">收件箱</string>
+  <string name="inbox">消息</string>
   <string name="FAQ">常见问题</string>
   <string name="special">特殊的</string>
   <string name="gem_for_gold_description">由于你捐助了Habitica，你每月可以用一定数量的金币购买宝石。</string>
@@ -493,9 +520,13 @@
   <string name="none">无</string>
   <string name="owned">已拥有的</string>
   <string name="not_owned">未拥有的</string>
+  <string name="new_game">新
+游戏</string>
   <string name="login_btn_fb">Facebook登录</string>
   <string name="login_btn_google">Google登录</string>
-  <string name="action_back">返回</string>
+  <string name="action_back">背部</string>
+  <string name="randomize">随机</string>
+  <string name="avatar_extras">额外收益</string>
   <string name="avatar_skin_color">肤色</string>
   <string name="avatar_hair_color">发色</string>
   <string name="avatar_hair_bangs">刘海</string>
@@ -504,10 +535,173 @@
   <string name="avatar_wheelchair">轮椅</string>
   <string name="weak">瘦小</string>
   <string name="strong">强壮</string>
+  <string name="gray">灰色</string>
+  <string name="dated">已计划</string>
   <string name="completed">完成</string>
   <string name="setuP_group_other">其他</string>
+  <string name="clear">清空</string>
   <string name="empty_title_habits">你还没有任何习惯</string>
+  <string name="empty_description_habits">习惯是没有硬性时限的任务。你可以一天完成多次，或者完全不做。</string>
   <string name="empty_title_dailies">你还没有任何每日任务</string>
+  <string name="empty_description_dailies">每日任务是规律性的任务。选择适合你的安排！</string>
   <string name="empty_title_todos">你还没有任何待办事项</string>
+  <string name="empty_description_todos">待办事项是只需要完成一次的任务。给待办事项添加清单可以提高它们的价值。</string>
   <string name="empty_title_rewards">你还没有任何奖励项目</string>
+  <string name="reset_walkthrough">重置贾斯汀的介绍</string>
+  <string name="read_community_guidelines">请在发表之前阅读我们的社区守则。</string>
+  <string name="maintenance">维护</string>
+  <string name="reload_content">重新加载内容</string>
+  <string name="dailyDueDefaultView">默认设置每日任务出现于即将到期页面</string>
+  <string name="repeat_summary">每%2$s%3$s%4$s重复%1$s</string>
+  <string name="no_billing_gems">你的设备没有任何支持的支付方式。如果你要购买宝石，请使用Habitica网站。</string>
+  <string name="no_billing_subscriptions">你的设备没有任何支持的支付方式。如果你要订阅，请使用Habitica网站。</string>
+  <string name="save">保存</string>
+  <string name="location">地点</string>
+  <string name="gem_reward">钻石奖励</string>
+  <string name="tasks">任务</string>
+  <string name="create_challenge">创建挑战</string>
+  <string name="edit_challenge">编辑</string>
+  <string name="challenge_create_error_tavern_one_gem">你需要至少一个宝石以便创建一个公开挑战。</string>
+  <string name="challenge_create_error_enough_gems">你没有足够的宝石来创建挑战。</string>
+  <string name="identify_your_challenge_with_a_tag">用一个简短的名字让你的挑战容易识别</string>
+  <string name="challenge_create_error_tag">你需要为你的挑战起个简短的名字</string>
+  <string name="challenge_create_error_no_tasks">您需要至少添加一个任务以便创建挑战。</string>
+  <string name="challenge_create_error_title">缺少标题。</string>
+  <string name="description_optional">描述（可选）</string>
+  <string name="new_challenge_title">新挑战名</string>
+  <string name="ownership">所有者</string>
+  <string name="inn">酒馆</string>
+  <string name="system">系统</string>
+  <string name="start_quest">开始新的探索任务</string>
+  <string name="leave_party">离开队伍</string>
+  <string name="party_description">队伍介绍</string>
+  <string name="abort_confirmation">你是否确定要放弃这个任务吗?如果你放弃，团队中所有人也将被终止任务，并且所有的任务进展都会丢失。而探索任务卷轴将重新返回给探索任务拥有者。</string>
+  <string name="leave_quest_confirmation">你是否确定想放弃这个进行中的探索任务？如此，你所有的任务进度都将丢失。</string>
+  <string name="number_participants">%1$d参与者</string>
+  <string name="welcome_back">欢迎回来</string>
+  <string name="yesterdaililes_prompt">昨天你完成了这些每日任务吗？</string>
+  <string name="start_day">开始我的一天</string>
+  <string name="leave_party_confirmation">是否确定离开队伍？</string>
+  <string name="nextPrizeUnlocksIn" formatted="false">你的下一次奖赏将在签到%d次后解锁</string>
+  <string name="pending">等待中</string>
+  <string name="accepted">已接受</string>
+  <string name="declined">已拒绝</string>
+  <string name="participants">参与者</string>
+  <string name="invitations">邀请</string>
+  <string name="quest_leader_header" formatted="false">由%s发起</string>
+  <string name="quest_abort_message">你是否确定要放弃这个任务吗?如果你放弃，团队中所有人也将被终止任务，并且所有的任务进展都会丢失。而探索任务卷轴将重新返回给探索任务拥有者。</string>
+  <string name="loading">加载中...</string>
+  <string name="reloading_content">重新加载内容</string>
+  <string name="your_balance">你的余额：</string>
+  <string name="gems_left_nomax" formatted="false">每月宝石：还剩%d 颗</string>
+  <string name="health">生命值</string>
+  <string name="collect">收集</string>
+  <string name="rage_meter">狂暴值</string>
+  <string name="boss_quest">打怪任务</string>
+  <string name="collection_quest">收藏任务</string>
+  <string name="experience_reward" formatted="false">%d经验值</string>
+  <string name="gold_reward" formatted="false">%d金币</string>
+  <string name="quest_owner_rewards">探索任务拥有者奖励</string>
+  <string name="str_abbrv">力量</string>
+  <string name="per_abbrv">感知</string>
+  <string name="int_abbrv">智力</string>
+  <string name="con_abbrv">体质</string>
+  <string name="reset_account">重置账户</string>
+  <string name="delete_account">删除账号</string>
+  <string name="reset_account_confirmation">重置我的账号</string>
+  <string name="delete_account_confirmation">删除我的账户</string>
+  <string name="danger_zone">危险区域</string>
+  <string name="nevermind">打扰了</string>
+  <string name="resetting_account">重置账号</string>
+  <string name="deleting_account">删除账号</string>
+  <string name="insufficientGold">你还需要完成更多任务才能购买这个物品！</string>
+  <string name="insufficientGems">你需要更多的宝石来购买这个物品！</string>
+  <string name="purchase_gems">购买宝石</string>
+  <string name="insufficientHourglasses">你需要更多的神秘沙漏来购买这个物品！</string>
+  <string name="get_hourglasses">獲取沙漏</string>
+  <string name="subscribe_for_hourglasses">订阅沙漏</string>
+  <string name="timetravelers_closed_description">每三个月获得一次神秘沙漏，然後用它们解锁过去和未来的限量版物品，宠物和坐骑！</string>
+  <string name="want_to_subscribe">我想订阅</string>
+  <string name="seasonal_closed_description">盛大庆典在二分二至日前后举行，到时再来看看各种各样的特殊季节物品吧！</string>
+  <string name="level">属性等级</string>
+  <string name="streak_label">21天连续登陆</string>
+  <string name="stats">属性</string>
+  <string name="fix_character_description">如果您遇到Bug或不小心變更到您的角色，您可以在這里手動更正這些值。</string>
+  <string name="fix_character_values">修复角色数值</string>
+  <string name="saving">保存</string>
+  <string name="forgot_password_title">邮箱发送密码重置链接</string>
+  <string name="profile">个人信息</string>
+  <string name="profile_summary">完善你的公开资料</string>
+  <string name="display_name">角色名</string>
+  <string name="photo_url">图片链接</string>
+  <string name="login_name">登录名</string>
+  <string name="about">关于</string>
+  <string name="app_settings">应用设置</string>
+  <string name="authentication">认证方式</string>
+  <string name="authentication_summary">修改认证方式。</string>
+  <string name="change_password">修改密码</string>
+  <string name="change_email">修改邮箱</string>
+  <string name="change_login_name">更换你的登录名</string>
+  <string name="change">确定修改</string>
+  <string name="character_level">角色等级</string>
+  <string name="auto_allocate_points">自动分配点数</string>
+  <string name="stat_guide">属性概要</string>
+  <string name="character_build">角色属性</string>
+  <string name="character_build_description">等级100以内的玩家，每次升级可以获得1点可以自由分配的属性。在10级解锁属性分配之後，可以手动配点；或者使用“自动分配点数”。</string>
+  <string name="strength">力量</string>
+  <string name="strength_description">这个属性增加玩家完成任务时触发暴击的几率，并且增加通过暴击获得的额外奖励的数量和对Boss造成的伤害。</string>
+  <string name="intelligence">智力</string>
+  <string name="intelligence_description">更高的智力允许玩家从任务中获得更多经验值，等级提升更快。魔法值的最大值和再生速度也会上升。</string>
+  <string name="constitution">体质</string>
+  <string name="constitution_description">这个属性减少玩家从自己的任务中受到的伤害，例如负面习惯或者未完成每日任务，但不能减少Boss造成的伤害。</string>
+  <string name="perception">感知</string>
+  <string name="perception_description">这个属性增加玩家完成任务时获得掉落物品的几率，包括一般掉落和任务品掉落。增加玩家每日的掉落上限，完成任务时的连击奖励和获得的金币的数量。</string>
+  <string name="buffs">增益技能</string>
+  <string name="allocated">已分配的属性</string>
+  <string name="distribute_evenly">平均分配</string>
+  <string name="distribute_class">根据职业分配</string>
+  <string name="distribute_task">根据任务活动分配</string>
+  <string name="no_points_to_allocate">没有可以分配的属性点</string>
+  <string name="points_to_allocate" formatted="false">%d点可以分配</string>
+  <string name="distribute_evenly_help">给每项属性分配等量的属性点。</string>
+  <string name="distribute_class_help">把更多属性点分配给你的职业最需要的属性。</string>
+  <string name="allocating_points">分配属性点</string>
+  <string name="class_equipment">装备</string>
+  <string name="equipment_empty">你已经拥有了所有装备！春分，夏至，秋分，冬至的盛大庆典时会推出更多装备。</string>
+  <string name="classless">无职业</string>
+  <string name="class_equipment_shop_dialog">这个物品只对特定职业开放。\n你可以在设置改变你的职业。</string>
+  <string name="class_gear_disclaimer">你只能购买当前职业的装备。</string>
+  <string name="tavern_description">欢迎来到客栈！ 拉张凳子坐下聊天，或者暂停任务休息一下。</string>
+  <string name="check_into_inn">入住客栈</string>
+  <string name="community_guidelines">社区守则</string>
+  <string name="view_community_guidelines">查看社区守则</string>
+  <string name="guidelines_description">Habitica尽力创造一个对所有年龄和背景的玩家都友好的环境，特别是公共空间，比如说酒馆。如果你有疑问，请查看我们的准则。</string>
+  <string name="helpful_links">常用链接</string>
+  <string name="view_faq">阅读FAQ</string>
+  <string name="report_bug">报告漏洞</string>
+  <string name="player_tiers">玩家头衔</string>
+  <string name="tiers_descriptions">聊天中你见到的彩色用户名代表一个玩家的贡献等级。等级越高，说明这个玩家对Habitica的贡献越大，无论是美术，编程，社区，还是别的贡献！</string>
+  <string name="world_boss">世界Boss</string>
+  <string name="world_boss_art">boss图像</string>
+  <string name="boss_art">boss图像</string>
+  <string name="world_boss_description">世界boss简介</string>
+  <string name="rage_strike_count" formatted="false">暴走：%d/%d</string>
+  <string name="strike_description_title">There are 3 potential Rage Strikes</string>
+  <string name="strike_description_subtitle">Boss可以有3次暴走。</string>
+  <string name="strike_active_title" formatted="false">%s被攻击了！</string>
+  <string name="market_owner_long">商人Alex</string>
+  <string name="tavern_owner_long">客栈老板Daniel</string>
+  <string name="stable_owner_long">驯兽师Matt</string>
+  <string name="hide_boss_art">隐藏boss图像</string>
+  <string name="active_world_boss">活跃的世界boss</string>
+  <string name="join_party_title">想要加入队伍？</string>
+  <string name="create_party_website">打开网页来创建队伍</string>
+  <string name="id_copied">ID已复制到剪贴板</string>
+  <string name="insufficientSubscriberGemsTitle">已达到每月宝石上限</string>
+  <string name="chat_message">聊天信息</string>
+  <string name="world_boss_description_title">世界boss是什么？</string>
+  <string name="world_boss_description_1">完成任务就会伤害boss</string>
+  <string name="questShop_owner_long">探索任务向导Ian</string>
+  <string name="rage_attack">愤怒攻击:</string>
+  <string name="two_handed">双手握持</string>
 </resources>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 93f1d1ed3..371e0c645 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -137,9 +137,8 @@
     <string name="saturday">Saturday</string>
     <string name="sunday">Sunday</string>
 
-    <string name="levelup_header">You gained a level!</string>
-    <string name="levelup_detail">By accomplishing your real-life goals, you\'ve grown to Level %1$d!</string>
-    <string name="levelup_health">You have been fully healed!</string>
+    <string name="levelup_header">You Reached Level %1$d!</string>
+    <string name="levelup_detail">By accomplishing your real life goals, you leveled up and are now fully healed!</string>
     <string name="levelup_button">Huzzah!</string>
 
     <string name="faint_subtitle">Don\'t despair!</string>
@@ -837,4 +836,8 @@
     <string name="setup_task_join_habitica_notes">You can either complete this To-Do, edit it, or remove it.</string>
     <string name="setup_task_reward">Reward yourself</string>
     <string name="setup_task_reward_notes">Watch TV, play a game, eat a treat, it’s up to you!</string>
+    <string name="equipment_str">STR:</string>
+    <string name="equipment_con">CON:</string>
+    <string name="equipment_int">INT:</string>
+    <string name="equipment_per">PER:</string>
 </resources>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
index 602a3489f..c80872dd5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -112,7 +112,7 @@ abstract class HabiticaBaseApplication : MultiDexApplication() {
                 .build()
         Instabug.setWelcomeMessageState(WelcomeMessage.State.DISABLED)
         Instabug.setUserAttribute("", lazyApiHelper.hostConfig.user)
-        BugReporting.setShakingThreshold(450)
+        BugReporting.setShakingThreshold(900)
         BugReporting.setPromptOptionsEnabled(PromptOption.BUG, PromptOption.FEEDBACK)
     }
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
index d26bc63ae..945b1e2a2 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/LevelUpUseCase.java
@@ -53,8 +53,6 @@ public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Stats>
 
             View customView = requestValues.activity.getLayoutInflater().inflate(R.layout.dialog_levelup, null);
             if (customView != null) {
-                TextView detailView = customView.findViewById(R.id.levelupDetail);
-                detailView.setText(requestValues.activity.getString(R.string.levelup_detail, requestValues.newLevel));
                 AvatarView dialogAvatarView = customView.findViewById(R.id.avatarView);
                 dialogAvatarView.setAvatar(requestValues.user);
             }
@@ -66,7 +64,7 @@ public class LevelUpUseCase extends UseCase<LevelUpUseCase.RequestValues, Stats>
             avatarView.onAvatarImageReady(avatarImage -> event.shareImage = avatarImage);
 
             AlertDialog alert = new AlertDialog.Builder(requestValues.activity)
-                    .setTitle(R.string.levelup_header)
+                    .setTitle(requestValues.activity.getString(R.string.levelup_header, requestValues.newLevel))
                     .setView(customView)
                     .setPositiveButton(R.string.levelup_button, (dialog, which) -> checkClassSelectionUseCase.observable(new CheckClassSelectionUseCase.RequestValues(requestValues.user, null, requestValues.activity))
                             .subscribe(aVoid -> {}, RxErrorHandler.handleEmptyError()))
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
index 282ff3ecf..97b8e4ee9 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.kt
@@ -1,5 +1,6 @@
 package com.habitrpg.android.habitica.ui.adapter.social
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.res.Resources
 import android.graphics.drawable.BitmapDrawable
@@ -164,7 +165,8 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
                 userLabel.tier = user?.contributor?.level ?: 0
                 userLabel.username = name
                 if (user?.username != null && releasedUsernames) {
-                    sublineTextView.text = "@${user?.username} ∙ ${msg.getAgoString(res)}"
+                    @SuppressLint("SetTextI18n")
+                    sublineTextView.text = "${user?.formattedUsername} ∙ ${msg.getAgoString(res)}"
                 } else {
                     sublineTextView.text = msg.getAgoString(res)
                 }
@@ -172,6 +174,7 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
                 userLabel.tier = msg.contributor?.level ?: 0
                 userLabel.username = msg.user
                 if (msg.username != null && releasedUsernames) {
+                    @SuppressLint("SetTextI18n")
                     sublineTextView.text = "${msg.formattedUsername} ∙ ${msg.getAgoString(res)}"
                 } else {
                     sublineTextView.text = msg.getAgoString(res)
@@ -223,7 +226,7 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
                         }, { it.printStackTrace() })
             }
 
-            val username = user?.username
+            val username = user?.formattedUsername
             if ((name != null && msg.text?.contains(name) == true) || (username != null && msg.text?.contains(username) == true)) {
                 messageWrapper.backgroundCompat = ContextCompat.getDrawable(context, R.drawable.layout_rounded_bg_brand_700)
             } else {
@@ -247,6 +250,7 @@ class ChatRecyclerViewAdapter(data: OrderedRealmCollection<ChatMessage>?, autoUp
 
         private fun setLikeProperties() {
             likeBackground.visibility = if (isTavern) View.VISIBLE else View.INVISIBLE
+            @SuppressLint("SetTextI18n")
             tvLikes.text = "+" + chatMessage?.likeCount
 
             val backgroundColorRes: Int
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
index 3a384c9e9..e510289be 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.kt
@@ -26,7 +26,7 @@ object MarkdownParser {
 
     private val processor = AndDown()
 
-    private val regex = Pattern.compile("(?!\\b)@[\\w-]+")
+    private val regex = Pattern.compile("\\B@[-\\w]+")
 
     /**
      * Parses formatted markdown and returns it as styled CharSequence
diff --git a/fastlane/changelog.txt b/fastlane/changelog.txt
index de41fddf9..60aa2fb44 100644
--- a/fastlane/changelog.txt
+++ b/fastlane/changelog.txt
@@ -2,5 +2,7 @@ This update fixes various bugs and adds support for an upcoming feature.
 
 This update also reworks a lot of the internals for the party view, to make it more reliable. Please report any new oddities on that screen.
 
+Daily reminders have also been reworked and should now work better and not notify every day.
+
 NEW:
-- Add Cat support (Can you find it?)
+- Add Cat support (Can you find it?) 
diff --git a/translations/store_strings-hr_HR.xml b/translations/store_strings-hr_HR.xml
index f91e4dda2..c505f9963 100644
--- a/translations/store_strings-hr_HR.xml
+++ b/translations/store_strings-hr_HR.xml
@@ -1,4 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="store_short_description">Pretvorite život u igru da ostanete motivirani i organizirani!</string>
+  <string name="store_title">Razigraj svoje zadatke</string>
+  <string name="store_short_description">Pretvori život u igru da ostanše motiviran/a i organiziran/a!</string>
+  <string name="store_description">Pretvori život u igru da ostanše motiviran/a i organiziran/a! Habitica ti jednostavno omogućuje da se zabaviš i istovremeno ostvaruješ svoje ciljeve.
+Unesi svoje Navike, svoje Svakodnevne ciljeve i svoj popis Zadataka i potom stvori svoj osobni avatar. Križaj zadatke kako bi unaprijedio/la svog avatara i otključao/la mogućnosti poput oklopa, ljubimaca, vještina, pa čak i pustolovina! Bori se protiv čudovišta s prijateljima kako biste ostali odgovorni i troši svoje zlatnike na nagrade u igri poput opreme, ili pak na prilagođene nagrade poput gledanja epizode svoje omiljene TV serije. Fleksibilna, društvena i zabavna, Habitica je savršen način da se motiviraš za postizanje bilo čega.
+Ako imaš ikakva pitanja, slobodno nam se javi na mobile@habitica.com! I ako uživaš u našoj aplikaciji, stvarno bi znam značilo ako bi nam ostavio/la ocjenu.
+</string>
 </resources>
diff --git a/translations/store_strings-id.xml b/translations/store_strings-id.xml
index 5ab730e4e..3f1c6c258 100644
--- a/translations/store_strings-id.xml
+++ b/translations/store_strings-id.xml
@@ -1,4 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="store_title">Buat Tugasmu Menjadi Game</string>
   <string name="store_short_description">Perlakukan hidupmu seperti permainan untuk tetap termotivasi dan terorganisir!</string>
+  <string name="store_description">Perlakukan hidupmu seperti permainan agar tetap termotivasi dan terorganisir! Habitica membantumu untuk bersenang-senang dalam mencapai tujuan.
+Masukkan Kebiasaan, sasaran Harian dan To-Do kamu, lalu buat avatarmu sendiri. Centang tugas-tugas untuk naik level dan buka fitur-fitur seperti baju, peliharaan, kemampuan, dan bahkan misi! Bertarung dengan monster bersama teman-teman supaya saling menyemangati, dan gunakan koin emas yang kamu punya untuk membeli hadiah di dalam game, seperti perlengkapan perang, atau hadiah yang kamu buat sendiri, misalnya menonton satu episode siaran TV kesukaanmu. Fleksibel, sosial, menyenangkan, Habitica sempurna untuk memotivasimu mencapai apapun.
+Kalau kamu punya pertanyaan maupun saran, silakan kirim ke mobile@habitica.com! Dan jika kamu menyukai aplikasi kami, kami akan sangat menghargai ulasanmu.
+</string>
 </resources>
diff --git a/translations/store_strings-it.xml b/translations/store_strings-it.xml
index f93cc6086..520543eb4 100644
--- a/translations/store_strings-it.xml
+++ b/translations/store_strings-it.xml
@@ -2,9 +2,9 @@
 <resources>
   <string name="store_title">Trasforma le tue attività in un gioco</string>
   <string name="store_short_description">Trasforma la tua vita in un gioco di ruolo per affrontarla motivato ed organizzato.</string>
-  <string name="store_description">Trasforma la tua vita in un gioco di ruolo per essere organizzato e motivato! Con Habitica raggiungere i propri obiettivi non è mai stato così divertente.
+  <string name="store_description">Considera la tua vita come un gioco di ruolo per rimanere motivato e organizzato! Habitica la semplifica e ti fa divertire mentre raggiungi i tuoi obiettivi.
 
-Imposta le tue Abitudini, i tuoi obiettivi giornalieri (Daily) e la tua lista di cose da fare (To-Do), poi crea il tuo avatar personalizzato. Completa le attività per far salire di livello il tuo avatar e sbloccare funzionalità come armature, animali, abilità e persino missioni! Combatti i mostri con i tuoi amici per aiutarvi a vicenda ad essere responsabili, e usa il tuo oro per ricompense in-game come pezzi di equipaggiamento, o ricompense personalizzate, ad esempio guardare un episodio della tua serie TV preferita. Flessibile, sociale e soprattutto divertente, Habitica è il modo perfetto per motivarti a fare qualsiasi cosa.
+Inserisci le tue Abitudini, i tuoi obiettivi giornalieri (Daily) e la tua lista di cose da fare (To-Do), poi crea il tuo avatar personalizzato. Completa le attività per far salire di livello il tuo avatar e sbloccare funzionalità come armature, animali, abilità e persino missioni! Combatti i mostri con i tuoi amici per aiutarvi a vicenda ad essere responsabili, e usa il tuo oro per ricompense in-game come pezzi di equipaggiamento, o ricompense personalizzate, ad esempio guardare un episodio della tua serie TV preferita. Flessibile, sociale e soprattutto divertente, Habitica è il modo perfetto per motivarti a fare qualsiasi cosa.
 
 Se avete una qualsiasi domanda o dei suggerimenti, sentitevi liberi di scrivere a mobile@habitica.com! E se vi piace la nostra app, saremmo davvero felici se ci lasciaste una recensione.
 </string>
diff --git a/translations/store_strings-pl.xml b/translations/store_strings-pl.xml
index 3aaff9ae7..5f6aeaa32 100644
--- a/translations/store_strings-pl.xml
+++ b/translations/store_strings-pl.xml
@@ -1,5 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="store_title">Zrób grę ze swoich zadań</string>
-  <string name="store_short_description">Traktuj życie jak grę, będziesz zmotywowany i zorganizowany!</string>
+  <string name="store_title">Zmień swoje cele i zadania w grę</string>
+  <string name="store_short_description">Traktuj swoje życie jak grę aby być zmotywowanym i zorganizowanym!</string>
+  <string name="store_description">Traktuj swoje życie jak grę aby być zmotywowanym i zorganizowanym! Dzięki Habitice osiąganie celów jest fajne. 
+Wprowadź swoje Nawyki, Codzienne oraz Do-zrobienia, a potem stwórz swojego awatara. Odhaczaj zadania by zwiększać poziom swojego awatara i odblokowywać takie opcje jak zbroja, chowańce, umiejętności a nawet misje! Zwalczaj potwory z przyjaciółmi by motywować siebie nawzajem i wydawaj złoto na wbudowane nagrody takie jak zbroja lub stworzone przez siebie, takie jak obejrzenie odcinka ulubionego serialu. Elastyczna, społecznościowa i zabawna - Habitica jest idealnym sposobem na zmotywowanie siebie do osiągnięcia celów.
+W razie jakichkolwiek pytań pisz śmiało na mobile@habitica.com. A jeśli podoba Ci się nasza aplikacja, bylibyśmy naprawdę wdzięczni za opinię.
+</string>
 </resources>
diff --git a/translations/store_strings-pt_PT.xml b/translations/store_strings-pt_PT.xml
index 9e3bff208..abb2652de 100644
--- a/translations/store_strings-pt_PT.xml
+++ b/translations/store_strings-pt_PT.xml
@@ -1,4 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="store_title">Gamifique as Suas Tarefas</string>
   <string name="store_short_description">Trate a sua vida como um jogo para manter-se motivado e organizado!</string>
 </resources>
diff --git a/translations/store_strings-ru.xml b/translations/store_strings-ru.xml
index caa24d590..a3abcc7bf 100644
--- a/translations/store_strings-ru.xml
+++ b/translations/store_strings-ru.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="store_title">Игронезируйте ваши задачи</string>
+  <string name="store_title">Игрофицируйте свои задачи</string>
   <string name="store_short_description">Живите играючи и развивайте мотивацию и организованность!</string>
   <string name="store_description">Относитесь к своей жизни, как к игре, чтобы оставаться мотивированным и организованным! Habitica позволяет легко развлекаться при достижении целей.
 Введите свои привычки, свои ежедневные цели и список дел, а затем создайте собственный аватар. Выполняйте задачи, чтобы повысить уровень вашего аватара и разблокировать такие функции, как снаряжение, питомцы, навыки и даже квесты! Сражайтесь против монстрами с друзьями, чтобы поддержать друг друга , и использовать свое золото в игре в качестве поощрения, например, на экипировку или специальные награды, или даже на просмотр эпизода вашего любимого телешоу. Гибкая, социальная и веселая, Habitica - это идеальный способ мотивировать себя к чему-либо ».
diff --git a/translations/store_strings-tr.xml b/translations/store_strings-tr.xml
index 5d2810b2a..b211dd101 100644
--- a/translations/store_strings-tr.xml
+++ b/translations/store_strings-tr.xml
@@ -2,8 +2,8 @@
 <resources>
   <string name="store_title">İşlerini Oyunlaştır</string>
   <string name="store_short_description">Hayatını motive ve düzenli kalmak için oyun gibi düzenle!</string>
-  <string name="store_description">Hayatınızı motive etmek ve organize olmak için bir oyun gibi davranın! Habitica, amaçları gerçekleştirirken eğlenmeyi kolaylaştırır. 
-Alışkanlıklarınızı, Günlük hedeflerinizi ve Yapılacaklar listenizi girin ve özel bir avatar oluşturun. Avatarınızı özelleştirmek için zırh, evcil hayvan, beceri ve hatta görevler gibi özellikleri açmak için görevleri kontrol edin! Canavarları birbirleriyle hesaplı tutmak için arkadaşlarınızla savaşın ve altınınızı teçhizat gibi oyun içi ödüller veya en sevdiğiniz TV şovunun bir bölümünü izlemek gibi özel ödüller için kullanın. Esnek, sosyal ve eğlenceli olan Habitica, kendinizi herhangi bir şeyi başarmak için motive etmenin mükemmel bir yoldur.
+  <string name="store_description">Motive ve organize olmak için hayatınızı oyunlaştırın! Habitica, amaçlarınızı ve görevlerinizi gerçekleştirirken eğlenmenizi sağlar. 
+Alışkanlıklarınızı, günlük hedeflerinizi ve yapılacaklar listenizi girin, kendi karakterinizi oluşturun. Karakterinizi özelleştirmek için zırh, evcil hayvan, beceri ve hatta görevler gibi özellikleri açmak için hedeflerinizi tamamlayın! Arkadaşlarınızla beraber canavarlarla savaşarak sorumluluklarınızı yerine getirin, altınlarınızı ekipman gibi oyun içi ödüller veya en sevdiğiniz TV şovunun bir bölümünü izlemek gibi özel ödüller için harcayın. Rahat, sosyal ve eğlenceli olan Habitica, kendinizi herhangi bir şeyi başarmak için motive etmenin mükemmel bir yolu.
 Herhangi bir sorunuz varsa, mobile@habitica.com adresine geri bildirim göndermekten çekinmeyin! Ve uygulamanızdan hoşlanıyorsanız, bize bir inceleme bırakırsanız memnun oluruz.
 </string>
 </resources>
diff --git a/translations/store_strings-zh-Hans.xml b/translations/store_strings-zh-Hans.xml
index a30094a87..231286770 100644
--- a/translations/store_strings-zh-Hans.xml
+++ b/translations/store_strings-zh-Hans.xml
@@ -1,4 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="store_short_description">把生活当游戏玩，保持积极与条理性！</string>
+  <string name="store_title">将您的“苦差事”游戏化</string>
+  <string name="store_short_description">让您的生活就像游戏一样有趣。保持您对生活的积极性与条理性！</string>
+  <string name="store_description">让您的生活像游戏一样有趣。保持您对生活的积极性与条理性！Habitica帮助您轻松享受达成目标的乐趣。
+输入您的习惯、每日目标与任务清单，然后创建出自己的个性化身。通过完成任务来升级自己，同时解锁盔甲、宠物、技能，甚至任务卷轴！您还可以和朋友们并肩作战，打败怪物，增强彼此的责任心！作为奖励，您可以使用金币购买游戏内奖励商品，比如装备；或者亲自设计一个奖励，比如看一集最喜欢的电视节目。Habitica兼具灵活性，社交性，趣味性，您会在它的激励下完成所有您想做的事情。
+如果您有任何疑问，请尽管反馈至mobile@habitica.com !如果您喜欢我们的应用，我们同样真诚地希望您留下您宝贵的评论。
+</string>
 </resources>
diff --git a/translations/store_strings-zh-rTW.xml b/translations/store_strings-zh-rTW.xml
index f8c383932..3baa850a0 100644
--- a/translations/store_strings-zh-rTW.xml
+++ b/translations/store_strings-zh-rTW.xml
@@ -1,4 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="store_title">遊戲化你的任務</string>
   <string name="store_short_description">生活即遊戲，保持動力，讓生活井井有條！</string>
+  <string name="store_description">將你的生活像遊戲一樣規劃！在完成目標的同時，Habitica可以讓你很輕松地獲得樂趣。
+輸入你的習慣，日常目標，和你的待辦事項，然後創建一個角色。完成任務去升級你的角色和解鎖物品，例如護甲，寵物，技能，甚至是探索任務。 和朋友一起相互監督去對抗怪物，使用你的金幣購買裝備，你也可以自定義獎勵（看一集你喜歡的電視劇）。Habitica是一個完美的途徑去激勵自己完成任何事情。
+如果你有任何問題，請發送意見到 mobile@habitica.com! 如果你喜歡我們的App，我們會非常感謝你能給我們一個贊助。
+</string>
 </resources>
diff --git a/translations/store_strings-zh.xml b/translations/store_strings-zh.xml
index 1ec5106e2..42f7e6d8f 100644
--- a/translations/store_strings-zh.xml
+++ b/translations/store_strings-zh.xml
@@ -2,6 +2,10 @@
 <resources>
   <string name="store_title">游戏化你的任务</string>
   <string name="store_short_description">像对待游戏一样对待生活，让它保持动力，并且井井有条！</string>
-  <string name="store_description">输入你的习惯，日常目标，和你的待办事项，然后创建一个玩家角色形象。完成任务去升级你的角色和解锁你的形象，例如护甲，宠物，技能，甚至是探索任务。 和朋友一起相互监督去对抗怪物，还有把你的金币用在游戏里的奖品，像装备或者玩家奖励（例如看一集你喜欢的电视剧）。灵活的，社会化并且有趣，Habitica是一个完美的途径去调动你自己去完成任何事。
-如果你有任何问题，请随意发送反馈到 mobile@habitica.com! 如果你喜欢我们的App，我们会非常感谢你能给我们一个赞助。</string>
+  <string name="store_description">像对待游戏一样对待生活，让它保持动力，并且井井有条！Habitica将您努力追求实现目标的过程变得轻松有趣！
+
+输入您的习惯，每日任务和待办事项，然后创建一个属于自己的角色形象。完成您的工作来升级角色并且解锁特殊物品，例如装备，宠物，技能甚至探索任务！和您的朋友一起对抗怪兽来督促彼此；使用金币来购买游戏内的奖励，例如装备或者自定奖励，比如看一集您喜欢的电视剧等等。灵活，互动且充满乐趣，Habitica是鼓励自己完成任何事情的方式！
+
+如果您在使用过程中遇到任何问题，或有任何反馈或建议，请不要犹豫并立即联系我们！我们的电子邮件是：mobile@habitica.com。您的满意打分与评价将是我们前进的动力！
+</string>
 </resources>