From 216b057fc46f99a92a7e56d58180eea3beb59400 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Sat, 24 Aug 2019 12:33:14 +0200
Subject: [PATCH] Fix various linting errors

---
 .../res/anim/button_state_list_animator.xml   |  52 ---
 Habitica/res/anim/clockwise_rotate.xml        |   8 -
 Habitica/res/anim/fab_slide_in.xml            |   7 -
 Habitica/res/anim/fab_slide_out.xml           |   7 -
 Habitica/res/anim/rotate_45_degrees.xml       |   7 -
 Habitica/res/drawable/checklist_checked.xml   |   2 +-
 Habitica/res/drawable/daily_checked.xml       |   2 +-
 Habitica/res/drawable/todo_checked.xml        |   2 +-
 Habitica/res/layout/achievement_list_item.xml |   4 +-
 Habitica/res/layout/activity_about.xml        |   1 -
 .../res/layout/activity_challenge_detail.xml  | 194 ---------
 .../res/layout/activity_class_selection.xml   |   4 +-
 .../res/layout/activity_create_challenge.xml  |   6 +-
 Habitica/res/layout/activity_fixcharacter.xml |   1 -
 Habitica/res/layout/activity_full_profile.xml |   6 +-
 Habitica/res/layout/activity_gem_purchase.xml |   6 +-
 Habitica/res/layout/activity_gift_iap.xml     |   3 +-
 Habitica/res/layout/activity_intro.xml        |   4 -
 Habitica/res/layout/activity_login.xml        |   7 +-
 Habitica/res/layout/activity_main.xml         |   1 -
 .../res/layout/activity_notifications.xml     |   3 +-
 Habitica/res/layout/activity_party_invite.xml |   3 +-
 .../res/layout/activity_report_message.xml    |   4 +-
 Habitica/res/layout/avatar_with_bars.xml      |   6 +-
 Habitica/res/layout/challenge_item.xml        |   2 -
 Habitica/res/layout/checklist_item.xml        |  28 --
 Habitica/res/layout/checklist_item_row.xml    |   3 +-
 .../res/layout/custom_date_time_dialogue.xml  |  28 --
 .../res/layout/custom_list_preference_row.xml |  26 --
 Habitica/res/layout/daily_item_card.xml       |   1 -
 .../res/layout/dialog_achievement_details.xml |   7 +-
 .../res/layout/dialog_challenge_detail.xml    | 213 ---------
 .../dialog_challenge_filter_group_item.xml    |   2 +-
 Habitica/res/layout/dialog_faint.xml          |   4 +-
 Habitica/res/layout/dialog_levelup.xml        |   1 -
 .../layout/dialog_purchase_content_gear.xml   |  16 +-
 .../layout/dialog_purchase_content_quest.xml  |   1 -
 .../res/layout/dialog_purchase_shopitem.xml   |   6 -
 Habitica/res/layout/dialog_task_filter.xml    |   6 +-
 Habitica/res/layout/drawer_main.xml           |  33 +-
 Habitica/res/layout/fixvalues_edittext.xml    |   7 +-
 Habitica/res/layout/fragment_about.xml        |  24 +-
 .../res/layout/fragment_avatar_overview.xml   |   1 -
 .../res/layout/fragment_challenge_detail.xml  |   1 -
 .../res/layout/fragment_fading_viewpager.xml  |   5 -
 Habitica/res/layout/fragment_gem_purchase.xml |   6 +-
 Habitica/res/layout/fragment_guild_detail.xml |   6 +-
 Habitica/res/layout/fragment_party_detail.xml |   8 +-
 Habitica/res/layout/fragment_recyclerview.xml |   1 -
 .../layout/fragment_refresh_recyclerview.xml  |   1 -
 Habitica/res/layout/fragment_shop.xml         |  38 --
 Habitica/res/layout/fragment_subscription.xml |   2 -
 .../res/layout/fragment_tavern_detail.xml     |   1 -
 Habitica/res/layout/fragment_welcome.xml      |   2 +-
 Habitica/res/layout/item_inbox_overview.xml   |   3 +-
 Habitica/res/layout/no_notifications.xml      |   4 +-
 .../res/layout/normal_list_preference_row.xml |  39 --
 .../layout/notification_item_actionable.xml   |   1 -
 Habitica/res/layout/notifications_header.xml  |   2 +-
 Habitica/res/layout/party_member_quest.xml    |  31 --
 .../layout/preference_child_summary_error.xml |   3 +-
 .../res/layout/profile_achievement_item.xml   |   3 +-
 Habitica/res/layout/qr_code.xml               |  60 ---
 Habitica/res/layout/qr_dialogue.xml           |  19 -
 Habitica/res/layout/refresh_actionview.xml    |   6 -
 Habitica/res/layout/reminder_item.xml         |  24 -
 Habitica/res/layout/reward_item_card.xml      |   3 -
 Habitica/res/layout/row_checklist.xml         |  10 -
 Habitica/res/layout/row_number_picker.xml     |  27 --
 Habitica/res/layout/shop_header.xml           |   7 +-
 Habitica/res/layout/simple_widget.xml         |  90 ----
 Habitica/res/layout/skill_task_item_card.xml  |   1 -
 .../res/layout/task_form_task_scheduling.xml  |   9 +-
 Habitica/res/layout/tasks_duedate.xml         |  36 --
 Habitica/res/layout/tasks_startdate.xml       |  23 -
 .../res/layout/tavern_chat_new_entry_item.xml |   3 +-
 Habitica/res/layout/value_bar.xml             |   3 +-
 .../res/layout/view_collapsible_section.xml   |   4 +-
 Habitica/res/layout/widget_avatar_stats.xml   |   6 -
 .../layout/world_boss_description_view.xml    |   8 +-
 Habitica/res/menu/challenge_admin.xml         |   8 -
 Habitica/res/menu/chat_message.xml            |  27 --
 Habitica/res/menu/inbox.xml                   |  10 -
 Habitica/res/menu/login.xml                   |  11 -
 Habitica/res/menu/main_menu_tasks.xml         |  18 -
 Habitica/res/values-bg/strings.profile.xml    |   3 -
 Habitica/res/values-bg/strings.sidebar.xml    |  31 +-
 Habitica/res/values-bg/strings.tutorial.xml   |   8 +-
 Habitica/res/values-bg/strings.xml            | 407 ++++++-----------
 Habitica/res/values-de/strings.profile.xml    |   3 -
 Habitica/res/values-de/strings.sidebar.xml    |  31 +-
 Habitica/res/values-de/strings.tutorial.xml   |   8 +-
 Habitica/res/values-de/strings.xml            | 391 ++++++-----------
 .../res/values-en-rGB/strings.profile.xml     |   3 -
 .../res/values-en-rGB/strings.sidebar.xml     |  31 +-
 .../res/values-en-rGB/strings.tutorial.xml    |   8 +-
 Habitica/res/values-en-rGB/strings.xml        | 260 +++--------
 Habitica/res/values-es/strings.profile.xml    |   3 -
 Habitica/res/values-es/strings.sidebar.xml    |  31 +-
 Habitica/res/values-es/strings.tutorial.xml   |   8 +-
 Habitica/res/values-es/strings.xml            | 405 ++++++-----------
 Habitica/res/values-fr/strings.profile.xml    |   3 -
 Habitica/res/values-fr/strings.sidebar.xml    |  31 +-
 Habitica/res/values-fr/strings.tutorial.xml   |   8 +-
 Habitica/res/values-fr/strings.xml            | 409 ++++++-----------
 .../res/values-hr-rHR/strings.profile.xml     |   3 -
 .../res/values-hr-rHR/strings.sidebar.xml     |  31 +-
 .../res/values-hr-rHR/strings.tutorial.xml    |   8 +-
 Habitica/res/values-hr-rHR/strings.xml        | 369 +++++-----------
 Habitica/res/values-in/strings.sidebar.xml    |  31 +-
 Habitica/res/values-in/strings.tutorial.xml   |   8 +-
 Habitica/res/values-in/strings.xml            | 262 +++--------
 Habitica/res/values-it/strings.profile.xml    |   3 -
 Habitica/res/values-it/strings.sidebar.xml    |  31 +-
 Habitica/res/values-it/strings.tutorial.xml   |   8 +-
 Habitica/res/values-it/strings.xml            | 393 ++++++-----------
 Habitica/res/values-iw/strings.sidebar.xml    |  31 +-
 Habitica/res/values-iw/strings.tutorial.xml   |   6 +-
 Habitica/res/values-iw/strings.xml            | 206 +++------
 Habitica/res/values-ja/strings.profile.xml    |   3 -
 Habitica/res/values-ja/strings.sidebar.xml    |  31 +-
 Habitica/res/values-ja/strings.tutorial.xml   |   8 +-
 Habitica/res/values-ja/strings.xml            | 410 ++++++-----------
 Habitica/res/values-ko/strings.profile.xml    |   5 +-
 Habitica/res/values-ko/strings.sidebar.xml    |  31 +-
 Habitica/res/values-ko/strings.tutorial.xml   |   8 +-
 Habitica/res/values-ko/strings.xml            | 381 +++++-----------
 Habitica/res/values-land/bools.xml            |   4 +-
 Habitica/res/values-land/dimens.xml           |   6 +-
 Habitica/res/values-lt/strings.profile.xml    |   3 -
 Habitica/res/values-lt/strings.sidebar.xml    |  31 +-
 Habitica/res/values-lt/strings.tutorial.xml   |   6 +-
 Habitica/res/values-lt/strings.xml            | 272 ++++--------
 Habitica/res/values-nl/strings.profile.xml    |   3 -
 Habitica/res/values-nl/strings.sidebar.xml    |  31 +-
 Habitica/res/values-nl/strings.tutorial.xml   |   8 +-
 Habitica/res/values-nl/strings.xml            | 405 ++++++-----------
 Habitica/res/values-pl/strings.profile.xml    |   3 -
 Habitica/res/values-pl/strings.sidebar.xml    |  31 +-
 Habitica/res/values-pl/strings.tutorial.xml   |   8 +-
 Habitica/res/values-pl/strings.xml            | 250 +++--------
 .../res/values-pt-rBR/strings.profile.xml     |   3 -
 .../res/values-pt-rBR/strings.sidebar.xml     |  31 +-
 .../res/values-pt-rBR/strings.tutorial.xml    |  10 +-
 Habitica/res/values-pt-rBR/strings.xml        | 408 ++++++-----------
 .../res/values-pt-rPT/strings.profile.xml     |   3 -
 .../res/values-pt-rPT/strings.sidebar.xml     |  31 +-
 .../res/values-pt-rPT/strings.tutorial.xml    |   8 +-
 Habitica/res/values-pt-rPT/strings.xml        | 287 ++++--------
 Habitica/res/values-ru/strings.profile.xml    |   3 -
 Habitica/res/values-ru/strings.sidebar.xml    |  31 +-
 Habitica/res/values-ru/strings.tutorial.xml   |   8 +-
 Habitica/res/values-ru/strings.xml            | 411 ++++++------------
 Habitica/res/values-sw320dp/dimens.xml        |   4 +-
 Habitica/res/values-tr/strings.profile.xml    |   3 -
 Habitica/res/values-tr/strings.sidebar.xml    |  31 +-
 Habitica/res/values-tr/strings.tutorial.xml   |   8 +-
 Habitica/res/values-tr/strings.xml            | 407 ++++++-----------
 Habitica/res/values-w360dp/styles.xml         |   6 +-
 .../res/values-zh-rTW/strings.profile.xml     |   3 -
 .../res/values-zh-rTW/strings.sidebar.xml     |  31 +-
 .../res/values-zh-rTW/strings.tutorial.xml    |   8 +-
 Habitica/res/values-zh-rTW/strings.xml        | 393 +++++------------
 Habitica/res/values-zh/strings.profile.xml    |   3 -
 Habitica/res/values-zh/strings.sidebar.xml    |  31 +-
 Habitica/res/values-zh/strings.tutorial.xml   |   8 +-
 Habitica/res/values-zh/strings.xml            | 408 ++++++-----------
 Habitica/res/values/bools.xml                 |   4 +-
 Habitica/res/values/colors.classes.xml        |   7 +-
 Habitica/res/values/colors.contributor.xml    |   2 -
 Habitica/res/values/colors.xml                |  29 --
 Habitica/res/values/dimens.xml                |  35 --
 Habitica/res/values/ids.xml                   |   5 +-
 Habitica/res/values/strings.constants.xml     |   5 -
 Habitica/res/values/strings.profile.xml       |   3 -
 Habitica/res/values/strings.sidebar.xml       |  31 +-
 Habitica/res/values/strings.tutorial.xml      |   4 -
 Habitica/res/values/strings.xml               | 257 +++--------
 Habitica/res/values/styles.challenges.xml     |  22 -
 Habitica/res/values/styles.habitica.xml       |   7 -
 Habitica/res/values/styles.xml                |  84 ----
 Habitica/res/values/values.xml                |  25 --
 Habitica/res/xml/add_task_widget_info.xml     |   8 -
 Habitica/res/xml/main_menu_tasks.xml          |  19 -
 .../habitica/HabiticaBaseApplication.kt       |   5 +-
 .../habitica/HabiticaPurchaseVerifier.java    |   2 +-
 .../habitica/helpers/TaskAlarmManager.kt      |   4 +-
 .../receivers/NotificationPublisher.kt        |   6 +-
 .../android/habitica/ui/RoundedFrameLayout.kt |  10 +-
 .../habitica/ui/activities/BaseActivity.kt    |   2 +-
 .../habitica/ui/activities/MainActivity.kt    |   2 +-
 .../habitica/ui/activities/SetupActivity.kt   |  12 +-
 .../ui/views/HabiticaAutocompleteTextView.kt  |   7 +-
 .../ui/views/HabiticaEmojiTextView.kt         |   4 +-
 .../habitica/ui/views/stats/StatsView.kt      |   9 +-
 .../habitica/widget/AddTaskWidgetProvider.kt  |   2 +-
 .../android/sdk/ConnectionProcessor.java      |   5 +-
 seeds-sdk/src/main/res/drawable/bar.png       | Bin 2773 -> 0 bytes
 .../src/main/res/drawable/browser_back.png    | Bin 1032 -> 0 bytes
 .../main/res/drawable/browser_external.png    | Bin 1640 -> 0 bytes
 .../src/main/res/drawable/browser_forward.png | Bin 1024 -> 0 bytes
 .../src/main/res/drawable/browser_reload.png  | Bin 2054 -> 0 bytes
 .../main/res/drawable/close_button_normal.png | Bin 4730 -> 0 bytes
 .../res/drawable/close_button_pressed.png     | Bin 5091 -> 0 bytes
 seeds-sdk/src/main/res/drawable/skip.png      | Bin 4152 -> 0 bytes
 .../src/main/res/drawable/video_pause.png     | Bin 311 -> 0 bytes
 .../src/main/res/drawable/video_play.png      | Bin 1024 -> 0 bytes
 .../src/main/res/drawable/video_replay.png    | Bin 2054 -> 0 bytes
 208 files changed, 2673 insertions(+), 7251 deletions(-)
 delete mode 100644 Habitica/res/anim/button_state_list_animator.xml
 delete mode 100644 Habitica/res/anim/clockwise_rotate.xml
 delete mode 100644 Habitica/res/anim/fab_slide_in.xml
 delete mode 100644 Habitica/res/anim/fab_slide_out.xml
 delete mode 100644 Habitica/res/anim/rotate_45_degrees.xml
 delete mode 100644 Habitica/res/layout/activity_challenge_detail.xml
 delete mode 100644 Habitica/res/layout/checklist_item.xml
 delete mode 100644 Habitica/res/layout/custom_date_time_dialogue.xml
 delete mode 100644 Habitica/res/layout/custom_list_preference_row.xml
 delete mode 100644 Habitica/res/layout/dialog_challenge_detail.xml
 delete mode 100644 Habitica/res/layout/dialog_purchase_shopitem.xml
 delete mode 100644 Habitica/res/layout/fragment_fading_viewpager.xml
 delete mode 100644 Habitica/res/layout/fragment_shop.xml
 delete mode 100644 Habitica/res/layout/normal_list_preference_row.xml
 delete mode 100644 Habitica/res/layout/party_member_quest.xml
 delete mode 100644 Habitica/res/layout/qr_code.xml
 delete mode 100644 Habitica/res/layout/qr_dialogue.xml
 delete mode 100644 Habitica/res/layout/refresh_actionview.xml
 delete mode 100644 Habitica/res/layout/reminder_item.xml
 delete mode 100644 Habitica/res/layout/row_checklist.xml
 delete mode 100644 Habitica/res/layout/row_number_picker.xml
 delete mode 100644 Habitica/res/layout/simple_widget.xml
 delete mode 100644 Habitica/res/layout/tasks_duedate.xml
 delete mode 100644 Habitica/res/layout/tasks_startdate.xml
 delete mode 100644 Habitica/res/menu/challenge_admin.xml
 delete mode 100644 Habitica/res/menu/chat_message.xml
 delete mode 100644 Habitica/res/menu/inbox.xml
 delete mode 100644 Habitica/res/menu/login.xml
 delete mode 100644 Habitica/res/menu/main_menu_tasks.xml
 delete mode 100644 Habitica/res/xml/add_task_widget_info.xml
 delete mode 100644 Habitica/res/xml/main_menu_tasks.xml
 delete mode 100755 seeds-sdk/src/main/res/drawable/bar.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/browser_back.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/browser_external.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/browser_forward.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/browser_reload.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/close_button_normal.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/close_button_pressed.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/skip.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/video_pause.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/video_play.png
 delete mode 100755 seeds-sdk/src/main/res/drawable/video_replay.png

diff --git a/Habitica/res/anim/button_state_list_animator.xml b/Habitica/res/anim/button_state_list_animator.xml
deleted file mode 100644
index 50ed16c7d..000000000
--- a/Habitica/res/anim/button_state_list_animator.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-          http://www.apache.org/licenses/LICENSE-2.0
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_pressed="true" android:state_enabled="true">
-        <set>
-            <objectAnimator android:propertyName="translationZ"
-                android:duration="100"
-                android:valueTo="4dp"
-                android:valueType="floatType"/>
-            <objectAnimator android:propertyName="elevation"
-                android:duration="0"
-                android:valueTo="2dp"
-                android:valueType="floatType"/>
-        </set>
-    </item>
-    <!-- base state -->
-    <item android:state_enabled="true">
-        <set>
-            <objectAnimator android:propertyName="translationZ"
-                android:duration="100"
-                android:valueTo="0"
-                android:startDelay="100"
-                android:valueType="floatType"/>
-            <objectAnimator android:propertyName="elevation"
-                android:duration="0"
-                android:valueTo="2dp"
-                android:valueType="floatType" />
-        </set>
-    </item>
-    <item>
-        <set>
-            <objectAnimator android:propertyName="translationZ"
-                android:duration="0"
-                android:valueTo="0"
-                android:valueType="floatType"/>
-            <objectAnimator android:propertyName="elevation"
-                android:duration="0"
-                android:valueTo="0"
-                android:valueType="floatType"/>
-        </set>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/Habitica/res/anim/clockwise_rotate.xml b/Habitica/res/anim/clockwise_rotate.xml
deleted file mode 100644
index 84c5476dc..000000000
--- a/Habitica/res/anim/clockwise_rotate.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="0"
-    android:toDegrees="360"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:duration="1000"
-    android:interpolator="@android:anim/linear_interpolator" />
\ No newline at end of file
diff --git a/Habitica/res/anim/fab_slide_in.xml b/Habitica/res/anim/fab_slide_in.xml
deleted file mode 100644
index bac34df5b..000000000
--- a/Habitica/res/anim/fab_slide_in.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="200">
-	<translate
-		android:fromYDelta="100%"
-		android:toYDelta="0%"/>
-</set>
\ No newline at end of file
diff --git a/Habitica/res/anim/fab_slide_out.xml b/Habitica/res/anim/fab_slide_out.xml
deleted file mode 100644
index 6d97fbbe2..000000000
--- a/Habitica/res/anim/fab_slide_out.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-	android:duration="200">
-	<translate android:fromYDelta="0%"
-		android:toYDelta="100%"
-		/>
-</set>
\ No newline at end of file
diff --git a/Habitica/res/anim/rotate_45_degrees.xml b/Habitica/res/anim/rotate_45_degrees.xml
deleted file mode 100644
index b2cf69b8f..000000000
--- a/Habitica/res/anim/rotate_45_degrees.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:fromDegrees="0"
-    android:toDegrees="45"
-    android:pivotX="50%"
-    android:pivotY="50%" />
\ No newline at end of file
diff --git a/Habitica/res/drawable/checklist_checked.xml b/Habitica/res/drawable/checklist_checked.xml
index 7ab67c248..70d16bd6e 100644
--- a/Habitica/res/drawable/checklist_checked.xml
+++ b/Habitica/res/drawable/checklist_checked.xml
@@ -2,7 +2,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+        <shape android:shape="rectangle">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
             <solid android:color="@color/checkbox_checklist_fill" />
             <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
diff --git a/Habitica/res/drawable/daily_checked.xml b/Habitica/res/drawable/daily_checked.xml
index 7ca5b679b..40e7e1787 100644
--- a/Habitica/res/drawable/daily_checked.xml
+++ b/Habitica/res/drawable/daily_checked.xml
@@ -2,7 +2,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
+        <shape android:shape="rectangle">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
             <solid android:color="@color/checkbox_checked_fill" />
             <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
diff --git a/Habitica/res/drawable/todo_checked.xml b/Habitica/res/drawable/todo_checked.xml
index 415d4ba29..dba88c0e9 100644
--- a/Habitica/res/drawable/todo_checked.xml
+++ b/Habitica/res/drawable/todo_checked.xml
@@ -2,7 +2,7 @@
 
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+        <shape android:shape="oval">
             <corners android:radius="@dimen/daily_checkbox_corner_radius"/>
             <solid android:color="@color/checkbox_checked_fill" />
             <size android:height="@dimen/checkbox_size" android:width="@dimen/checkbox_size" />
diff --git a/Habitica/res/layout/achievement_list_item.xml b/Habitica/res/layout/achievement_list_item.xml
index def7138ec..4da888628 100644
--- a/Habitica/res/layout/achievement_list_item.xml
+++ b/Habitica/res/layout/achievement_list_item.xml
@@ -37,7 +37,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:layout_marginRight="@dimen/spacing_large">
+        android:layout_marginEnd="@dimen/spacing_large">
         <TextView
             android:id="@+id/achievement_title"
             android:layout_width="match_parent"
@@ -50,5 +50,5 @@
             android:layout_height="wrap_content"
             style="@style/Caption3"
             android:textColor="@color/gray_100"/>
-    </LinearLayout>r
+    </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_about.xml b/Habitica/res/layout/activity_about.xml
index c07bcb736..0329f6e21 100644
--- a/Habitica/res/layout/activity_about.xml
+++ b/Habitica/res/layout/activity_about.xml
@@ -22,7 +22,6 @@
 
     </com.google.android.material.appbar.AppBarLayout>
     <RelativeLayout
-        android:id="@+id/main_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:context=".ui.activities.AboutActivity">
diff --git a/Habitica/res/layout/activity_challenge_detail.xml b/Habitica/res/layout/activity_challenge_detail.xml
deleted file mode 100644
index 4470417ee..000000000
--- a/Habitica/res/layout/activity_challenge_detail.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/overlayFrameLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.activities.MainActivity">
-
-    <androidx.drawerlayout.widget.DrawerLayout
-        android:id="@+id/drawer_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-                android:gravity="center">
-
-        <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/main_content"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:elevation="0dp"
-            tools:context=".ui.activities.MainActivity">
-
-            <FrameLayout
-                android:id="@+id/fragment_container"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                app:layout_behavior="@string/appbar_scrolling_view_behavior" />
-
-            <com.google.android.material.appbar.AppBarLayout
-                android:id="@+id/appbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fitsSystemWindows="false">
-
-                <com.google.android.material.appbar.CollapsingToolbarLayout
-                    android:id="@+id/collapsing_toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:fitsSystemWindows="false"
-                    app:contentScrim="?attr/colorPrimary"
-                    app:expandedTitleMarginEnd="?attr/actionBarSize"
-                    app:expandedTitleMarginStart="0dp"
-                    app:layout_scrollFlags="scroll|exitUntilCollapsed"
-                    app:titleEnabled="false">
-
-                    <LinearLayout
-                        android:id="@+id/challenge_header"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_centerHorizontal="true"
-                        android:layout_marginBottom="15dp"
-
-                        android:layout_marginTop="?attr/actionBarSize"
-                        android:adjustViewBounds="true"
-                                                android:focusable="true"
-                        android:focusableInTouchMode="true"
-                        android:orientation="vertical"
-                        app:layout_collapseMode="parallax">
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginEnd="23dp"
-                            android:layout_marginLeft="26dp"
-                            android:layout_marginRight="23dp"
-                            android:layout_marginStart="26dp"
-                            android:orientation="vertical">
-
-                            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-                                android:id="@+id/challenge_name"
-                                style="@style/Headline"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:maxLines="2"
-                                android:textColor="@color/textColorDark" />
-
-                            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-                                android:id="@+id/challenge_description"
-                                style="@style/Body2"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:maxLines="4"
-                                android:textColor="@color/textColorDark" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="fill_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginBottom="10dp"
-
-                            android:layout_marginEnd="23dp"
-                            android:layout_marginRight="23dp"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginLeft="16dp"
-                            android:layout_marginTop="10dp"
-                            android:orientation="horizontal"
-                            android:weightSum="2"
-                            android:baselineAligned="false">
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="36dp"
-                                android:layout_weight="1">
-
-                                <Button
-                                    android:id="@+id/btn_show_more"
-                                    style="@style/Body1_Button"
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="left|center"
-                                    android:paddingTop="3dp"
-                                    android:paddingBottom="3dp"
-                                    android:text="Show more"
-                                    android:textAllCaps="false"
-                                    android:textColor="#d0c1ff" />
-
-                            </LinearLayout>
-
-                            <LinearLayout
-                                android:layout_width="0dp"
-                                android:layout_height="wrap_content"
-                                android:layout_weight="1"
-                                android:gravity="right"
-                                android:orientation="horizontal">
-
-                                    <TextView
-                                        android:id="@+id/gem_amount"
-                                        style="@style/Body1"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:textColor="@color/textColorDark"
-                                        tools:text="15"
-                                        android:layout_gravity="center"/>
-
-                                    <TextView
-                                        android:layout_marginLeft="17dp"
-                                        android:layout_marginStart="17dp"
-                                        android:id="@+id/challenge_member_count"
-                                        style="@style/Body1"
-                                        android:layout_width="wrap_content"
-                                        android:layout_height="wrap_content"
-                                        android:textColor="@color/textColorDark"
-                                        tools:text="15"
-                                        android:drawableLeft="@drawable/participants_light"
-                                        android:gravity="center"/>
-                            </LinearLayout>
-
-                        </LinearLayout>
-
-                    </LinearLayout>
-
-                    <androidx.appcompat.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:minHeight="?attr/actionBarSize"
-                        android:theme="@style/Toolbar"
-
-                        app:layout_collapseMode="pin"
-                        app:popupTheme="@style/Theme.AppCompat.Light" />
-                </com.google.android.material.appbar.CollapsingToolbarLayout>
-
-                <com.google.android.material.tabs.TabLayout
-                    android:id="@+id/detail_tabs"
-                    android:layout_width="match_parent"
-                    android:layout_height="54dp"
-                    android:layout_gravity="bottom"
-                    android:background="?colorPrimaryOffset"
-                    android:elevation="0dp"
-                    android:fillViewport="false"
-
-                    android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-                    app:layout_anchor="@+id/collapsing_toolbar"
-                    app:layout_anchorGravity="bottom"
-
-                    app:layout_collapseMode="pin"
-                    app:tabGravity="fill"
-                    app:tabIndicatorColor="@android:color/white"
-                    app:tabMode="fixed" />
-            </com.google.android.material.appbar.AppBarLayout>
-
-            <FrameLayout
-                android:id="@+id/snackbar_container"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentBottom="true"
-                android:layout_alignParentRight="true"
-                android:layout_gravity="bottom|right"
-                android:layout_marginBottom="16dp"
-                android:layout_marginRight="8dp"
-                app:layout_behavior="com.habitrpg.android.habitica.ui.helpers.FloatingActionMenuBehavior" />
-
-        </androidx.coordinatorlayout.widget.CoordinatorLayout>
-    </androidx.drawerlayout.widget.DrawerLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/activity_class_selection.xml b/Habitica/res/layout/activity_class_selection.xml
index bd6838361..c27526a99 100644
--- a/Habitica/res/layout/activity_class_selection.xml
+++ b/Habitica/res/layout/activity_class_selection.xml
@@ -36,7 +36,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:gravity="center_horizontal"
-                android:layout_marginRight="48dp">
+                android:layout_marginEnd="48dp">
                 <com.habitrpg.android.habitica.ui.AvatarView
                     android:id="@+id/healerAvatarView"
                     android:layout_width="75dp"
@@ -92,7 +92,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:gravity="center_horizontal"
-                android:layout_marginRight="48dp">
+                android:layout_marginEnd="48dp">
                 <com.habitrpg.android.habitica.ui.AvatarView
                     android:id="@+id/rogueAvatarView"
                     android:layout_width="75dp"
diff --git a/Habitica/res/layout/activity_create_challenge.xml b/Habitica/res/layout/activity_create_challenge.xml
index 00e64ce85..4c749fed6 100644
--- a/Habitica/res/layout/activity_create_challenge.xml
+++ b/Habitica/res/layout/activity_create_challenge.xml
@@ -2,7 +2,6 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/activity_create_challenge"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
@@ -51,7 +50,6 @@
                 android:layout_height="wrap_content"
                 android:textColorHint="?textColorPrimaryDark"
 
-                android:id="@+id/create_challenge_description_input_layout"
                 app:hintTextAppearance="@style/TextAppearance.AppCompat">
 
                 <EditText
@@ -112,7 +110,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:drawableLeft="@drawable/challenge_gem_add_button"/>
+                    android:drawableStart="@drawable/challenge_gem_add_button"/>
 
                 <ImageView
                     android:id="@+id/gem_icon"
@@ -138,7 +136,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
-                    android:drawableRight="@drawable/challenge_gem_remove_button"/>
+                    android:drawableEnd="@drawable/challenge_gem_remove_button"/>
 
             </LinearLayout>
 
diff --git a/Habitica/res/layout/activity_fixcharacter.xml b/Habitica/res/layout/activity_fixcharacter.xml
index aed1c692f..359ce75ee 100644
--- a/Habitica/res/layout/activity_fixcharacter.xml
+++ b/Habitica/res/layout/activity_fixcharacter.xml
@@ -28,7 +28,6 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
                     <TextView
-                        android:id="@+id/textView5"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:padding="@dimen/outer_inset"
diff --git a/Habitica/res/layout/activity_full_profile.xml b/Habitica/res/layout/activity_full_profile.xml
index c028605bd..976e8e60b 100644
--- a/Habitica/res/layout/activity_full_profile.xml
+++ b/Habitica/res/layout/activity_full_profile.xml
@@ -65,13 +65,11 @@
                                 android:layout_height="@dimen/avatar_header_height"
                                 android:layout_gravity="center_vertical"
                                 android:layout_marginEnd="16dp"
-                                android:layout_marginRight="16dp"
                                 app:showBackground="true"
                                 app:showMount="true"
                                 app:showPet="true" />
 
                             <LinearLayout
-                                android:id="@+id/LL_header"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:orientation="vertical">
@@ -226,7 +224,7 @@
                             android:layout_height="wrap_content"
                             android:text=""
                             android:id="@+id/username"
-                            android:layout_gravity="right"/>
+                            android:layout_gravity="end"/>
                     </LinearLayout>
 
                     <Button
@@ -404,7 +402,7 @@
                                 android:id="@+id/current_pet_drawee"
                                 android:layout_width="40dp"
                                 android:layout_height="40dp"
-                                fresco:actualImageScaleType="centerCrop"/>>
+                                fresco:actualImageScaleType="centerCrop"/>
                         </TableRow>
 
                         <TableRow android:layout_height="wrap_content"
diff --git a/Habitica/res/layout/activity_gem_purchase.xml b/Habitica/res/layout/activity_gem_purchase.xml
index cd2961f30..08a891c88 100644
--- a/Habitica/res/layout/activity_gem_purchase.xml
+++ b/Habitica/res/layout/activity_gem_purchase.xml
@@ -12,8 +12,7 @@
                         android:gravity="center">
 
         <androidx.coordinatorlayout.widget.CoordinatorLayout
-                android:id="@+id/main_content"
-                android:layout_width="match_parent"
+            android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:elevation="0dp"
                 tools:context=".ui.activities.MainActivity">
@@ -43,8 +42,7 @@
                         app:layout_scrollFlags="scroll|exitUntilCollapsed">
 
                     <ImageView
-                            android:id="@+id/headerImage"
-                            android:layout_width="match_parent"
+                        android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="?attr/actionBarSize"
                             app:layout_collapseMode="parallax"
diff --git a/Habitica/res/layout/activity_gift_iap.xml b/Habitica/res/layout/activity_gift_iap.xml
index b43818df9..d8335d41b 100644
--- a/Habitica/res/layout/activity_gift_iap.xml
+++ b/Habitica/res/layout/activity_gift_iap.xml
@@ -21,8 +21,7 @@
             app:popupTheme="@style/ThemeOverlay.AppCompat.Dark"/>
 
     </com.google.android.material.appbar.AppBarLayout>
-    <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <androidx.core.widget.NestedScrollView
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
diff --git a/Habitica/res/layout/activity_intro.xml b/Habitica/res/layout/activity_intro.xml
index 6cf2232cb..f11fe1000 100644
--- a/Habitica/res/layout/activity_intro.xml
+++ b/Habitica/res/layout/activity_intro.xml
@@ -24,9 +24,7 @@
             android:text="@string/skip_button"
             android:id="@+id/skipButton"
             android:layout_alignParentBottom="false"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginRight="6dp"
             android:layout_marginEnd="6dp"
             android:layout_alignParentTop="true"
             android:layout_marginTop="6dp"
@@ -39,9 +37,7 @@
             android:text="@string/intro_finish_button"
             android:id="@+id/finishButton"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true"
-            android:layout_marginRight="12dp"
             android:layout_marginEnd="12dp"
             android:layout_marginBottom="6dp"
             android:background="@color/transparent"
diff --git a/Habitica/res/layout/activity_login.xml b/Habitica/res/layout/activity_login.xml
index 775bc476d..27cdec1ed 100644
--- a/Habitica/res/layout/activity_login.xml
+++ b/Habitica/res/layout/activity_login.xml
@@ -19,7 +19,7 @@
             android:background="@drawable/login_gradient"
             android:clipChildren="false"
             android:clipToPadding="false"
-            android:layout_marginRight="-2dp"
+            android:layout_marginEnd="-2dp"
             >
             <ImageView
                 android:id="@+id/city_view"
@@ -74,7 +74,6 @@
             android:paddingTop="@dimen/spacing_large"
             android:paddingLeft="@dimen/spacing_large"
             android:paddingRight="@dimen/spacing_large"
-            android:id="@+id/login_intro_view"
             android:orientation="vertical"
             android:background="@color/transparent"
                         >
@@ -235,9 +234,9 @@
             android:id="@+id/back_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:drawableLeft="@drawable/ic_arrow_back_white_36dp"
+            android:drawableStart="@drawable/ic_arrow_back_white_36dp"
             android:background="@color/transparent"
-            android:paddingLeft="12dp"
+            android:paddingStart="12dp"
             android:alpha="0" />
     </FrameLayout>
 
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index 41fae3801..0c5eec65f 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -12,7 +12,6 @@
     <!-- As the main content view, the view below consumes the entire
          space available using match_parent in both dimensions. -->
         <androidx.coordinatorlayout.widget.CoordinatorLayout
-            android:id="@+id/coordinatorLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             tools:context=".ui.activities.MainActivity">
diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml
index fbd294525..5671d72f2 100644
--- a/Habitica/res/layout/activity_notifications.xml
+++ b/Habitica/res/layout/activity_notifications.xml
@@ -30,8 +30,7 @@
         android:layout_gravity="top|center"
         app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:app="http://schemas.android.com/apk/res-auto"
+        <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
             android:id="@+id/notifications_refresh_layout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/Habitica/res/layout/activity_party_invite.xml b/Habitica/res/layout/activity_party_invite.xml
index ef03ecd2c..b8d86a578 100644
--- a/Habitica/res/layout/activity_party_invite.xml
+++ b/Habitica/res/layout/activity_party_invite.xml
@@ -4,8 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/white">
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
diff --git a/Habitica/res/layout/activity_report_message.xml b/Habitica/res/layout/activity_report_message.xml
index 32c259677..b67106b28 100644
--- a/Habitica/res/layout/activity_report_message.xml
+++ b/Habitica/res/layout/activity_report_message.xml
@@ -48,14 +48,14 @@
                         android:layout_height="wrap_content"
                         android:src="@drawable/ic_close_grey_800_24dp"
                         android:background="@color/transparent"
-                        android:paddingLeft="@dimen/spacing_small"/>
+                        android:paddingEnd="@dimen/spacing_small"/>
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/report_violation"
                         android:textSize="20sp"
                         android:textColor="@color/gray_50"
-                        android:layout_marginLeft="36dp"
+                        android:layout_marginEnd="36dp"
                         android:id="@+id/toolbar_title" />
                     <Button
                         android:id="@+id/report_button"
diff --git a/Habitica/res/layout/avatar_with_bars.xml b/Habitica/res/layout/avatar_with_bars.xml
index 95806bf5d..319bc1941 100644
--- a/Habitica/res/layout/avatar_with_bars.xml
+++ b/Habitica/res/layout/avatar_with_bars.xml
@@ -2,8 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:app="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
-              android:id="@+id/avatar_with_bars_layout"
-              android:layout_width="match_parent"
+    android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_centerHorizontal="true"
               android:adjustViewBounds="true"
@@ -32,8 +31,7 @@
                 app:showPet="true"/>
 
         <LinearLayout
-                android:id="@+id/LL_header"
-                android:layout_width="match_parent"
+            android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
diff --git a/Habitica/res/layout/challenge_item.xml b/Habitica/res/layout/challenge_item.xml
index 3ca151d4a..12dd4f1fa 100644
--- a/Habitica/res/layout/challenge_item.xml
+++ b/Habitica/res/layout/challenge_item.xml
@@ -10,7 +10,6 @@
     android:background="#fff"
     android:orientation="horizontal"
     android:baselineAligned="false"
-    android:paddingRight="16dp"
     android:paddingEnd="16dp">
 
     <LinearLayout
@@ -69,7 +68,6 @@
             android:layout_marginBottom="@dimen/spacing_small"/>
 
         <LinearLayout
-            android:id="@+id/leaderParticipantLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
diff --git a/Habitica/res/layout/checklist_item.xml b/Habitica/res/layout/checklist_item.xml
deleted file mode 100644
index 69401b3a6..000000000
--- a/Habitica/res/layout/checklist_item.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/item"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clickable="true"
-    android:focusable="true"
-    android:foreground="?selectableItemBackground"
-    android:orientation="horizontal"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp">
-
-    <Button
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/delete_item_button"
-        android:text="x" />
-
-    <com.habitrpg.android.habitica.ui.views.HabiticaAutocompleteTextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:id="@+id/item_edittext"
-        android:layout_weight="1"
-        android:layout_marginLeft="4dp"
-        android:inputType="textCapSentences" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/checklist_item_row.xml b/Habitica/res/layout/checklist_item_row.xml
index afa37008e..feed149c2 100644
--- a/Habitica/res/layout/checklist_item_row.xml
+++ b/Habitica/res/layout/checklist_item_row.xml
@@ -24,11 +24,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="5dp"
-            android:paddingLeft="16dp"
+            android:paddingStart="16dp"
             android:layout_gravity="center_vertical"/>
     </LinearLayout>
     <View
-        android:id="@+id/bottomBorderView"
         android:layout_width="match_parent"
         android:layout_height="@dimen/hairline_height"
         android:background="@color/cell_separator"/>
diff --git a/Habitica/res/layout/custom_date_time_dialogue.xml b/Habitica/res/layout/custom_date_time_dialogue.xml
deleted file mode 100644
index a1462ab64..000000000
--- a/Habitica/res/layout/custom_date_time_dialogue.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-            android:orientation="vertical" android:layout_width="match_parent"
-            android:layout_height="match_parent">
-    <LinearLayout
-            android:orientation="vertical" android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-        <DatePicker
-                android:id="@+id/datePicker"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" >
-        </DatePicker>
-
-        <TimePicker
-                android:id="@+id/timePicker"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" >
-        </TimePicker>
-
-        <Button
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/confirm"
-                android:id="@+id/customDialogConfirmButton"
-                />
-    </LinearLayout>
-</ScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/custom_list_preference_row.xml b/Habitica/res/layout/custom_list_preference_row.xml
deleted file mode 100644
index aa8b81791..000000000
--- a/Habitica/res/layout/custom_list_preference_row.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="horizontal"
-    android:paddingBottom="8dip"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip"
-    android:paddingTop="8dip">
-
-    <EditText
-        android:id="@+id/ET_prefs_customText"
-        android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:hint="@string/SP_address_hint"
-        android:inputType="textUri" />
-
-    <RadioButton
-        android:id="@+id/custom_list_view_row_radio_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:checked="false" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/daily_item_card.xml b/Habitica/res/layout/daily_item_card.xml
index eb1aba83e..56101009b 100644
--- a/Habitica/res/layout/daily_item_card.xml
+++ b/Habitica/res/layout/daily_item_card.xml
@@ -213,7 +213,6 @@
     </FrameLayout>
 
     <View
-        android:id="@+id/checklistSeparator"
         android:layout_width="match_parent"
         android:layout_height="@dimen/hairline_height"
         android:background="@color/cell_separator" />
diff --git a/Habitica/res/layout/dialog_achievement_details.xml b/Habitica/res/layout/dialog_achievement_details.xml
index 1c76e4892..6769dfc17 100644
--- a/Habitica/res/layout/dialog_achievement_details.xml
+++ b/Habitica/res/layout/dialog_achievement_details.xml
@@ -2,6 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:paddingLeft="24dip"
     android:paddingTop="24dip"
@@ -23,14 +24,14 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textStyle="bold"
-            android:paddingLeft="15dip"
-            android:text="example title" />
+            android:paddingStart="15dip"
+            tools:text="example title" />
     </LinearLayout>
 
     <TextView
         android:id="@+id/achievement_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="example text"
+        tools:text="example text"
         android:paddingTop="15dip" />
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_detail.xml b/Habitica/res/layout/dialog_challenge_detail.xml
deleted file mode 100644
index b5a2ed112..000000000
--- a/Habitica/res/layout/dialog_challenge_detail.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.habitrpg.android.habitica.ui.MaxHeightLinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-
-    android:orientation="vertical"
-    app:maxHeightMultiplier="0.7">
-
-    <LinearLayout
-        android:id="@+id/challenge_not_joined_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="19dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="19dp"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="24dp"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <TextView
-            style="@style/Caption3"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:height="20dp"
-            android:text="@string/challenge"
-            android:textAllCaps="true" />
-
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/challenge_joined_header"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <Button
-            android:id="@+id/challenge_go_to_btn"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_marginBottom="5dp"
-            android:layout_marginTop="5dp"
-            android:text="@string/go_to_challenge"
-            android:textColor="#6133b4"
-            android:textSize="16sp" />
-
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:background="#1f000000" />
-    </LinearLayout>
-
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_marginEnd="19dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="19dp"
-        android:layout_marginStart="24dp"
-        android:layout_weight="8">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:scrollbarAlwaysDrawVerticalTrack="true"
-            android:scrollbars="vertical">
-
-
-            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-                android:id="@+id/challenge_name"
-                style="@style/Title2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="9dp"
-                tools:text="Read a book by or about a person in your field of study" />
-
-            <com.habitrpg.android.habitica.ui.views.HabiticaEmojiTextView
-                android:id="@+id/challenge_description"
-                style="@style/Body2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="11dp"
-                android:lineSpacingExtra="4sp"
-                tools:text="There’s always more to learn! Maybe it’s a specialized topic you’re interested in, or maybe it’s the experiences of a notable contributor. Read about it and you may win 15 gems!" />
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="28dp"
-                android:layout_marginTop="10dp"
-                android:gravity="center_vertical">
-
-                <TextView
-                    android:id="@+id/challenge_leader"
-                    style="@style/Body1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="Leader name"
-                    android:textColor="#6133b4" />
-
-
-            </LinearLayout>
-
-            <LinearLayout
-                android:id="@+id/task_group_layout"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="13dp"
-                android:orientation="vertical">
-
-            </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:background="#1f000000" />
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        android:layout_marginEnd="8dp"
-        android:layout_marginLeft="24dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginStart="24dp"
-        android:orientation="horizontal">
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="10dp"
-            android:layout_marginTop="10dp"
-            android:layout_weight="1"
-            android:orientation="horizontal">
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center">
-
-                <ImageView
-                    android:id="@+id/gem_icon"
-                    android:layout_width="wrap_content"
-                    android:layout_height="36dp" />
-
-                <TextView
-                    android:id="@+id/gem_amount"
-                    style="@style/Body1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    tools:text="15" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="17dp"
-                android:layout_marginStart="17dp"
-                android:gravity="center">
-
-                <ImageView
-                    android:layout_width="wrap_content"
-                    android:layout_height="36dp"
-                    android:src="@drawable/dialogue_participants" />
-
-                <TextView
-                    android:id="@+id/challenge_member_count"
-                    style="@style/Body1"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="4dp"
-                    android:layout_marginStart="4dp"
-                    tools:text="15" />
-            </LinearLayout>
-        </LinearLayout>
-
-        <Button
-            android:id="@+id/challenge_join_btn"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="Join"
-            android:textColor="#1ca372"
-            android:textSize="16sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
-
-        <Button
-            android:id="@+id/challenge_leave_btn"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="Leave"
-            android:textColor="#d70e14"
-            android:textSize="16sp"
-            android:visibility="gone"
-            tools:visibility="visible" />
-    </LinearLayout>
-</com.habitrpg.android.habitica.ui.MaxHeightLinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_challenge_filter_group_item.xml b/Habitica/res/layout/dialog_challenge_filter_group_item.xml
index bd497420a..44ae2a755 100644
--- a/Habitica/res/layout/dialog_challenge_filter_group_item.xml
+++ b/Habitica/res/layout/dialog_challenge_filter_group_item.xml
@@ -7,4 +7,4 @@
     android:layout_height="wrap_content"
     android:paddingTop="8dp"
     android:paddingBottom="8dp"
-    android:paddingLeft="8dp"/>
\ No newline at end of file
+    android:paddingStart="8dp"/>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_faint.xml b/Habitica/res/layout/dialog_faint.xml
index 427034a60..35db018ca 100644
--- a/Habitica/res/layout/dialog_faint.xml
+++ b/Habitica/res/layout/dialog_faint.xml
@@ -30,7 +30,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/textView4"
         android:text="@string/faint_subtitle"
         android:textStyle="bold"
         android:textSize="16sp" />
@@ -38,7 +37,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/faint_penalty_body"
-        android:id="@+id/textView11" />
+        android:text="@string/faint_penalty_body" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/dialog_levelup.xml b/Habitica/res/layout/dialog_levelup.xml
index 4e9d03ca1..a39bdd4b6 100644
--- a/Habitica/res/layout/dialog_levelup.xml
+++ b/Habitica/res/layout/dialog_levelup.xml
@@ -22,7 +22,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/levelupDetail"
         android:text="@string/levelup_detail"
         style="@style/Body2"
         android:gravity="center_horizontal"
diff --git a/Habitica/res/layout/dialog_purchase_content_gear.xml b/Habitica/res/layout/dialog_purchase_content_gear.xml
index 8b7f0ba11..eb5920031 100644
--- a/Habitica/res/layout/dialog_purchase_content_gear.xml
+++ b/Habitica/res/layout/dialog_purchase_content_gear.xml
@@ -46,26 +46,26 @@
                 android:text="@string/str_abbrv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="12dp"/>
+                android:layout_marginEnd="12dp"/>
             <TextView
                 android:id="@+id/str_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+6"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/per_label"
                 android:text="@string/per_abbrv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="12dp"/>
+                android:layout_marginEnd="12dp"/>
             <TextView
                 android:id="@+id/per_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+6"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:textColor="@color/green_50"/>
         </TableRow>
         <TableRow
@@ -77,26 +77,26 @@
                 android:text="@string/con_abbrv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="12dp"/>
+                android:layout_marginEnd="12dp"/>
             <TextView
                 android:id="@+id/con_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+6"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:textColor="@color/green_50"/>
             <TextView
                 android:id="@+id/int_label"
                 android:text="@string/int_abbrv"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginRight="12dp"/>
+                android:layout_marginEnd="12dp"/>
             <TextView
                 android:id="@+id/int_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="+6"
-                android:layout_marginRight="16dp"
+                android:layout_marginEnd="16dp"
                 android:textColor="@color/green_50"/>
         </TableRow>
     </TableLayout>
diff --git a/Habitica/res/layout/dialog_purchase_content_quest.xml b/Habitica/res/layout/dialog_purchase_content_quest.xml
index c46019af8..540e03a6f 100644
--- a/Habitica/res/layout/dialog_purchase_content_quest.xml
+++ b/Habitica/res/layout/dialog_purchase_content_quest.xml
@@ -101,7 +101,6 @@
                 />
         </TableRow>
         <TableRow
-            android:id="@+id/difficulty_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@drawable/quest_difficulty_bg"
diff --git a/Habitica/res/layout/dialog_purchase_shopitem.xml b/Habitica/res/layout/dialog_purchase_shopitem.xml
deleted file mode 100644
index 83e4814f2..000000000
--- a/Habitica/res/layout/dialog_purchase_shopitem.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-</FrameLayout>
diff --git a/Habitica/res/layout/dialog_task_filter.xml b/Habitica/res/layout/dialog_task_filter.xml
index 7a4a20231..9fb1f405f 100644
--- a/Habitica/res/layout/dialog_task_filter.xml
+++ b/Habitica/res/layout/dialog_task_filter.xml
@@ -81,12 +81,12 @@
                     style="@style/Body1_Button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_gravity="right"
+                    android:layout_gravity="End"
                     android:text="@string/edit_tag_btn_edit"
                     android:textColor="#6133b4"
                     android:textSize="16sp"
-                    android:gravity="right|center_vertical"
-                    android:paddingRight="0dp"/>
+                    android:gravity="End|center_vertical"
+                    android:paddingEnd="0dp"/>
         </LinearLayout>
         <ScrollView
             android:layout_width="match_parent"
diff --git a/Habitica/res/layout/drawer_main.xml b/Habitica/res/layout/drawer_main.xml
index 3acd4db2a..441353145 100644
--- a/Habitica/res/layout/drawer_main.xml
+++ b/Habitica/res/layout/drawer_main.xml
@@ -11,15 +11,16 @@
         android:id="@+id/menuHeaderView"
         android:layout_width="match_parent"
         android:layout_height="64dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="1dp"
+        android:paddingStart="16dp"
+        android:paddingEnd="1dp"
         android:gravity="center_vertical"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
 
         <com.habitrpg.android.habitica.ui.views.RoundedCornerLayout
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginRight="@dimen/spacing_large"
+            android:layout_marginEnd="@dimen/spacing_large"
             android:background="@drawable/rounded_avatar_bg">
             <com.habitrpg.android.habitica.ui.AvatarView
                 android:id="@+id/avatarView"
@@ -56,11 +57,11 @@
                 android:textColor="@color/white_80_alpha"/>
         </LinearLayout>
 
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <RelativeLayout
             android:id="@+id/notificationsButtonWrapper"
             android:layout_width="33dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="16dp">
+            android:layout_marginStart="16dp">
             <ImageView
                 android:id="@+id/notificationsButton"
                 android:layout_width="wrap_content"
@@ -74,9 +75,9 @@
                 android:id="@+id/notificationsBadge"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
-                android:layout_alignLeft="@id/notificationsButton"
+                android:layout_alignStart="@id/notificationsButton"
                 android:layout_alignTop="@id/notificationsButton"
-                android:layout_marginLeft="13dp"
+                android:layout_marginStart="13dp"
                 android:layout_marginTop="-13dp"
                 android:background="@drawable/badge_circle"
                 android:gravity="center"
@@ -88,11 +89,11 @@
                 tools:text="1"
                 tools:visibility="visible" />
         </RelativeLayout>
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <RelativeLayout
             android:id="@+id/messagesButtonWrapper"
             android:layout_width="33dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="8dp">
+            android:layout_marginStart="8dp">
             <ImageView
                 android:id="@+id/messagesButton"
                 android:layout_width="wrap_content"
@@ -106,9 +107,9 @@
                 android:id="@+id/messagesBadge"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
-                android:layout_alignLeft="@id/messagesButton"
+                android:layout_alignStart="@id/messagesButton"
                 android:layout_alignTop="@id/messagesButton"
-                android:layout_marginLeft="13dp"
+                android:layout_marginStart="13dp"
                 android:layout_marginTop="-12dp"
                 android:background="@drawable/badge_circle"
                 android:gravity="center"
@@ -120,11 +121,11 @@
                 tools:text="1"
                 tools:visibility="visible" />
         </RelativeLayout>
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <RelativeLayout
             android:id="@+id/settingsButtonWrapper"
             android:layout_width="43dp"
             android:layout_height="match_parent"
-            android:paddingLeft="8dp">
+            android:paddingStart="8dp">
             <ImageView
                 android:id="@+id/settingsButton"
                 android:layout_width="wrap_content"
@@ -137,10 +138,10 @@
                 android:id="@+id/settingsBadge"
                 android:layout_width="wrap_content"
                 android:layout_height="20dp"
-                android:layout_alignLeft="@id/settingsButton"
+                android:layout_alignStart="@id/settingsButton"
                 android:layout_alignTop="@id/settingsButton"
                 android:layout_centerVertical="true"
-                android:layout_marginLeft="13dp"
+                android:layout_marginStart="13dp"
                 android:layout_marginTop="-12dp"
                 android:background="@drawable/badge_circle"
                 android:gravity="center"
diff --git a/Habitica/res/layout/fixvalues_edittext.xml b/Habitica/res/layout/fixvalues_edittext.xml
index f593f8e74..9a96a3015 100644
--- a/Habitica/res/layout/fixvalues_edittext.xml
+++ b/Habitica/res/layout/fixvalues_edittext.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-       xmlns:app="http://schemas.android.com/apk/res-auto"
        xmlns:tools="http://schemas.android.com/tools"
        android:orientation="horizontal"
        android:layout_width="match_parent"
@@ -12,7 +11,7 @@
         android:id="@+id/iconBackgroundView"
         android:layout_width="80dp"
         android:layout_height="match_parent"
-        android:layout_gravity="right"
+        android:layout_gravity="end"
         android:background="@color/red_500"/>
     <LinearLayout
         android:layout_height="match_parent"
@@ -24,7 +23,7 @@
             android:layout_weight="1"
             android:background="@drawable/layout_rounded_bg_gray_700"
             android:paddingTop="8dp"
-            android:paddingLeft="16dp">
+            android:paddingStart="16dp">
             <EditText
                 android:id="@+id/editText"
                 android:layout_width="match_parent"
@@ -43,5 +42,5 @@
         android:layout_height="2dp"
         android:layout_gravity="bottom"
         android:background="@color/gray_500"
-        android:layout_marginRight="56dp"/>
+        android:layout_marginEnd="56dp"/>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index 3b98608a8..b1e7eaed6 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:gravity="center"
             android:layout_marginTop="@dimen/spacing_medium"
-            android:textSize="@dimen/abc_text_size_small_material"
+            android:textSize="@dimen/card_small_text"
             tools:text="Version 1.0 (1)"/>
 
         <LinearLayout
@@ -57,7 +57,7 @@
             <TextView
                 android:layout_width="250dp"
                 android:layout_height="wrap_content"
-                android:text="See what's new"
+                android:text="@string/see_what_s_new"
                 android:gravity="center"
                 android:textColor="@color/brand_300"
                 />
@@ -71,27 +71,25 @@
             android:layout_marginTop="20sp"
             android:autoLink="web"
             android:text="\@habitica"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <TextView
-            android:id="@+id/webSite"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10sp"
             android:autoLink="web"
             android:text="www.habitica.com"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <TextView
-            android:id="@+id/wiki"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10sp"
             android:autoLink="web"
             android:text="http://habitica.wikia.com/"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <Button
             android:id="@+id/googlePlayStoreButton"
@@ -103,7 +101,7 @@
             android:text="@string/about.rate_our_app"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <Button
             android:id="@+id/reportBug"
@@ -115,7 +113,7 @@
             android:text="@string/about.bugreport"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <Button
             android:id="@+id/sendFeedback"
@@ -127,7 +125,7 @@
             android:text="@string/about.give_us_feedback"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/abc_text_size_medium_material" />
+            android:textSize="@dimen/card_medium_text" />
 
         <TextView
             android:id="@+id/sourceCodeLink"
@@ -136,7 +134,7 @@
             android:gravity="center"
             android:layout_marginTop="20sp"
             android:text="@string/about.habitica_open_source"
-            android:textSize="@dimen/abc_text_size_small_material" />
+            android:textSize="@dimen/card_small_text" />
 
         <Button
             android:id="@+id/sourceCodeButton"
@@ -148,8 +146,6 @@
             android:text="@string/about.source_code"
             android:textAllCaps="false"
             android:textColor="@color/white"
-            android:textSize="@dimen/abc_text_size_medium_material" />
-
-
+            android:textSize="@dimen/card_medium_text" />
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_avatar_overview.xml b/Habitica/res/layout/fragment_avatar_overview.xml
index 0ff93622b..a7fc72751 100644
--- a/Habitica/res/layout/fragment_avatar_overview.xml
+++ b/Habitica/res/layout/fragment_avatar_overview.xml
@@ -39,7 +39,6 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
-                        android:id="@+id/textView3"
                         android:layout_marginStart="8dp"
                         android:layout_marginLeft="8dp"
                         android:layout_marginEnd="8dp"
diff --git a/Habitica/res/layout/fragment_challenge_detail.xml b/Habitica/res/layout/fragment_challenge_detail.xml
index 92f71f053..3df8e873e 100644
--- a/Habitica/res/layout/fragment_challenge_detail.xml
+++ b/Habitica/res/layout/fragment_challenge_detail.xml
@@ -164,7 +164,6 @@
                     android:textSize="12sp"/>
             </LinearLayout>
             <ImageButton
-                android:id="@+id/creator_message_button"
                 android:layout_width="40dp"
                 android:layout_height="match_parent"
                 style="@style/Base.Widget.AppCompat.Button.Borderless"/>
diff --git a/Habitica/res/layout/fragment_fading_viewpager.xml b/Habitica/res/layout/fragment_fading_viewpager.xml
deleted file mode 100644
index 27ff6fb25..000000000
--- a/Habitica/res/layout/fragment_fading_viewpager.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.habitrpg.android.habitica.ui.views.FadingViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-                                   android:layout_width="match_parent"
-                                   android:layout_height="match_parent"
-                                   android:id="@+id/viewPager" />
\ No newline at end of file
diff --git a/Habitica/res/layout/fragment_gem_purchase.xml b/Habitica/res/layout/fragment_gem_purchase.xml
index fd63ca2d3..a4a4973d7 100644
--- a/Habitica/res/layout/fragment_gem_purchase.xml
+++ b/Habitica/res/layout/fragment_gem_purchase.xml
@@ -6,8 +6,7 @@
     android:scrollbarSize="3dp"
     android:scrollbarThumbVertical="@color/scrollbarThumb"
     android:scrollbars="vertical">
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
+    <LinearLayout xmlns:app="http://schemas.android.com/apk/res-auto"
         android:orientation="vertical" android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="20dp">
@@ -25,7 +24,6 @@
             android:textSize="14sp"
             android:lineSpacingExtra="4dp" />
         <TextView
-            android:id="@+id/notAvailableTextView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="@string/no_billing_gems"
@@ -33,7 +31,6 @@
             android:paddingBottom="10dp"
             android:visibility="gone" />
         <Button
-            android:id="@+id/notAvailableButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -42,7 +39,6 @@
             style="@style/HabiticaButton.Purple"
             android:visibility="gone" />
         <LinearLayout
-            android:id="@+id/gemPurchaseOptions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
diff --git a/Habitica/res/layout/fragment_guild_detail.xml b/Habitica/res/layout/fragment_guild_detail.xml
index dc5bf99f0..bed3ad46a 100644
--- a/Habitica/res/layout/fragment_guild_detail.xml
+++ b/Habitica/res/layout/fragment_guild_detail.xml
@@ -28,7 +28,8 @@
                 android:layout_height="wrap_content"
                 android:paddingStart="@dimen/spacing_large"
                 android:paddingEnd="@dimen/spacing_large"
-                android:paddingBottom="@dimen/spacing_medium">
+                android:paddingBottom="@dimen/spacing_medium"
+                android:baselineAligned="false">
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_weight="1"
@@ -141,7 +142,8 @@
                     android:layout_height="65dp"
                     android:gravity="center_vertical"
                     android:paddingStart="16dp"
-                    android:paddingEnd="16dp">
+                    android:paddingEnd="16dp"
+                    android:baselineAligned="false">
                     <com.habitrpg.android.habitica.ui.RoundedFrameLayout
                         android:layout_width="40dp"
                         android:layout_height="40dp"
diff --git a/Habitica/res/layout/fragment_party_detail.xml b/Habitica/res/layout/fragment_party_detail.xml
index e54f27e0a..e04174760 100644
--- a/Habitica/res/layout/fragment_party_detail.xml
+++ b/Habitica/res/layout/fragment_party_detail.xml
@@ -31,7 +31,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:orientation="horizontal"
-                        android:layout_gravity="right">
+                        android:layout_gravity="end">
 
                         <Button
                             android:id="@+id/party_invite_accept_button"
@@ -100,7 +100,7 @@
                             android:layout_weight="1"
                             android:layout_height="wrap_content"
                             android:orientation="vertical"
-                            android:paddingLeft="@dimen/spacing_medium">
+                            android:paddingStart="@dimen/spacing_medium">
                             <TextView
                                 android:id="@+id/quest_title_view"
                                 android:layout_width="match_parent"
@@ -154,7 +154,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/quest.accept"
                             style="@style/HabiticaButton.Green"
-                            android:layout_marginRight="16dp" />
+                            android:layout_marginEnd="16dp" />
 
                         <Button
                             android:id="@+id/quest_reject_button"
@@ -177,7 +177,7 @@
                             android:layout_height="wrap_content"
                             android:text="@string/quest.begin"
                             style="@style/HabiticaButton.Yellow"
-                            android:layout_marginRight="16dp" />
+                            android:layout_marginEnd="16dp" />
 
                         <Button
                             android:id="@+id/quest_cancel_button"
diff --git a/Habitica/res/layout/fragment_recyclerview.xml b/Habitica/res/layout/fragment_recyclerview.xml
index cbead274e..c7608e656 100644
--- a/Habitica/res/layout/fragment_recyclerview.xml
+++ b/Habitica/res/layout/fragment_recyclerview.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/coordinatorLayout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
diff --git a/Habitica/res/layout/fragment_refresh_recyclerview.xml b/Habitica/res/layout/fragment_refresh_recyclerview.xml
index 7f97ebea8..8ed29adba 100644
--- a/Habitica/res/layout/fragment_refresh_recyclerview.xml
+++ b/Habitica/res/layout/fragment_refresh_recyclerview.xml
@@ -7,7 +7,6 @@
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior">
     <FrameLayout
-        android:id="@+id/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
diff --git a/Habitica/res/layout/fragment_shop.xml b/Habitica/res/layout/fragment_shop.xml
deleted file mode 100644
index 261e6764e..000000000
--- a/Habitica/res/layout/fragment_shop.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/coordinatorLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            style="@style/FragmentDialogTitle"
-            android:id="@+id/titleTextView"
-            android:background="?colorPrimary"
-            android:textColor="@android:color/white" />
-        <com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport
-            android:id="@+id/recyclerView"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:scrollbarSize="3dp"
-            android:scrollbarThumbVertical="@color/scrollbarThumb"
-            android:scrollbars="vertical"
-            />
-
-        <FrameLayout
-            android:id="@+id/emptyView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:gravity="center" />
-    </LinearLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/Habitica/res/layout/fragment_subscription.xml b/Habitica/res/layout/fragment_subscription.xml
index ea2e954fd..fcb1c1909 100644
--- a/Habitica/res/layout/fragment_subscription.xml
+++ b/Habitica/res/layout/fragment_subscription.xml
@@ -209,7 +209,6 @@
 
 
             <TextView
-                android:id="@+id/notAvailableTextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@string/no_billing_subscriptions"
@@ -217,7 +216,6 @@
                 android:paddingBottom="10dp"
                 android:visibility="gone" />
             <Button
-                android:id="@+id/notAvailableButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
diff --git a/Habitica/res/layout/fragment_tavern_detail.xml b/Habitica/res/layout/fragment_tavern_detail.xml
index a46a7ea21..d3a994461 100644
--- a/Habitica/res/layout/fragment_tavern_detail.xml
+++ b/Habitica/res/layout/fragment_tavern_detail.xml
@@ -84,7 +84,6 @@
             android:layout_marginTop="@dimen/spacing_large"/>
     </com.habitrpg.android.habitica.ui.views.CollapsibleSectionView>
     <com.habitrpg.android.habitica.ui.views.CollapsibleSectionView
-        android:id="@+id/moderatorsView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:title="@string/staff_moderators"
diff --git a/Habitica/res/layout/fragment_welcome.xml b/Habitica/res/layout/fragment_welcome.xml
index 4e26eb932..96d1830d5 100644
--- a/Habitica/res/layout/fragment_welcome.xml
+++ b/Habitica/res/layout/fragment_welcome.xml
@@ -9,7 +9,7 @@
 <LinearLayout
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:paddingLeft="@dimen/spacing_large"
     android:paddingRight="@dimen/spacing_large"
     android:paddingTop="32dp"
diff --git a/Habitica/res/layout/item_inbox_overview.xml b/Habitica/res/layout/item_inbox_overview.xml
index 40b8afe8c..c0374992c 100644
--- a/Habitica/res/layout/item_inbox_overview.xml
+++ b/Habitica/res/layout/item_inbox_overview.xml
@@ -4,7 +4,8 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/spacing_large">
+    android:padding="@dimen/spacing_large"
+    android:baselineAligned="false">
     <com.habitrpg.android.habitica.ui.RoundedFrameLayout
         android:layout_width="@dimen/avatar_chat_size"
         android:layout_height="@dimen/avatar_chat_size"
diff --git a/Habitica/res/layout/no_notifications.xml b/Habitica/res/layout/no_notifications.xml
index 56b4de376..1e14fd4cd 100644
--- a/Habitica/res/layout/no_notifications.xml
+++ b/Habitica/res/layout/no_notifications.xml
@@ -3,7 +3,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:padding="@dimen/spacing_large">
+    android:padding="@dimen/spacing_large"
+    android:baselineAligned="false">
 
     <LinearLayout
         android:layout_width="0dp"
@@ -15,7 +16,6 @@
         android:paddingRight="@dimen/spacing_medium">
 
         <ImageView
-            android:id="@+id/noNotifications"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:background="@color/transparent"
diff --git a/Habitica/res/layout/normal_list_preference_row.xml b/Habitica/res/layout/normal_list_preference_row.xml
deleted file mode 100644
index 075f7e136..000000000
--- a/Habitica/res/layout/normal_list_preference_row.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:paddingBottom="8dip"
-    android:paddingTop="8dip"
-    android:paddingLeft="10dip"
-    android:paddingRight="10dip">
-
-    <TableLayout
-        android:id="@+id/custom_list_view_row_table_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:stretchColumns="0">
-
-        <TableRow
-            android:id="@+id/custom_list_view_row_table_row"
-            android:gravity="center_vertical"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/custom_list_view_row_text_view"
-                android:textSize="22sp"
-                android:textColor="#000000"  
-                android:gravity="center_vertical"
-                android:layout_width="160dip" 
-                android:layout_height="40dip" />
-
-            <RadioButton
-                android:checked="false"
-                android:id="@+id/custom_list_view_row_radio_button"/>
-        </TableRow>
-    </TableLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/notification_item_actionable.xml b/Habitica/res/layout/notification_item_actionable.xml
index 4af757530..e772184b0 100644
--- a/Habitica/res/layout/notification_item_actionable.xml
+++ b/Habitica/res/layout/notification_item_actionable.xml
@@ -55,7 +55,6 @@
         </TableRow>
 
         <TableRow
-            android:id="@+id/difficulty_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical">
diff --git a/Habitica/res/layout/notifications_header.xml b/Habitica/res/layout/notifications_header.xml
index b139c9250..a03897f70 100644
--- a/Habitica/res/layout/notifications_header.xml
+++ b/Habitica/res/layout/notifications_header.xml
@@ -17,7 +17,7 @@
         android:orientation="horizontal"
         android:paddingTop="@dimen/spacing_medium">
 
-        <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        <TextView
             android:id="@android:id/title"
             style="@style/Body1"
             android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/party_member_quest.xml b/Habitica/res/layout/party_member_quest.xml
deleted file mode 100644
index 62ae349a8..000000000
--- a/Habitica/res/layout/party_member_quest.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_margin="5dp"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_margin="5dp"
-        android:orientation="horizontal">
-
-
-        <TextView
-            android:id="@+id/username"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            tools:text="username"
-            android:layout_weight="1" />
-
-        <TextView
-            android:id="@+id/rsvpneeded"
-            android:layout_width="150dp"
-            android:layout_height="wrap_content"
-            tools:text="response" />
-
-
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/preference_child_summary_error.xml b/Habitica/res/layout/preference_child_summary_error.xml
index 14076d1e5..924677962 100644
--- a/Habitica/res/layout/preference_child_summary_error.xml
+++ b/Habitica/res/layout/preference_child_summary_error.xml
@@ -32,7 +32,6 @@
             tools:text="Title"/>
 
         <TextView
-            android:id="@+id/summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignLeft="@android:id/title"
@@ -41,7 +40,7 @@
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/red_10" />
     </RelativeLayout>
-    <LinearLayout android:id="@+id/widget_frame"
+    <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center_vertical"
diff --git a/Habitica/res/layout/profile_achievement_item.xml b/Habitica/res/layout/profile_achievement_item.xml
index 6ae424801..ef6bab6f1 100644
--- a/Habitica/res/layout/profile_achievement_item.xml
+++ b/Habitica/res/layout/profile_achievement_item.xml
@@ -2,8 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
               xmlns:fresco="http://schemas.android.com/apk/res-auto"
               xmlns:tools="http://schemas.android.com/tools"
-              android:id="@+id/achievement_item_layout"
-              android:layout_width="match_parent"
+    android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:layout_margin="10dp"
               android:orientation="vertical">
diff --git a/Habitica/res/layout/qr_code.xml b/Habitica/res/layout/qr_code.xml
deleted file mode 100644
index 0194c200e..000000000
--- a/Habitica/res/layout/qr_code.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:id="@+id/qrLayout"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/qr_section_title"
-        style="@style/SectionTitle"
-        android:layout_gravity="center"
-        android:layout_marginTop="40dp"
-         />
-
-    <FrameLayout
-        android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="300dp"
-        android:id="@+id/qrCodeWrapper">
-
-        <com.facebook.drawee.view.SimpleDraweeView
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:id="@+id/QRImageView"
-            android:layout_gravity="center" />
-
-        <RelativeLayout
-            android:orientation="vertical"
-            android:layout_width="60dp"
-            android:layout_height="60dp"
-            android:layout_gravity="center"
-            android:background="@color/white"
-            android:clipChildren="true"
-            android:padding="1dp"
-                        android:visibility="gone"
-            >
-            <com.habitrpg.android.habitica.ui.AvatarView
-                android:id="@+id/avatarView"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_centerHorizontal="true"
-                android:layout_centerVertical="true"
-                />
-        </RelativeLayout>
-    </FrameLayout>
-
-    <Button
-        android:id="@+id/QRDownloadButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/download"
-        style="@style/Widget.AppCompat.Button.Colored"
-        android:layout_margin="20dp"
-        android:layout_gravity="center_horizontal|bottom"
-        />
-
-</LinearLayout>
-
diff --git a/Habitica/res/layout/qr_dialogue.xml b/Habitica/res/layout/qr_dialogue.xml
deleted file mode 100644
index d5e10426d..000000000
--- a/Habitica/res/layout/qr_dialogue.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content" >
-
-    <include
-        layout="@layout/qr_code" />
-
-    <Button
-        android:id="@+id/dialogButtonOK"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/profile_qrcode_close"
-        android:layout_marginTop="5dp"
-        android:layout_marginRight="5dp"
-        android:layout_centerHorizontal="true"
-        />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/refresh_actionview.xml b/Habitica/res/layout/refresh_actionview.xml
deleted file mode 100644
index 94905ec38..000000000
--- a/Habitica/res/layout/refresh_actionview.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:src="@drawable/ic_refresh_white"
-    style="@style/Widget.AppCompat.ActionButton"/>
\ No newline at end of file
diff --git a/Habitica/res/layout/reminder_item.xml b/Habitica/res/layout/reminder_item.xml
deleted file mode 100644
index 98f0489e0..000000000
--- a/Habitica/res/layout/reminder_item.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp">
-
-    <EditText
-        android:id="@+id/item_edittext"
-        android:layout_width="0dp"
-        android:layout_weight="1"
-        android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-        android:focusable="false"
-            android:inputType="date"/>
-
-    <Button
-        style="?android:attr/buttonStyleSmall"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/delete_item_button"
-        android:text="x" />
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/reward_item_card.xml b/Habitica/res/layout/reward_item_card.xml
index fa2aeeb37..1a84a1846 100644
--- a/Habitica/res/layout/reward_item_card.xml
+++ b/Habitica/res/layout/reward_item_card.xml
@@ -6,14 +6,12 @@
     android:background="@color/white">
 
     <LinearLayout
-        android:id="@+id/gearElementsLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clickable="false"
         android:orientation="horizontal">
 
         <ImageView
-            android:id="@+id/rewardImageView"
             android:layout_width="40dp"
             android:layout_height="30dp"
             android:layout_gravity="center_vertical"
@@ -22,7 +20,6 @@
             android:src="@drawable/icon_custom_reward" />
 
         <LinearLayout
-            android:id="@+id/textReward"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/Habitica/res/layout/row_checklist.xml b/Habitica/res/layout/row_checklist.xml
deleted file mode 100644
index 081d7855a..000000000
--- a/Habitica/res/layout/row_checklist.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <CheckBox
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/checkbox"
-            android:layout_marginTop="0dp" />
-</TableRow>
\ No newline at end of file
diff --git a/Habitica/res/layout/row_number_picker.xml b/Habitica/res/layout/row_number_picker.xml
deleted file mode 100644
index 63c60ab06..000000000
--- a/Habitica/res/layout/row_number_picker.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="72dp">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:id="@+id/label"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:layout_centerVertical="true"
-        android:layout_marginTop="11dp" />
-
-    <NumberPicker
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/numberPicker"
-        android:layout_toRightOf="@id/label"
-        android:layout_toEndOf="@id/label"
-        android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true" />
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/shop_header.xml b/Habitica/res/layout/shop_header.xml
index 84951777e..0a3b09b4c 100644
--- a/Habitica/res/layout/shop_header.xml
+++ b/Habitica/res/layout/shop_header.xml
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:fresco="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    tools:parentTag="FrameLayout">
 
     <com.habitrpg.android.habitica.ui.views.NPCBannerView
         android:id="@+id/npcBannerView"
@@ -38,4 +39,4 @@
         android:layout_marginBottom="4dp"
         style="@style/Body1"
         tools:text="Welcome to the Market! Stock up on new gear or buy rare eggs and potions. Check in periodically for new stock." />
-</FrameLayout>
\ No newline at end of file
+</merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/simple_widget.xml b/Habitica/res/layout/simple_widget.xml
deleted file mode 100644
index d772e91e7..000000000
--- a/Habitica/res/layout/simple_widget.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="horizontal"
-    android:id="@+id/widget_main_view"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center"
-    android:focusable="true"
-    android:focusableInTouchMode="true"
-    >
-    <ImageView
-        android:id="@+id/IMG_ProfilePicture"
-        android:layout_width="@dimen/avatar_width"
-        android:layout_height="@dimen/avatar_height"
-        android:layout_gravity="center"
-        android:scaleType="fitStart"
-        android:src="@mipmap/ic_launcher"
-        />
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        >
-    <LinearLayout
-        android:id="@+id/LL_header"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/avatar_height"
-        android:orientation="vertical"
-        android:gravity="center_vertical"
-        android:paddingRight="@dimen/widget_bar_horizontal_margin"
-        >
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bar_size"
-                android:background="@drawable/border"
-                android:layout_marginBottom="@dimen/bar_padding"
-                >
-                <ProgressBar android:id="@+id/V_HPBar"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/bar_size"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:progressDrawable="@drawable/progressbar_red"
-                    android:visibility="visible" />
-                <TextView
-                    android:id="@+id/TV_HP"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/bar_size"
-                    android:gravity="center|right"
-                    android:background="@drawable/border"
-                    android:paddingRight="5dp"
-                    android:text="HP" />
-
-            </FrameLayout>
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/bar_size"
-                android:background="@drawable/border"
-                >
-                <ProgressBar android:id="@+id/V_XPBar"
-                    style="?android:attr/progressBarStyleHorizontal"
-
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/bar_size"
-                    android:progressDrawable="@drawable/progressbar_yellow"
-                    />
-                <TextView
-                    android:id="@+id/TV_XP"
-                    android:layout_width="match_parent"
-                    android:layout_height="@dimen/bar_size"
-                    android:gravity="center|right"
-                    android:background="@drawable/border"
-                    android:paddingRight="5dp"
-                    android:text="XP" />
-            </FrameLayout>
-        </LinearLayout>
-        <ImageButton
-            android:id="@+id/BT_refresh"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:scaleType="fitStart"
-            android:src="@drawable/ic_menu_refresh"
-            android:layout_gravity="top|right"
-            android:layout_marginTop="5dp"
-            android:background="@color/transparent"
-            />
-    </FrameLayout>
-
-</LinearLayout>
-
diff --git a/Habitica/res/layout/skill_task_item_card.xml b/Habitica/res/layout/skill_task_item_card.xml
index 413c473a5..dd66c4bd7 100644
--- a/Habitica/res/layout/skill_task_item_card.xml
+++ b/Habitica/res/layout/skill_task_item_card.xml
@@ -44,7 +44,6 @@
         </RelativeLayout>
     </LinearLayout>
     <View
-        android:id="@+id/bottomBorderView"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         android:background="@color/cell_separator"/>
diff --git a/Habitica/res/layout/task_form_task_scheduling.xml b/Habitica/res/layout/task_form_task_scheduling.xml
index 0696fc951..f97c08c25 100644
--- a/Habitica/res/layout/task_form_task_scheduling.xml
+++ b/Habitica/res/layout/task_form_task_scheduling.xml
@@ -29,7 +29,7 @@
         <TextView
             android:id="@+id/start_date_textview"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             android:layout_weight="1"
             android:textSize="16sp"
             tools:text="Thu, November 2, 2017"
@@ -39,7 +39,8 @@
         android:id="@+id/repeats_every_wrapper"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:baselineAligned="false">
         <LinearLayout
             android:layout_width="0dp"
             android:layout_weight="1"
@@ -52,7 +53,7 @@
             android:paddingEnd="@dimen/spacing_large"
             android:paddingBottom="@dimen/spacing_medium"
             android:layout_marginBottom="@dimen/spacing_large"
-            android:layout_marginRight="@dimen/spacing_medium">
+            android:layout_marginEnd="@dimen/spacing_medium">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -78,7 +79,7 @@
             android:paddingEnd="@dimen/spacing_large"
             android:paddingBottom="@dimen/spacing_medium"
             android:layout_marginBottom="@dimen/spacing_large"
-            android:layout_marginLeft="@dimen/spacing_medium">
+            android:layout_marginStart="@dimen/spacing_medium">
 
             <TextView
                 android:layout_width="wrap_content"
diff --git a/Habitica/res/layout/tasks_duedate.xml b/Habitica/res/layout/tasks_duedate.xml
deleted file mode 100644
index 61d00f444..000000000
--- a/Habitica/res/layout/tasks_duedate.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/due_date"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <LinearLayout
-        android:id="@+id/task_duedate_picker_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal">
-
-        <CheckBox
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:text="@string/todo_has_duedate"
-            android:id="@+id/duedate_checkbox" />
-
-        <EditText
-            android:id="@+id/duedate_text_edittext"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="4dp"
-            android:hint="@string/due_date"
-            android:textColor="@android:color/black"
-            android:focusable="false" />
-    </LinearLayout>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/tasks_startdate.xml b/Habitica/res/layout/tasks_startdate.xml
deleted file mode 100644
index 7423d86e6..000000000
--- a/Habitica/res/layout/tasks_startdate.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:text="@string/start_date"
-        android:id="@+id/startdate_text_title"
-        android:textAppearance="?android:attr/textAppearanceLarge" />
-
-    <EditText
-        android:id="@+id/startdate_text_edittext"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:hint="@string/start_date"
-        android:textColor="@android:color/black"
-        android:focusable="false" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/Habitica/res/layout/tavern_chat_new_entry_item.xml b/Habitica/res/layout/tavern_chat_new_entry_item.xml
index e919baead..05c31bba4 100644
--- a/Habitica/res/layout/tavern_chat_new_entry_item.xml
+++ b/Habitica/res/layout/tavern_chat_new_entry_item.xml
@@ -8,7 +8,8 @@
             android:orientation="horizontal"
             android:layout_height="wrap_content"
             android:paddingLeft="@dimen/spacing_medium"
-            android:paddingRight="@dimen/spacing_medium">
+            android:paddingRight="@dimen/spacing_medium"
+            android:baselineAligned="false">
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="0dp"
diff --git a/Habitica/res/layout/value_bar.xml b/Habitica/res/layout/value_bar.xml
index 17d25b0f3..cdd3d63ba 100644
--- a/Habitica/res/layout/value_bar.xml
+++ b/Habitica/res/layout/value_bar.xml
@@ -2,8 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
                 xmlns:tools="http://schemas.android.com/tools"
-                android:id="@+id/value_bar_layout"
-                android:layout_width="match_parent"
+    android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/bar_padding"
                 android:orientation="horizontal">
diff --git a/Habitica/res/layout/view_collapsible_section.xml b/Habitica/res/layout/view_collapsible_section.xml
index d24fc34a2..0b5a9d6f7 100644
--- a/Habitica/res/layout/view_collapsible_section.xml
+++ b/Habitica/res/layout/view_collapsible_section.xml
@@ -35,13 +35,13 @@
                 android:id="@+id/infoIconView"
                 android:layout_width="18dp"
                 android:layout_height="18dp"
-                android:layout_gravity="center_vertical|left"/>
+                android:layout_gravity="center_vertical|start"/>
         </FrameLayout>
         <ImageView
             android:id="@+id/caretView"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:scaleType="center"
-            android:paddingRight="32dp" />
+            android:paddingEnd="32dp" />
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/Habitica/res/layout/widget_avatar_stats.xml b/Habitica/res/layout/widget_avatar_stats.xml
index 3d89177e4..c7aa396ed 100644
--- a/Habitica/res/layout/widget_avatar_stats.xml
+++ b/Habitica/res/layout/widget_avatar_stats.xml
@@ -26,13 +26,11 @@
             android:adjustViewBounds="true"
             tools:ignore="ContentDescription" />
         <LinearLayout
-            android:id="@+id/LL_header"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_gravity="center_vertical">
             <RelativeLayout
-                android:id="@+id/hp_wrapper"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/bar_padding"
@@ -72,7 +70,6 @@
                         android:textColor="@color/brand_500"
                         android:textSize="12sp"/>
                     <TextView
-                        android:id="@+id/TV_hp_label"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:gravity="center|end"
@@ -84,7 +81,6 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/exp_wrapper"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal">
@@ -123,7 +119,6 @@
                         android:textColor="@color/brand_500"
                         android:textSize="12sp"/>
                     <TextView
-                        android:id="@+id/exp_TV_label"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:gravity="center|end"
@@ -175,7 +170,6 @@
                         android:textColor="@color/brand_500"
                         android:textSize="12sp"/>
                     <TextView
-                        android:id="@+id/mp_TV_label"
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:gravity="center|end"
diff --git a/Habitica/res/layout/world_boss_description_view.xml b/Habitica/res/layout/world_boss_description_view.xml
index cd1c4e507..202dafccb 100644
--- a/Habitica/res/layout/world_boss_description_view.xml
+++ b/Habitica/res/layout/world_boss_description_view.xml
@@ -19,7 +19,7 @@
         <View
             android:layout_width="@dimen/bullet_size"
             android:layout_height="@dimen/bullet_size"
-            android:layout_marginRight="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:background="@drawable/layout_rounded_bg_gray_50"
             android:layout_marginTop="8dp"/>
         <TextView
@@ -35,7 +35,7 @@
         <View
             android:layout_width="@dimen/bullet_size"
             android:layout_height="@dimen/bullet_size"
-            android:layout_marginRight="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:background="@drawable/layout_rounded_bg_gray_50"
             android:layout_marginTop="8dp"/>
         <TextView
@@ -51,7 +51,7 @@
         <View
             android:layout_width="@dimen/bullet_size"
             android:layout_height="@dimen/bullet_size"
-            android:layout_marginRight="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:background="@drawable/layout_rounded_bg_gray_50"
             android:layout_marginTop="8dp"/>
         <TextView
@@ -67,7 +67,7 @@
         <View
             android:layout_width="@dimen/bullet_size"
             android:layout_height="@dimen/bullet_size"
-            android:layout_marginRight="@dimen/spacing_medium"
+            android:layout_marginEnd="@dimen/spacing_medium"
             android:background="@drawable/layout_rounded_bg_gray_50"
             android:layout_marginTop="8dp"/>
         <TextView
diff --git a/Habitica/res/menu/challenge_admin.xml b/Habitica/res/menu/challenge_admin.xml
deleted file mode 100644
index 6f83b31c7..000000000
--- a/Habitica/res/menu/challenge_admin.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_challenge_edit"
-        android:orderInCategory="1"
-        android:title="@string/action_edit" />
-
-</menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/chat_message.xml b/Habitica/res/menu/chat_message.xml
deleted file mode 100644
index 1e8266daf..000000000
--- a/Habitica/res/menu/chat_message.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-        android:id="@+id/menu.chat.copy.as.todo"
-        android:icon="@drawable/ic_launch_black_24dp"
-        android:title="@string/copy_as_todo" />
-    <item
-        android:id="@+id/menu.chat.send.pm"
-        android:icon="@drawable/ic_chat_black_24dp"
-        android:title="@string/send_pm" />
-    <group>
-        <item
-                android:id="@+id/menu.chat.copy"
-                android:icon="@drawable/ic_content_copy_black_24dp"
-                app:showAsAction="always|withText"
-                android:title="@string/copy_chat_message" />
-        <item
-            android:id="@+id/menu.chat.flag"
-            android:icon="@drawable/ic_flag_black_24dp"
-            app:showAsAction="always|withText"
-            android:title="@string/flag" />
-        <item
-            android:id="@+id/menu.chat.delete"
-            android:icon="@drawable/ic_delete_black_24dp"
-            android:title="@string/delete" />
-    </group>
-</menu>
diff --git a/Habitica/res/menu/inbox.xml b/Habitica/res/menu/inbox.xml
deleted file mode 100644
index 03e0a2762..000000000
--- a/Habitica/res/menu/inbox.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
-    <item
-            android:id="@+id/send_message"
-            android:title="@string/send_new_message"
-            android:icon="@drawable/ic_action_chat"
-            app:showAsAction="always"
-            />
-</menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/login.xml b/Habitica/res/menu/login.xml
deleted file mode 100644
index 7411ecca0..000000000
--- a/Habitica/res/menu/login.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:app="http://schemas.android.com/apk/res-auto">
-	<item
-			android:id="@+id/action_toggleRegistering"
-			android:orderInCategory="1"
-			app:showAsAction="ifRoom"
-			android:title="@string/login_btn"/>
-
-</menu>
\ No newline at end of file
diff --git a/Habitica/res/menu/main_menu_tasks.xml b/Habitica/res/menu/main_menu_tasks.xml
deleted file mode 100644
index 9a4f8b695..000000000
--- a/Habitica/res/menu/main_menu_tasks.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/tab_habits"
-        android:title="@string/habits"
-        android:icon="@drawable/icon_habits_selected" />
-    <item android:id="@+id/tab_dailies"
-        android:title="@string/dailies"
-        android:icon="@drawable/icon_dailies_selected" />
-    <item android:id="@+id/add"
-        android:icon="@drawable/md_transparent"
-        />
-    <item android:id="@+id/tab_todos"
-        android:title="@string/todos"
-        android:icon="@drawable/icon_todos_selected" />
-    <item android:id="@+id/tab_rewards"
-        android:title="@string/rewards"
-        android:icon="@drawable/icon_rewards_selected" />
-</menu>
\ No newline at end of file
diff --git a/Habitica/res/values-bg/strings.profile.xml b/Habitica/res/values-bg/strings.profile.xml
index fe9695e9d..ca65ba3f6 100644
--- a/Habitica/res/values-bg/strings.profile.xml
+++ b/Habitica/res/values-bg/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <string name="profile_achievement_ok">Добре</string>
-    <string name="profile_qrcode_close">Затваряне</string>
 
 </resources>
diff --git a/Habitica/res/values-bg/strings.sidebar.xml b/Habitica/res/values-bg/strings.sidebar.xml
index 63f55e193..781dd9041 100644
--- a/Habitica/res/values-bg/strings.sidebar.xml
+++ b/Habitica/res/values-bg/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Задачи</string>
-  <string name="sidebar.skills">Умения</string>
-  <string name="sidebar.section.social">Общност</string>
-  <string name="sidebar.inbox">Съобщения</string>
-  <string name="sidebar.tavern">Кръчма</string>
-  <string name="sidebar.party">Група</string>
-  <string name="sidebar.purchaseGems">Купуване на диаманти</string>
-  <string name="sidebar.guilds">Гилдии</string>
-  <string name="sidebar.challenges">Предизвикателства</string>
-  <string name="sidebar.section.inventory">Инвентар</string>
-  <string name="sidebar.avatar">Герой</string>
-  <string name="sidebar.equipment">Екипировка</string>
-  <string name="sidebar.stable">Конюшня</string>
-  <string name="sidebar.news">Новини</string>
-  <string name="sidebar.settings">Настройки</string>
-  <string name="sidebar.about">Относно</string>
+  <string name="sidebar_tasks">Задачи</string>
+  <string name="sidebar_skills">Умения</string>
+  <string name="sidebar.section_social">Общност</string>
+  <string name="sidebar_inbox">Съобщения</string>
+  <string name="sidebar_tavern">Кръчма</string>
+  <string name="sidebar_party">Група</string>
+  <string name="sidebar_purchaseGems">Купуване на диаманти</string>
+  <string name="sidebar_guilds">Гилдии</string>
+  <string name="sidebar_challenges">Предизвикателства</string>
+  <string name="sidebar.section_inventory">Инвентар</string>
+  <string name="sidebar_avatar">Герой</string>
+  <string name="sidebar_equipment">Екипировка</string>
+  <string name="sidebar_stable">Конюшня</string>
+  <string name="sidebar_news">Новини</string>
+    <string name="sidebar_about">Относно</string>
   <string name="sidebar_shops">Магазини</string>
   <string name="sidebar_stats">Показатели</string>
 </resources>
diff --git a/Habitica/res/values-bg/strings.tutorial.xml b/Habitica/res/values-bg/strings.tutorial.xml
index d2c9b6c28..610cc0764 100644
--- a/Habitica/res/values-bg/strings.tutorial.xml
+++ b/Habitica/res/values-bg/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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_skills">Уменията са специални способности, които имат мощни ефекти! Докоснете умение, за да го използвате. Това ще Ви струва мана (синята лента), която се възстановява при влизане в играта всеки ден, както и кагато изпълнявате задачите от истинския си живот. Прегледайте ЧЗВ в менюто за повече информация!</string>
+    <string name="tutorial_skills">Уменията са специални способности, които имат мощни ефекти! Докоснете умение, за да го използвате. Това ще Ви струва мана (синята лента), която се възстановява при влизане в играта всеки ден, както и кагато изпълнявате задачите от истинския си живот. Прегледайте ЧЗВ в менюто за повече информация!</string>
   <string name="tutorial_party">Тук е мястото, където заедно с приятелите си можете взаимно да се държите отговорни за изпълнението на целите си, както и да се биете срещу чудовища със задачите си!</string>
   <string name="tutorial_tavern">Добре дошли в кръчмата — обществено място за разговори, достъпно за хора от всички възрасти! Тук можете да разговаряте за продуктивността си и да задавате въпроси. Приятно прекарване!</string>
-  <string name="tutorial_classes">Изберете дали да бъдете воин, магьосник, лечител или мошеник! Всеки клас има уникална екипировка и умения. Докоснете (?), за да научите повече!</string>
-  <string name="tutorial_stats">Докоснете сивия бутон, за да разпределите по много от точките си наведнъж, или докоснете стрелките, за да добавяте по една точка.</string>
+    <string name="tutorial_stats">Докоснете сивия бутон, за да разпределите по много от точките си наведнъж, или докоснете стрелките, за да добавяте по една точка.</string>
 </resources>
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 1c5406498..3b1fb948c 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Опит</string>
   <string name="HP_default">Здраве</string>
   <string name="MP_default">Мана</string>
-  <string name="ERR_pb_barcode">Настройките не могат да бъдат заредени от кода</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Настройки</string>
-  <string name="SP_address_hint">Вашият персонализиран сървър</string>
-  <string name="SP_userID_title">Потребителски идентификатор</string>
+    <string name="SP_userID_title">Потребителски идентификатор</string>
   <string name="SP_userID_summary">Вашият потребителски идентификатор</string>
   <string name="SP_APIToken_title">Жетон за ППИ</string>
   <string name="SP_APIToken_summary">Вашият жетон за ППИ</string>
   <string name="Language_title">Език</string>
   <string name="Language_summary">Промяна на езика на Хабитика</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="PS_contact_title">Свържете се с мен</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_reminder_header">Ежедневно напомняне</string>
   <string name="pref_reminder_checkbox">Включване на напомнянето</string>
   <string name="pref_reminder_picker">Задаване на времето за напомняне</string>
   <string name="pref_cds_header">Персонализирано начало на деня</string>
-  <string name="pref_cds_picker">Задаване на персонализирано начало на деня</string>
-  <string name="pref_push_notifications_checkbox">Потребителски известия</string>
+    <string name="pref_push_notifications_checkbox">Потребителски известия</string>
   <string name="push_notifications">Известия</string>
   <string name="push_notifications_sum">Настройте известията си</string>
   <string name="preference_push_you_won_challenge">Спечелихте предизвикателство!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Мисията Ви започна</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>
+    <string name="action_edit">Редактиране</string>
+    <string name="action_cancel">Отказ</string>
   <string name="login_btn">Вход</string>
   <string name="register_btn">Регистрация</string>
   <string name="username">Потребителско име</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Потвърдете паролата</string>
   <string name="logout">Изход</string>
   <string name="logout_description">Излизане от Вашия профил</string>
-  <string name="account_details">Подробности за профила</string>
-  <string name="LoginActivityName">Добре дошли</string>
-  <string name="string_revive">Съживяване</string>
-  <string name="please_connect">Моля, свържете се чрез приложението, преди да използвате джаджа</string>
-  <string name="about.title">Относно</string>
-  <string name="about.libraries">Библиотеки</string>
-  <string name="about.versionhistory">История на версиите</string>
-  <string name="about.habitica_open_source">Хабитика е софтуер с отворен код, който е наличен в Github</string>
-  <string name="about.rate_our_app">Оценете приложението</string>
-  <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="LoginActivityName">Добре дошли</string>
+    <string name="about_title">Относно</string>
+  <string name="about_libraries">Библиотеки</string>
+    <string name="about_habitica_open_source">Хабитика е софтуер с отворен код, който е наличен в Github</string>
+  <string name="about_rate_our_app">Оценете приложението</string>
+  <string name="about_give_us_feedback">Изпратете ни отзивите си!</string>
+  <string name="about_bugreport">Докладване на проблем</string>
+  <string name="about_source_code">Изходен код</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Изглежда има проблем със сървъра. Опитайте отново по-късно.</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_title">Грешка при проверяването</string>
   <string name="login_validation_error_fieldsmissing">Трябва да попълните всички полета.</string>
   <string name="save_changes">Запазване</string>
   <string name="copy">Копиране</string>
   <string name="notes">Бележки</string>
-  <string name="text">Текст</string>
-  <string name="difficulty">Трудност</string>
+    <string name="difficulty">Трудност</string>
   <string name="tags">Етикети</string>
   <string name="trivial">Елементарно</string>
   <string name="easy">Лесно</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Отрицателен ( - )</string>
   <string name="checklist">Подзадачи</string>
   <string name="reminders">Напомняния</string>
-  <string name="actions">Действия</string>
-  <string name="attributes">Показатели</string>
-  <string name="physical">Сила</string>
-  <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>
-  <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="attributes">Показатели</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>
@@ -123,24 +92,15 @@
   <string name="faint_header">Здравето Ви свърши!</string>
   <string name="faint_button">Възстановете здравето си и опитайте отново</string>
   <string name="filter">Филтър</string>
-  <string name="profile_image">Профилно изображение</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="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>
-  <string name="flag_confirm">Докладване на съобщението</string>
-  <string name="unlock_lvl_11">Оключва се на ниво 11</string>
-  <string name="no_party_message">Вие не участвате в група. За да се присъедините към група, моля, посетете уеб сайта.</string>
-  <string name="forgot_pw_btn">Забравена парола</string>
-  <string name="tavern.inn.checkOut">Включете отново ежедневните си задачи</string>
-  <string name="tavern.inn.rest">Пауза на ежедн</string>
-  <string name="reward.dialog.buy">Купуване</string>
-  <string name="reward.dialog.dismiss">Премахване</string>
+    <string name="reminder_title">Не забравяйте да отметнете задачите си</string>
+    <string name="unlock_lvl_11">Оключва се на ниво 11</string>
+    <string name="forgot_pw_btn">Забравена парола</string>
+  <string name="tavern_inn_checkOut">Включете отново ежедневните си задачи</string>
+  <string name="tavern_inn_rest">Пауза на ежедн</string>
+  <string name="reward_dialog_buy">Купуване</string>
+  <string name="reward_dialog_dismiss">Премахване</string>
   <string name="party">Група</string>
   <string name="chat">Чат</string>
   <string name="members">Членове</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Ежедн</string>
   <string name="todos">Задачи</string>
   <string name="rewards">Награди</string>
-  <string name="taskform.delete.title">Сигурен/на ли сте?</string>
-  <string name="taskform.delete.message">Наистина ли искате да изтриете това?</string>
-  <string name="yes">Да</string>
+    <string name="yes">Да</string>
   <string name="no">Не</string>
   <string name="quest">Мисия</string>
   <string name="avatar_body">Тяло</string>
   <string name="avatar_hair">Коса</string>
   <string name="avatar_shirt">Риза</string>
   <string name="avatar_skin">Кожа</string>
-  <string name="avatar_ears">Животински уши</string>
-  <string name="avatar_base">Основа</string>
+    <string name="avatar_base">Основа</string>
   <string name="avatar_color">Цвят</string>
   <string name="avatar_beard">Брада</string>
   <string name="avatar_mustache">Мустаци</string>
   <string name="avatar_flower">Цвете</string>
   <string name="avatar_bangs">Бретон</string>
-  <string name="avatar_nothing">Няма нищо</string>
-  <string name="avatar_size">Размер</string>
+    <string name="avatar_size">Размер</string>
   <string name="avatar_size_slim">Слаб</string>
   <string name="avatar_size_broad">Широк</string>
   <string name="avatar_background">Фон</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Купуване</string>
   <string name="purchase_set_title">Купуване на комплекта %s</string>
   <string name="due_date">Крайна дата</string>
-  <string name="quest.accept">Приемане</string>
-  <string name="quest.reject">Отказване</string>
-  <string name="quest.begin">Започване на мисия</string>
-  <string name="quest.cancel">Отказване на поканата</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>
-  <string name="quest.participants">Участници</string>
-  <string name="version_info">Версия %1$s (%2$d)</string>
+  <string name="quest_accept">Приемане</string>
+  <string name="quest_reject">Отказване</string>
+  <string name="quest_begin">Започване на мисия</string>
+  <string name="quest_cancel">Отказване на поканата</string>
+  <string name="quest_abort">Прекратяване на мисията</string>
+    <string name="version_info">Версия %1$s (%2$d)</string>
   <string name="sidebar_help">Помощ и ЧЗВ</string>
   <string name="complete_tutorial">Разбрано!</string>
   <string name="dismiss_tutorial">Напомнете ми отново</string>
   <string name="intro_1_subtitle">Добре дошли в</string>
-  <string name="intro_1_title">Хабитика</string>
-  <string name="intro_1_description">Време е да започнете да се забавлявате, докато вършите задачите си. Над %s вече подобряват живота си с малки стъпки.</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>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Общувайте</string>
   <string name="intro_3_description">Приятелите Ви могат да Ви помогнат да постигнете целите си. Подкрепяйте се взаимно в живота и битките, за да израснете заедно!</string>
   <string name="intro_finish_button">Да започваме!</string>
-  <string name="previous_button">Назад</string>
-  <string name="next_button">Напред</string>
+    <string name="next_button">Напред</string>
   <string name="skip_button">Пропускане</string>
-  <string name="setup_welcome_description">Добре дошли в Хабитика, където напредването в играта ще подобри истинския Ви живот! Докато изпълнявате реалните си цели, ще отключвате екипировка, любимци, мисии и още.</string>
-  <string name="setup_welcome_title">Добре дошли</string>
-  <string name="avatar_setup_description">Е, как искате да изглеждате? Не се притеснявайте, по-късно ще можете да промените това.</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>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Да се уча от майстор в занаята</string>
   <string name="setup_task_creativity_2">Да работя по проекта си</string>
   <string name="setup_task_creativity_3">Да завърша проекта си</string>
-  <string name="gem.purchase.support">Искате ли да помогнете на Хабитика да продължи да съществува? Можете да подкрепите разработчиците като купите диаманти!\n\nС диамантите можете да си купувате забавни неща за профила си, като: \n\n — Интересни костюми за героя си;\n — Страхотни фонове;\n — Забавни мисии, от които ще получите яйца за любимци;\n — Възможността да променяте класа си преди да достигнете ниво 100.\n\nБлагодарим Ви за това, че помагате на Хабитика да се развива. Подкрепата Ви означава много за нас!</string>
-  <string name="my_guilds">Моите гилдии</string>
+    <string name="my_guilds">Моите гилдии</string>
   <string name="public_guilds">Обществени гилдии</string>
   <string name="guild">Гилдия</string>
   <string name="leave">Напускане</string>
   <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="gems">Диаманти</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>
-  <string name="guild_search_hint">Търсене на гилдии</string>
-  <string name="todo_due">Срок: %s</string>
-  <string name="daily_streak">текуща серия: %d</string>
-  <string name="todo_has_duedate">Задачата има краен срок</string>
-  <string name="battle_gear">Бойно снаряжение</string>
+    <string name="guild_search_hint">Търсене на гилдии</string>
+    <string name="battle_gear">Бойно снаряжение</string>
   <string name="costume">Костюм</string>
   <string name="outfit_head">Глава</string>
   <string name="outfit_headAccessory">Аксесоар за глава</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Костюм</string>
   <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="quest_begin_message">Наистина ли искате това? Само %1$d от общо %2$d членове на групата са се присъединили в мисията! Мисията ще започне автоматично, след като всички играчи се присъединят или откажат поканата.</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>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">Намерихте рядък предмет в гардероба: %s! Страхотно!</string>
   <string name="armoireFood">Тършувате из гардероба и намирате %1$s %2$s. Какво ли прави това там?</string>
   <string name="armoireExp">Сборвате се с гардероба и получавате опит. Така му се пада!</string>
-  <string name="armoireNotesFull">Отворете гардероба, за да получите специална екипировка, опит или храна! Оставащи предмети: %d</string>
-  <string name="armoireLastItem">Намерихте последния рядък предмет за екипиране в омагьосания гардероб.</string>
-  <string name="armoireNotesEmpty">В гардероба ще се появяват нови предмети през първата седмица на всеки месец. До тогава продължавайте да щракате за опит и храна!</string>
-  <string name="sell">Продаване (%d злато)</string>
+    <string name="sell">Продаване (%d злато)</string>
   <string name="hatch_with_potion">Излюпване с отвара</string>
-  <string name="feed_to_pet">Даване на любимец</string>
-  <string name="hatch_egg">Излюпване с яйце</string>
+    <string name="hatch_egg">Излюпване с яйце</string>
   <string name="invite_party">Поканване на групата</string>
   <string name="dialog_feeding">Хранене на %s с:</string>
   <string name="use_animal">Използване</string>
@@ -305,13 +237,8 @@
   <string name="close">Затваряне</string>
   <string name="share">Споделяне</string>
   <string name="notification_pet_fed">Вие нахранихте своя(та/то) %s!</string>
-  <string name="notification_purchase">Вие закупихте %s</string>
-  <string name="notification_purchase_reward">Вие закупихте награда</string>
-  <string name="sectiondrop">Обикновени</string>
-  <string name="sectionpremium">Магическа отвара</string>
-  <string name="sectionquest">Мисия</string>
-  <string name="sectionspecial">Редки</string>
-  <string name="world_quest">Световна мисия</string>
+    <string name="notification_purchase_reward">Вие закупихте награда</string>
+    <string name="world_quest">Световна мисия</string>
   <string name="inn_description">Нуждаете се от почивка\? Идете в странноприемницата на Даниел, за да спрете някои от по-трудните механики на Хабитика:
 \n
 \n • Пропуснатите ежедневни задачи няма да Ви нараняват;
@@ -331,8 +258,7 @@
   <string name="healer_description">Лечителите трудно могат да бъдат наранени и разпростират защитата си върху останалите. Пропуснатите ежедневни задачи и лошите навици не ги смущават толкова много; те винаги могат да възстановят здравето си след провал. Играйте като лечител, ако обичате да помагате на останалите в групата си или ако искате да изиграете смъртта чрез усърдна работа!</string>
   <string name="select_class">Изберете клас</string>
   <string name="opt_out_class">Отказване</string>
-  <string name="opt_out_description">Не Ви се занимава с класове? Искате да изберете по-късно? Откажете се от тях — ще бъдете воин без специални умения. Можете да прочетете относно класовата система по-късно в уикито, както и да включите класовете когато пожелаете.</string>
-  <string name="class_confirmation">Наистина ли искате да бъдете %s?</string>
+    <string name="class_confirmation">Наистина ли искате да бъдете %s?</string>
   <string name="class_changed">Вие вече сте %s!</string>
   <string name="class_changed_description">Вече имате ново бойно снаряжение по подразбиране, което можете да намерите в „Екипировка“!</string>
   <string name="choose_class">Избиране на класа</string>
@@ -346,23 +272,18 @@
   <string name="invite_existing_users">Поканете съществуващи потребители</string>
   <string name="send">Изпращане</string>
   <string name="invite">Поканете приятели</string>
-  <string name="invite_id_description">Ако имате приятели, които вече използват Хабитика, поканете ги чрез потребителски идентификатор тук.</string>
-  <string name="invite_username_description">Ако имате приятели, които вече използват Хабитика, поканете ги чрез потребителските им имена тук.</string>
+    <string name="invite_username_description">Ако имате приятели, които вече използват Хабитика, поканете ги чрез потребителските им имена тук.</string>
   <string name="invite_email_description">Ако приятел се присъедини към Хабитика през Вашето е-писмо, той автоматично ще бъде поканен в групата Ви!</string>
   <string name="add_invites">Добавяне на покани</string>
-  <string name="user_id">Потребителски ид</string>
-  <string name="email">Е-поща</string>
-  <string name="invite_users">Поканване в групата</string>
-  <string name="share_using">Споделяне чрез</string>
+    <string name="email">Е-поща</string>
+    <string name="share_using">Споделяне чрез</string>
   <string name="share_levelup">Достигнах ниво %d в Хабитика, като подобрявам навиците си в истинския живот!</string>
   <string name="share_hatched">Току-що излюпих любимец — %1$s %2$s в Хабитика, като изпълнявах задачите си в истинския живот!</string>
   <string name="share_raised">Току-що се сдобих с превоз — %1$s в Хабитика като изпълнявах задачите си в истинския живот!</string>
   <string name="open_in_store">Отваряне в магазина</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="confirm">Потвърждаване</string>
   <string name="market">Пазар</string>
   <string name="timeTravelers">Пътешественици във времето</string>
   <string name="seasonalShop">Сезонен магазин</string>
@@ -370,37 +291,16 @@
   <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>
-  <string name="purchase_confirmation_title">Потвърждаване на покупката</string>
-  <string name="confirm_purchase_text">Купуване на %1$s за %2$s %3$s</string>
-  <string name="gem">диамант</string>
-  <string name="hourglass">пясъчен часовник</string>
-  <string name="hourglasses">пясъчни часовници</string>
-  <string name="gold_singular">злато</string>
-  <string name="gold_plural">злато</string>
+    <string name="successful_purchase">Закупено: %1$s</string>
+    <string name="gold_plural">злато</string>
   <string name="chat_message_copied">Съобщението е копирано</string>
-  <string name="copy_chat_message">Копиране</string>
-  <string name="edit_tag_title">Редактиране на етикет</string>
-  <string name="edit_tag_btn_edit">Редактиране</string>
-  <string name="edit_tag_btn_done">Готово</string>
-  <string name="edit_tag_btn_delete">Изтриване</string>
-  <string name="confirm_delete_tag_title">Сигурен/на ли сте?</string>
+    <string name="edit_tag_btn_edit">Редактиране</string>
+    <string name="confirm_delete_tag_title">Сигурен/на ли сте?</string>
   <string name="confirm_delete_tag_message">Наистина ли искате да изтриете това?</string>
-  <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>
-  <string name="send_new_message">Изпр. на ново съобщение</string>
-  <string name="choose_recipient_title">Изберете получател</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Изберете получател</string>
   <string name="action_continue">Продължаване</string>
-  <string name="scan_qr_code">Сканиране на QR-код</string>
-  <string name="enter_recipient_uuid">Въведете потр. ид. на получателя</string>
-  <string name="invited_to_party">Получихте покана за присъединяване към група!</string>
+    <string name="invited_to_party">Получихте покана за присъединяване към група!</string>
   <string name="stats_widget_label">Статистика на Хабитика</string>
   <string name="add_task">Добавяне на задача</string>
   <string name="add_habit">Добавяне на навик</string>
@@ -411,15 +311,14 @@
   <string name="widget_habit_button">Извършване на навик в Хабитика</string>
   <string name="widget_dailies">Ежедневни задачи в Хабитика</string>
   <string name="widget_todo_list">Списък за изпълнение в Хабитика</string>
-  <string name="widget_add_task">Добавяне на задача в Хабитика</string>
-  <string name="google_services_missing">Услугите за „Google play“ не могат да бъдат намерени.</string>
-  <string name="gem.purchase.toolbartitle">Купуване</string>
-  <string name="gem.purchase.title">Купуването на диаманти подкрепя разработчиците и помага на Хабитика да продължи да съществува</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="google_services_missing">Услугите за „Google play“ не могат да бъдат намерени.</string>
+  <string name="gem_purchase_toolbartitle">Купуване</string>
+  <string name="gem_purchase_title">Купуването на диаманти подкрепя разработчиците и помага на Хабитика да продължи да съществува</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">Подкрепете Хабитика</string>
   <string name="skill_transformation_use">използване</string>
   <string name="hatching_market_info">Не Ви се падат предметите, които искате? Прегледайте пазара!</string>
@@ -433,32 +332,32 @@
   <string name="belongs_to_challenge">Принадлежи на предизвикателство</string>
   <string name="has_reminder">Има напомняне</string>
   <string name="has_tag">Има етикет</string>
-  <string name="subscribe.title">Абонирането подкрепя разработчиците и помага на Хабитика да продължи да съществува</string>
+  <string name="subscribe_title">Абонирането подкрепя разработчиците и помага на Хабитика да продължи да съществува</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="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="subscription_duration_norenew">За %s</string>
   <string name="subscribe">Абониране</string>
-  <string name="subscribe.listitem1.description">Александър Търговеца вече ще Ви продава диаманти на цената от 20 злато за диамант.\n\nМесечните му доставки отначало ще бъдат ограничени до 25 диаманта на месец, но може да се увеличат в зависимост от продължителността на абонамента Ви.\n\nОграничението се вдига с по 5 диаманта след всеки три месеца непрекъснат абонамент, докато не достигне 50 диаманта на месец!</string>
-  <string name="subscribe.listitem2.description">Всеки месец ще получавате уникален козметичен предмет за героя си!\n\nОсвен това, за всеки три месеца непрекъснат абонамент, тайнствените пътешественици във времето ще Ви дават достъп до исторически козметични предмети (както и такива от бъдещето).</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="subscribe_listitem1_description">Александър Търговеца вече ще Ви продава диаманти на цената от 20 злато за диамант.\n\nМесечните му доставки отначало ще бъдат ограничени до 25 диаманта на месец, но може да се увеличат в зависимост от продължителността на абонамента Ви.\n\nОграничението се вдига с по 5 диаманта след всеки три месеца непрекъснат абонамент, докато не достигне 50 диаманта на месец!</string>
+  <string name="subscribe_listitem2_description">Всеки месец ще получавате уникален козметичен предмет за героя си!\n\nОсвен това, за всеки три месеца непрекъснат абонамент, тайнствените пътешественици във времето ще Ви дават достъп до исторически козметични предмети (както и такива от бъдещето).</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="due">Краен срок</string>
   <string name="cancel_subscription">Прекратяване на абонамента</string>
-  <string name="cancel_subscription_google.description">Не искате вече да бъдете абонат? Можете да прекратите абонамента си от раздела „Моите приложения“ в магазина „Google Play“.</string>
-  <string name="cancel_subscription_notgoogle.description">Искате да прекратите абонамента си? Заради избрания от Вас разплащателен метод, можете да направите това само от уеб сайта. Натиснете бутона по-долу, за да отворите уеб сайта в браузъра си!</string>
+  <string name="cancel_subscription_google_description">Не искате вече да бъдете абонат? Можете да прекратите абонамента си от раздела „Моите приложения“ в магазина „Google Play“.</string>
+  <string name="cancel_subscription_notgoogle_description">Искате да прекратите абонамента си? Заради избрания от Вас разплащателен метод, можете да направите това само от уеб сайта. Натиснете бутона по-долу, за да отворите уеб сайта в браузъра си!</string>
   <string name="visit_habitica_website">Към уеб сайта на Хабитика</string>
   <string name="current_bonuses">Текущи бонуси</string>
   <string name="months_subscribed">Месечни абонаменти</string>
@@ -466,63 +365,47 @@
   <string name="monthly_gem_cap">Месечно ограничение на диамантите</string>
   <string name="inactive">Неактивен</string>
   <string name="one_month">1 месец</string>
-  <string name="months">%d месеца</string>
+  <string name="months">месеца</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_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>
-  <string name="daily">Ежедневно</string>
+    <string name="daily">Ежедневно</string>
   <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="challenge">Предизвикателство</string>
+    <string name="not_part_of_a_challenge">В момента не участвате в предизвикателство!</string>
   <string name="join_a_challenge">Включете се в предизвикателство, така ще добавите списък от подбрани задачи към списъка си. След това се състезавайте с останалите хабитиканци, за да печелите постижения и дори диаманти!</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">Изглежда сте включили опцията за разработчици „Да не се пазят дейностите“. В момента тя предизвиква проблеми с приложението на Хабитика, така че е препоръчително да я изключите.</string>
-  <string name="inbox">Съобщения</string>
-  <string name="FAQ">Често задавани въпроси</string>
-  <string name="special">Специален</string>
+    <string name="inbox">Съобщения</string>
+    <string name="special">Специален</string>
   <string name="gem_for_gold_description">Тъй като имате абонамент за Хабитика, можете всеки месец да купувате определен брой диаманти срещу злато.</string>
-  <string name="limited_count">Остават %d</string>
-  <string name="gem_shop">Диамант</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="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="groups">Групи</string>
   <string name="all">Всички</string>
   <string name="none">Нищо</string>
   <string name="owned">Притежавани</string>
   <string name="not_owned">Непритежавани</string>
-  <string name="new_game">Нова\nигра</string>
-  <string name="login_btn_fb">Влизане с Фейсбук</string>
+    <string name="login_btn_fb">Влизане с Фейсбук</string>
   <string name="login_btn_google">Влизане с Гугъл</string>
   <string name="action_back">Назад</string>
   <string name="welcome_text">О, сигурно сте нов тук. Аз съм Джъстин и ще бъда Вашият съветник в Хабитика.\n\nПърво, как да Ви наричам? Можете спокойно да промените това, което съм избрал. Когато сте готови, можем да преминем към създаването на герой!</string>
@@ -554,7 +437,6 @@
   <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">Устройството Ви не разполага с никой от поддържаните разплащателни методи. Моля, използвайте уеб сайта на Хабитика, ако искате да закупите диаманти.</string>
   <string name="no_billing_subscriptions">Устройството Ви не разполага с никой от поддържаните разплащателни методи. Моля, използвайте уеб сайта на Хабитика, ако искате да закупите абонамент.</string>
   <string name="save">Запазване</string>
@@ -562,8 +444,7 @@
   <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_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>
@@ -573,42 +454,36 @@
   <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="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="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="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_leader_header">Започната от %s</string>
   <string name="quest_abort_message">Наистина ли искате да прекъснете мисията? Така тя ще приключи за всички в групата Ви и целият Ви напредък ще бъде изгубен. Свитъкът с мисията ще бъде върнат на собственика си.</string>
-  <string name="loading">Зареждане…</string>
-  <string name="reloading_content">Презареждане на съдържанието</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="available_until">Налично до %s</string>
+  <string name="gems_left_max">Месечни диаманти: остават %1$d/%2$d</string>
+  <string name="gems_left_nomax">Месечни диаманти: остават %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_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d точки опит</string>
+  <string name="gold_reward">%d злато</string>
   <string name="quest_owner_rewards">Награди за собственика на мисията</string>
   <string name="str_abbrv">СИЛ</string>
   <string name="per_abbrv">УСЕ</string>
@@ -621,8 +496,7 @@
   <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="resetting_account">Нулиране на профила</string>
   <string name="deleting_account">Изтриване на профила</string>
   <string name="insufficientGold">Трябва да изпълните още задачи, преди да можете да си позволите този предмет!</string>
   <string name="insufficientGems">Трябват Ви повече диаманти, за да купите този предмет!</string>
@@ -655,8 +529,7 @@
   <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_username">Промяна на потребителското име</string>
   <string name="change">Промяна</string>
   <string name="character_level">Ниво на героя</string>
   <string name="auto_allocate_points">Авт. разпределение на точките</string>
@@ -677,7 +550,7 @@
   <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="points_to_allocate">%d точки за разпределяне</string>
   <string name="distribute_evenly_help">Задава един и същ брой точки на всеки показател.</string>
   <string name="distribute_class_help">Задава повече точки на показателите, които са важни за класа Ви.</string>
   <string name="distribute_task_help">Задава точки според силата, интелигентността, якостта и усета, свързани със задачите, които изпълнявате.</string>
@@ -687,9 +560,7 @@
   <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="tavern_description">Добре дошли в Странноприемницата! Поседнете, за да си поговорим, или за да си починете от задачите.</string>
   <string name="check_into_inn">Влизане в странноприемницата</string>
   <string name="community_guidelines">Обществени правила</string>
   <string name="view_community_guidelines">Преглед на Обществените правила</string>
@@ -703,19 +574,13 @@
   <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="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="rage_strike_count">Яростни удари: %d/%d</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="strike_active_title">%s беше нападнат!</string>
+    <string name="strike_active_description">Нашият %s беше съсипан когато %s разби %s. Бързо, справете се със задачите си, за да победите чудовището и да помогнете за възстановяването!</string>
   <string name="questShop">Магазинът за мисии</string>
   <string name="market_owner_long">Алекс Търговеца</string>
   <string name="tavern_owner_long">Даниел Кръчмаря</string>
@@ -725,33 +590,21 @@
   <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="join_party_title">Искате ли да се присъедините към група?</string>
+    <string name="insufficientSubscriberGems">Не можете да купите повече диаманти този месец. Ограничението се премахва през първите три дни на всеки месец. Благодарим Ви за абонамента!</string>
+    <string name="world_boss_description_title">Какво е световен главатар?</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="world_boss_action_prompt">Победете главатаря, за да спечелите специални награди и да спасите Хабитика от ужаса на %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="reply">Отговор</string>
   <string name="challenge_prize">Награда за предизвикателството</string>
   <string name="challenge_categories">Категории за предизвикателството</string>
   <string name="created_challenge">Създадено предизвикателство</string>
@@ -785,17 +638,15 @@
   <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="usernamePromptWiki">Ако искате да научите повече за тази промяна, посетете <a href="https://habitica.wikia_com/wiki/Player_Names">уикито ни</a></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="enter_recipient_username">Въведете @ потребителското име на получателя</string>
   <string name="username_copied">Потребителското име е копирано</string>
   <string name="verification_pet">Един от тези любимци-ветерани ще Ви чака след като завършите потвърждението!</string>
   <string name="welcomeNameTitle">Как да Ви наричаме?</string>
diff --git a/Habitica/res/values-de/strings.profile.xml b/Habitica/res/values-de/strings.profile.xml
index f09d576fb..69dc88577 100644
--- a/Habitica/res/values-de/strings.profile.xml
+++ b/Habitica/res/values-de/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Level:</string>
     <string name="profile_class_bonus">Klassen-Bonus:</string>
     <string name="profile_allocated">Verteilt:</string>
-    <string name="profile_boosts">Verstärkung:</string>
     <string name="profile_private_message">Private Nachricht</string>
     <string name="profile_achievements">Erfolge</string>
-    <string name="profile_achievement_ok">Ok</string>
-    <string name="profile_qrcode_close">Schließen</string>
 
 </resources>
diff --git a/Habitica/res/values-de/strings.sidebar.xml b/Habitica/res/values-de/strings.sidebar.xml
index aed435a3e..571ffeb58 100644
--- a/Habitica/res/values-de/strings.sidebar.xml
+++ b/Habitica/res/values-de/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Aufgaben</string>
-  <string name="sidebar.skills">Fähigkeiten</string>
-  <string name="sidebar.section.social">Soziales</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>
-  <string name="sidebar.guilds">Gilden</string>
-  <string name="sidebar.challenges">Wettbewerbe</string>
-  <string name="sidebar.section.inventory">Inventar</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Ausrüstung</string>
-  <string name="sidebar.stable">Stall</string>
-  <string name="sidebar.news">Neuigkeiten</string>
-  <string name="sidebar.settings">Einstellungen</string>
-  <string name="sidebar.about">Über</string>
+  <string name="sidebar_tasks">Aufgaben</string>
+  <string name="sidebar_skills">Fähigkeiten</string>
+  <string name="sidebar.section_social">Soziales</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>
+  <string name="sidebar_guilds">Gilden</string>
+  <string name="sidebar_challenges">Wettbewerbe</string>
+  <string name="sidebar.section_inventory">Inventar</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Ausrüstung</string>
+  <string name="sidebar_stable">Stall</string>
+  <string name="sidebar_news">Neuigkeiten</string>
+    <string name="sidebar_about">Über</string>
   <string name="sidebar_shops">Märkte</string>
   <string name="sidebar_stats">Statuswerte</string>
 </resources>
diff --git a/Habitica/res/values-de/strings.tutorial.xml b/Habitica/res/values-de/strings.tutorial.xml
index 0c440e835..829e8e7e1 100644
--- a/Habitica/res/values-de/strings.tutorial.xml
+++ b/Habitica/res/values-de/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Kaufe dir mit dem verdienten Gold Ausrüstung für deinen Avatar!</string>
   <string name="tutorial_rewards_2">Du kannst auch benutzerdefinierte Belohnungen erstellen, die sich auf etwas in Deinem wirklichen Leben beziehen, je nachdem was Dich motiviert.</string>
   <string name="tutorial_tasks_complete">Das war\'s für das Erste. Falls du eine Erinnerungshilfe brauchst, dann schau in die FAQs.</string>
-  <string name="tutorial_equipment">Wenn du Ausrüstung kaufst, taucht diese hier auf. Deine Kampfausrüstung beeinflusst deine Statuswerte und dein Kostüm (falls aktiviert) beeinflusst was dein Avatar trägt.</string>
-  <string name="tutorial_items">Verdiene Gegenstände, indem du Aufgaben erledigst und Stufen aufsteigst. Tippe auf einen Gegenstand, um ihn zu benutzen!</string>
-  <string name="tutorial_pets">Während Du Aufgaben abschließt, kannst Du zufällig Eier und Elixiere zu finden. Kombiniere diese um Haustiere auszubrüten</string>
-  <string name="tutorial_skills">Fähigkeiten erlauben es dir, mächtige Effekte auszulösen! Tippe auf eine Fähigkeit, um sie zu benutzen. Das kostet Mana (der blaue Balken), das du verdienst, indem du dich jeden Tag einloggst und reale Aufgaben abschließt. Für mehr Infos schaue im Menü in die FAQ!</string>
+    <string name="tutorial_skills">Fähigkeiten erlauben es dir, mächtige Effekte auszulösen! Tippe auf eine Fähigkeit, um sie zu benutzen. Das kostet Mana (der blaue Balken), das du verdienst, indem du dich jeden Tag einloggst und reale Aufgaben abschließt. Für mehr Infos schaue im Menü in die FAQ!</string>
   <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>
+    <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 eb55fed4b..2fa260abc 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Erfahrung</string>
   <string name="HP_default">Gesundheit</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Einstellungen konnten nicht vom Barcode geladen werden</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Einstellungen</string>
-  <string name="SP_address_hint">Dein benutzerdefinierter Server</string>
-  <string name="SP_userID_title">Benutzer-ID</string>
+    <string name="SP_userID_title">Benutzer-ID</string>
   <string name="SP_userID_summary">Deine Benutzer-ID</string>
   <string name="SP_APIToken_title">API-Token</string>
   <string name="SP_APIToken_summary">Dein API-Token</string>
   <string name="Language_title">Sprache</string>
   <string name="Language_summary">Habiticas Sprache ändern</string>
-  <string name="SP_user_qr_code">Dein QR-Code</string>
-  <string name="PS_contact_title">Kontaktiere mich</string>
-  <string name="unknown_error">Ein Fehler ist aufgetreten…</string>
-  <string name="pref_account_header">Konto</string>
+    <string name="PS_contact_title">Kontaktiere mich</string>
+    <string name="pref_account_header">Konto</string>
   <string name="pref_first_day_of_the_week_title">Erster Tag der Woche</string>
   <string name="pref_first_day_of_the_week_summary">Erster Tag der Woche in allen Kalendern</string>
   <string name="pref_reminder_header">Tägliche Erinnerung</string>
   <string name="pref_reminder_checkbox">Erinnerung aktivieren</string>
   <string name="pref_reminder_picker">Erinnerungszeit einstellen</string>
   <string name="pref_cds_header">Persönlicher Tagesstart</string>
-  <string name="pref_cds_picker">Persönlichen Tagesstart einstellen</string>
-  <string name="pref_push_notifications_checkbox">Push-Benachrichtigungen des Benutzers</string>
+    <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 eine Herausforderung gewonnen!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Deine Quest hat begonnen</string>
   <string name="preference_push_invited_to_quest">Zur Quest eingeladen</string>
   <!--Adding tasks-->
-  <string name="task_value">Wert</string>
-  <string name="new_todo">Neue To-Do</string>
-  <string name="new_reward">Neue Belohnung</string>
-  <string name="new_daily">Neue tägliche Aufgabe</string>
-  <string name="new_habit">Neue Gewohnheit</string>
-  <string name="action_edit">Bearbeiten</string>
-  <string name="action_delete">Löschen</string>
-  <string name="action_cancel">Abbrechen</string>
+    <string name="action_edit">Bearbeiten</string>
+    <string name="action_cancel">Abbrechen</string>
   <string name="login_btn">Login</string>
   <string name="register_btn">Registrieren</string>
   <string name="username">Benutzername</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Passwort bestätigen</string>
   <string name="logout">Ausloggen</string>
   <string name="logout_description">Logge Dich aus</string>
-  <string name="account_details">Kontodetails</string>
-  <string name="LoginActivityName">Willkommen</string>
-  <string name="string_revive">Wiederbeleben</string>
-  <string name="please_connect">Baue eine Verbindung mit Hilfe der App auf, bevor Du ein Widget benutzt</string>
-  <string name="about.title">Über</string>
-  <string name="about.libraries">Bibliotheken</string>
-  <string name="about.versionhistory">Versionsverlauf</string>
-  <string name="about.habitica_open_source">Habitica ist als Open-Source-Software auf GitHub verfügbar</string>
-  <string name="about.rate_our_app">Bewerte unsere App</string>
-  <string name="about.give_us_feedback">Sende uns Feedback!</string>
-  <string name="about.bugreport">Melde einen Fehler</string>
-  <string name="about.source_code">Quellcode</string>
-  <string name="repeatEvery">Es wiederholt sich jeden</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Verbindungsfehler</string>
-  <string name="network_error_no_network_body">Keine Internetverbindung.</string>
-  <string name="internal_error_api">Es scheint ein Problem mit dem Server zu geben. Versuche es später noch mal.</string>
+    <string name="LoginActivityName">Willkommen</string>
+    <string name="about_title">Über</string>
+  <string name="about_libraries">Bibliotheken</string>
+    <string name="about_habitica_open_source">Habitica ist als Open-Source-Software auf GitHub verfügbar</string>
+  <string name="about_rate_our_app">Bewerte unsere App</string>
+  <string name="about_give_us_feedback">Sende uns Feedback!</string>
+  <string name="about_bugreport">Melde einen Fehler</string>
+  <string name="about_source_code">Quellcode</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Es scheint ein Problem mit dem Server zu geben. Versuche es später noch mal.</string>
   <string name="authentication_error_title">Authentifikationsfehler</string>
-  <string name="authentication_error_body">Ungültiger Benutzername und/oder Passwort.</string>
-  <string name="login_validation_error_title">Validierungsfehler</string>
+    <string name="login_validation_error_title">Validierungsfehler</string>
   <string name="login_validation_error_fieldsmissing">Bitte fülle alle Felder aus.</string>
   <string name="save_changes">Speichern</string>
   <string name="copy">Kopieren</string>
   <string name="notes">Notizen</string>
-  <string name="text">Text</string>
-  <string name="difficulty">Schwierigkeit</string>
+    <string name="difficulty">Schwierigkeit</string>
   <string name="tags">Tags</string>
   <string name="trivial">Trivial</string>
   <string name="easy">Einfach</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negativ ( - )</string>
   <string name="checklist">Checkliste</string>
   <string name="reminders">Erinnerungen</string>
-  <string name="actions">Aktionen</string>
-  <string name="attributes">Attribute</string>
-  <string name="physical">Stärke</string>
-  <string name="mental">Intelligenz</string>
-  <string name="social">Ausdauer</string>
-  <string name="other">Wahrnehmung</string>
-  <string name="frequency">Häufigkeit</string>
-  <string name="frequency_weekly">An bestimmten Tagen der Woche</string>
-  <string name="frequency_daily">Alle X Tage</string>
-  <string name="repeatables_summary_title">Zusammenfassung</string>
-  <string name="repeatables_title">Es wiederholt sich</string>
-  <string name="repeatables_on_title">Wiederholt sich am </string>
-  <string name="repeatables_frequency_daily">Täglich</string>
+    <string name="attributes">Attribute</string>
+    <string name="repeatables_frequency_daily">Täglich</string>
   <string name="repeatables_frequency_weekly">Wöchentlich</string>
   <string name="repeatables_frequency_monthly">Monatlich</string>
   <string name="repeatables_frequency_yearly">Jährlich</string>
@@ -123,24 +92,15 @@
   <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>
-  <string name="profile_image">Profilbild</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Du hast %1$s für %2$d Mana benutzt.</string>
-  <string name="used_skill_without_mana">Du hast %1$s benutzt.</string>
+    <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">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 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">Ausblenden</string>
+    <string name="reminder_title">Vergiss nicht deine Aufgaben zu überprüfen</string>
+    <string name="unlock_lvl_11">Freigeschaltet ab Lvl 11</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">Ausblenden</string>
   <string name="party">Gruppe</string>
   <string name="chat">Chat</string>
   <string name="members">Mitglieder</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Tägliche Aufgaben</string>
   <string name="todos">To-Dos</string>
   <string name="rewards">Belohnungen</string>
-  <string name="taskform.delete.title">Bist Du sicher?</string>
-  <string name="taskform.delete.message">Wirklich löschen?</string>
-  <string name="yes">Ja</string>
+    <string name="yes">Ja</string>
   <string name="no">Nein</string>
   <string name="quest">Quest</string>
   <string name="avatar_body">Körper</string>
   <string name="avatar_hair">Haar</string>
   <string name="avatar_shirt">Shirt</string>
   <string name="avatar_skin">Haut</string>
-  <string name="avatar_ears">Tierohren</string>
-  <string name="avatar_base">hinten</string>
+    <string name="avatar_base">hinten</string>
   <string name="avatar_color">Farbe</string>
   <string name="avatar_beard">Bart</string>
   <string name="avatar_mustache">Schnurrbart</string>
   <string name="avatar_flower">Blume</string>
   <string name="avatar_bangs">Frisur vorne</string>
-  <string name="avatar_nothing">Nichts gesetzt</string>
-  <string name="avatar_size">Größe</string>
+    <string name="avatar_size">Größe</string>
   <string name="avatar_size_slim">Dünn</string>
   <string name="avatar_size_broad">Kräftig</string>
   <string name="avatar_background">Hintergrund</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Kaufen</string>
   <string name="purchase_set_title">Set %s kaufen</string>
   <string name="due_date">Frist</string>
-  <string name="quest.accept">Annehmen</string>
-  <string name="quest.reject">Ablehnen</string>
-  <string name="quest.begin">Quest starten</string>
-  <string name="quest.cancel">Einladung abbrechen</string>
-  <string name="quest.abort">Quest abbrechen</string>
-  <string name="quest.leave">Quest verlassen</string>
-  <string name="quest.pending">Ausstehend</string>
-  <string name="quest.accepted">Angenommen</string>
-  <string name="quest.rejected">Abgelehnt</string>
-  <string name="quest.participants">Teilnehmer</string>
-  <string name="version_info">Version %1$s (%2$d)</string>
+  <string name="quest_accept">Annehmen</string>
+  <string name="quest_reject">Ablehnen</string>
+  <string name="quest_begin">Quest starten</string>
+  <string name="quest_cancel">Einladung abbrechen</string>
+  <string name="quest_abort">Quest abbrechen</string>
+    <string name="version_info">Version %1$s (%2$d)</string>
   <string name="sidebar_help">Hilfe &amp; FAQ</string>
   <string name="complete_tutorial">Verstanden!</string>
   <string name="dismiss_tutorial">Erinnere mich noch einmal</string>
   <string name="intro_1_subtitle">Willkommen bei</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Es ist an der Zeit für Spaß, während du deine Aufgaben machst. Tritt einer Gemeinschaft von %s anderen Menschen bei, die ihr Leben Aufgabe für Aufgabe verbessern möchten.</string>
+    <string name="intro_1_description">Es ist an der Zeit für Spaß, während du deine Aufgaben machst. Tritt einer Gemeinschaft von %s anderen Menschen bei, die ihr Leben Aufgabe für Aufgabe verbessern möchten.</string>
   <string name="intro_2_subtitle">Fortschritt im Spiel</string>
   <string name="intro_2_title">Fortschritt im Leben</string>
   <string name="intro_2_description">Schalte Spielinhalte durch das Erledigen und Abhaken deiner realen Aufgaben frei. Bekomme Rüstungen, Tiere und vieles mehr als Belohnungen für das Erfüllen deiner Ziele.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Triff dich mit Anderen</string>
   <string name="intro_3_description">Behalte Deine Ziele im Auge mit Hilfe Deiner Freunde. Unterstützt Euch gegenseitig im Leben und im Kampf, während Ihr Euch gemeinsam verbessert!</string>
   <string name="intro_finish_button">Fangen wir an!</string>
-  <string name="previous_button">Zurück</string>
-  <string name="next_button">Weiter</string>
+    <string name="next_button">Weiter</string>
   <string name="skip_button">Überspringen</string>
-  <string name="setup_welcome_description">Willkommen zu Habitica! Hier bedeutet Fortschritt im Spiel gleichzeitig Fortschritt im echten Leben! Während Du Ziele im echten Leben erreichst, wirst Du Ausrüstung, Haustiere, Quests und vieles mehr freischalten.</string>
-  <string name="setup_welcome_title">Willkommen</string>
-  <string name="avatar_setup_description">Also, wie möchtest Du aussehen? Keine Sorge, Du kannst das jederzeit ändern.</string>
+    <string name="avatar_setup_description">Also, wie möchtest Du aussehen? Keine Sorge, Du kannst das jederzeit ändern.</string>
   <string name="task_setup_description">Großartig! Woran möchtest Du zukünftig arbeiten?</string>
   <string name="setup_group_work">Arbeit</string>
   <string name="setup_group_exercise">Bewegung</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Lerne ein Handwerk</string>
   <string name="setup_task_creativity_2">An einem kreativem Projekt arbeiten</string>
   <string name="setup_task_creativity_3">Kreatives Projekt fertigstellen</string>
-  <string name="gem.purchase.support">Du möchtest helfen, Habitica am Laufen zu halten? Unterstütze die Entwickler, indem Du Edelsteine kaufst!\n\nMit Edelsteinen kannst Du lustige Extras kaufen, zum Beispiel:\n\n - Coole Kostüme für Deinen Avatar\n - Hübsche Hintergründe\n - Spannende Quests, um Haustiere freizuschalten\n - Die Möglichkeit, Deine Klasse schon vor Level 100 zu wechseln\n\nVielen, vielen Dank, dass Du hilfst, Habitica großartig zu machen. Deine Unterstützung bedeutet uns sehr viel!</string>
-  <string name="my_guilds">Meine Gilden</string>
+    <string name="my_guilds">Meine Gilden</string>
   <string name="public_guilds">Öffentliche Gilden</string>
   <string name="guild">Gilde</string>
   <string name="leave">Verlassen</string>
   <string name="join">Beitreten</string>
-  <string name="leader">Anführer</string>
-  <string name="gems">Edelsteine</string>
-  <string name="copy_as_todo">Als Aufgabe kopieren</string>
-  <string name="send_pm">PN senden</string>
-  <string name="flag">Melden</string>
-  <string name="delete">Löschen</string>
+    <string name="gems">Edelsteine</string>
+    <string name="delete">Löschen</string>
   <string name="name">Name</string>
   <string name="description">Beschreibung</string>
   <string name="add_tag">Tag hinzufügen</string>
   <string name="privacy">Privatsphäre</string>
   <string name="write_message">Nachricht schreiben</string>
-  <string name="post">posten</string>
-  <string name="guild_search_hint">Nach Gilden suchen</string>
-  <string name="todo_due">Bis: %s</string>
-  <string name="daily_streak">Aktuelle Serie: %d</string>
-  <string name="todo_has_duedate">Diese Aufgabe hat eine Frist</string>
-  <string name="battle_gear">Kampfausrüstung</string>
+    <string name="guild_search_hint">Nach Gilden suchen</string>
+    <string name="battle_gear">Kampfausrüstung</string>
   <string name="costume">Kostüm</string>
   <string name="outfit_head">Kopf</string>
   <string name="outfit_headAccessory">Kopfschmuck</string>
@@ -286,13 +224,9 @@
   <string name="armoireEquipment">Du hast einen seltenen Ausrüstungsgegenstand im Schrank gefunden: %s! Großartig!</string>
   <string name="armoireFood">Du wühlst im Schrank herum und findest %1$s %2$s. Was macht das denn hier?</string>
   <string name="armoireExp">Du ringst mit dem verzauberten Schrank und gewinnst Erfahrung. Nimm das!</string>
-  <string name="armoireNotesFull">Öffne den Schrank um zufällig spezielle Gegenstände, Erfahrung oder Nahrung zu erhalten! Verbleibende Ausrüstungsgegenstände: %d</string>
-  <string name="armoireLastItem">Du hast das letzte Stück der seltenen Ausrüstung im verzauberten Schrank gefunden.</string>
-  <string name="armoireNotesEmpty">Der Schrank wird jeden Monat neue Ausrüstung beinhalten. Bis dahin kannst Du weiterklicken um Erfahrung und Nahrung zu erhalten!</string>
-  <string name="sell">Verkaufen (%d Gold)</string>
+    <string name="sell">Verkaufen (%d Gold)</string>
   <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="hatch_egg">Mit Ei ausbrüten</string>
   <string name="invite_party">Party einladen</string>
   <string name="dialog_feeding">Füttere %s mit:</string>
   <string name="use_animal">Nutzen</string>
@@ -303,8 +237,7 @@
   <string name="close">Schließen</string>
   <string name="share">Teilen</string>
   <string name="notification_pet_fed">Du hast Dein/e/n %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="notification_purchase_reward">Du hast eine Belohnung gekauft</string>
   <string name="world_quest">Weltenquest</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
@@ -324,8 +257,7 @@
   <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>
-  <string name="class_confirmation">Bist Du sicher, dass Du %s werden willst?</string>
+    <string name="class_confirmation">Bist Du sicher, dass Du %s werden willst?</string>
   <string name="class_changed">Du bist jetzt ein/eine %s!</string>
   <string name="class_changed_description">Du hast neue Basis-Kampfausrüstung, die Du im Ausrüstungsreiter wechseln kannst!</string>
   <string name="choose_class">Klasse wählen</string>
@@ -339,23 +271,18 @@
   <string name="invite_existing_users">Nutzer einladen</string>
   <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_username_description">Wenn Deine Freunde bereits Habitica verwenden, lade sie hier mit ihrem Benutzernamen ein.</string>
+    <string name="invite_username_description">Wenn Deine Freunde bereits Habitica verwenden, lade sie hier mit ihrem Benutzernamen ein.</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>
-  <string name="invite_users">Zur Gruppe einladen</string>
-  <string name="share_using">Teilen via</string>
+    <string name="email">E-Mail</string>
+    <string name="share_using">Teilen via</string>
   <string name="share_levelup">Ich habe durch das Verbessern meiner realen Lebensgewohnheiten Level %d in Habitica erreicht!</string>
   <string name="share_hatched">Durch das Erfüllen meiner Real-Life-Aufgaben habe ich ein %1$s %2$s Haustier in Habitica ausgebrütet!</string>
   <string name="share_raised">Durch das Erfüllen meiner Real-Life-Aufgaben habe ich ein %1$s Reittier in Habitica erhalten!</string>
   <string name="open_in_store">Im Play Store öffnen</string>
   <string name="change_class_confirmation">Bist Du sicher, dass Du Deine Klasse ändern willst? Es kostet 3 Edelsteine.</string>
   <string name="change_class_equipment_warning">Warnung: Du wirst nicht mehr Ausrüstung für die %s Klasse kaufen können.</string>
-  <string name="leaderMessage">Nachricht von %1$s</string>
-  <string name="leaderName">Führender: %1$s</string>
-  <string name="confirm">Bestätigen</string>
+    <string name="confirm">Bestätigen</string>
   <string name="market">Marktplatz</string>
   <string name="timeTravelers">Mysteriöse Zeitreisende</string>
   <string name="seasonalShop">Jahreszeitenmarkt</string>
@@ -363,37 +290,16 @@
   <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>
-  <string name="purchase_confirmation_title">Kauf bestätigen</string>
-  <string name="confirm_purchase_text">%1$s für %2$s %3$s kaufen</string>
-  <string name="gem">Edelstein</string>
-  <string name="hourglass">Sanduhr</string>
-  <string name="hourglasses">Sanduhren</string>
-  <string name="gold_singular">Gold</string>
-  <string name="gold_plural">Gold</string>
+    <string name="successful_purchase">%1$s gekauft</string>
+    <string name="gold_plural">Gold</string>
   <string name="chat_message_copied">Nachricht in Zwischenablage kopiert</string>
-  <string name="copy_chat_message">In Zwischenablage kopieren</string>
-  <string name="edit_tag_title">Tag bearbeiten</string>
-  <string name="edit_tag_btn_edit">Bearbeiten</string>
-  <string name="edit_tag_btn_done">Fertig</string>
-  <string name="edit_tag_btn_delete">Löschen</string>
-  <string name="confirm_delete_tag_title">Bist Du sicher?</string>
+    <string name="edit_tag_btn_edit">Bearbeiten</string>
+    <string name="confirm_delete_tag_title">Bist Du sicher?</string>
   <string name="confirm_delete_tag_message">Wirklich löschen?</string>
-  <string name="filter_drawer_edit_tags">Tags bearbeiten</string>
-  <string name="filter_drawer_filter_tags">Nach Tags filtern</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Lass Dich durch diesen QR Code von jemandem einladen</string>
-  <string name="qr_save_message">QR code gespeichert: </string>
-  <string name="qr_dialogue_title">Dein QR Code</string>
-  <string name="download">Download</string>
-  <string name="send_new_message">Neue Nachricht schicken</string>
-  <string name="choose_recipient_title">Nachrichtenempfänger auswählen</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Nachrichtenempfänger auswählen</string>
   <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 Party 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>
@@ -404,15 +310,14 @@
   <string name="widget_habit_button">Habitica: Gewohnheit</string>
   <string name="widget_dailies">Habitica: Tägliche Aufgaben</string>
   <string name="widget_todo_list">Habitica To-Do-Liste</string>
-  <string name="widget_add_task">Habitica: Neue Aufgabe</string>
-  <string name="google_services_missing">Google Play Dienste konnten nicht gefunden werden.</string>
-  <string name="gem.purchase.toolbartitle">Kaufen</string>
-  <string name="gem.purchase.title">Das Erwerben von Edelsteinen unterstützt die Entwickler und hilft Habitica am Laufen zu halten</string>
-  <string name="gem.purchase.subtitle">Edelsteine erlaubes es Dir spaßige Extras für Deinen Account zu erwerben, inklusive:</string>
-  <string name="gem.purchase.listitem1">Coole Kostüme für Deinen Avatar</string>
-  <string name="gem.purchase.listitem2">Fantastische Hintergründe</string>
-  <string name="gem.purchase.listitem3">Quest, welche Dich mit Haustiereiern belohnt</string>
-  <string name="gem.purchase.listitem4">Die Fähigkeit Deine Klasse vor dem Erreichen von Level 100 zu ändern</string>
+    <string name="google_services_missing">Google Play Dienste konnten nicht gefunden werden.</string>
+  <string name="gem_purchase_toolbartitle">Kaufen</string>
+  <string name="gem_purchase_title">Das Erwerben von Edelsteinen unterstützt die Entwickler und hilft Habitica am Laufen zu halten</string>
+  <string name="gem_purchase_subtitle">Edelsteine erlaubes es Dir spaßige Extras für Deinen Account zu erwerben, inklusive:</string>
+  <string name="gem_purchase_listitem1">Coole Kostüme für Deinen Avatar</string>
+  <string name="gem_purchase_listitem2">Fantastische Hintergründe</string>
+  <string name="gem_purchase_listitem3">Quest, welche Dich mit Haustiereiern belohnt</string>
+  <string name="gem_purchase_listitem4">Die Fähigkeit Deine Klasse vor dem Erreichen von Level 100 zu ändern</string>
   <string name="support_habitica">Unterstütze Habitica</string>
   <string name="skill_transformation_use">benutzen</string>
   <string name="hatching_market_info">Kriegst Du nicht die richtige Beute? Besuche den Marktplatz!</string>
@@ -426,28 +331,28 @@
   <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>
+  <string name="subscribe_title">Mit einem Abonnement unterstützt Du die Entwickler und den Betrieb von Habitica</string>
   <string name="subscribe_prompt">Werde Abonnent und du bekommst diese nützlichen Vorteile: </string>
-  <string name="subscribe.listitem1">Kaufe Edelsteine mit Gold</string>
-  <string name="subscribe.listitem2">Exklusive monatliche Gegenstände</string>
-  <string name="subscribe.listitem3">Zusätzliche Verlaufseinträge sichern</string>
-  <string name="subscribe.listitem4">Tägliches Beute-Limit verdoppelt</string>
+  <string name="subscribe_listitem1">Kaufe Edelsteine mit Gold</string>
+  <string name="subscribe_listitem2">Exklusive monatliche Gegenstände</string>
+  <string name="subscribe_listitem3">Zusätzliche Verlaufseinträge sichern</string>
+  <string name="subscribe_listitem4">Tägliches Beute-Limit verdoppelt</string>
   <string name="subscriptions">Abonnements</string>
   <string name="subscription_duration">Alle %s wiederholen</string>
   <string name="subscription_duration_norenew">Für %s</string>
   <string name="subscribe">Abonnieren</string>
-  <string name="subscribe.listitem1.description">Alexander der Händler wird Dir nun Edelsteine für jeweils 20 Goldmünzen pro Stück verkaufen.\n\nSeine monatlichen Lieferungen sind zunächst auf 25 Edelsteine pro Monat beschränkt, welche jedoch durch die Dauer Deines Abonnements erhöht werden.\n\nDas Limit steigt um 5 Edelsteine für jeweils drei durchgehend abonnierte Monate, bis zu einem Maximum von 50 Edelsteinen pro Monat!</string>
-  <string name="subscribe.listitem2.description">Jeden Monat wirst Du einen einzigartigen optischen Gegenstand für Deinen Avatar erhalten.\n\nAußerdem gewährt Dir der Mysteriöse Zeitreisende für jeweils drei durchgehend abonnierte Monate Zugang zu historischen (und futuristischen!) optischen Gegenständen.</string>
-  <string name="subscribe.listitem3.description">Verlängert die Historie erledigter To-Dos und Aufgaben.</string>
-  <string name="subscribe.listitem4.description">Verdoppelte Beute-Limits ermöglichen es Dir, täglich von erledigten Aufgaben mehr Gegenstände zu finden und deinen Stall schneller zu vervollständigen!</string>
+  <string name="subscribe.listitem1_description">Alexander der Händler wird Dir nun Edelsteine für jeweils 20 Goldmünzen pro Stück verkaufen.\n\nSeine monatlichen Lieferungen sind zunächst auf 25 Edelsteine pro Monat beschränkt, welche jedoch durch die Dauer Deines Abonnements erhöht werden.\n\nDas Limit steigt um 5 Edelsteine für jeweils drei durchgehend abonnierte Monate, bis zu einem Maximum von 50 Edelsteinen pro Monat!</string>
+  <string name="subscribe.listitem2_description">Jeden Monat wirst Du einen einzigartigen optischen Gegenstand für Deinen Avatar erhalten.\n\nAußerdem gewährt Dir der Mysteriöse Zeitreisende für jeweils drei durchgehend abonnierte Monate Zugang zu historischen (und futuristischen!) optischen Gegenständen.</string>
+  <string name="subscribe.listitem3_description">Verlängert die Historie erledigter To-Dos und Aufgaben.</string>
+  <string name="subscribe.listitem4_description">Verdoppelte Beute-Limits ermöglichen es Dir, täglich von erledigten Aufgaben mehr Gegenstände zu finden und deinen Stall schneller zu vervollständigen!</string>
   <string name="subscription_hourglasses">+%d Mystische Sanduhr</string>
   <string name="payment_method">Zahlungsmethode</string>
   <string name="subscription">Abonnement</string>
   <string name="active">Aktiv</string>
   <string name="due">Fällig</string>
   <string name="cancel_subscription">Abonnement kündigen</string>
-  <string name="cancel_subscription_google.description">Du willst nicht länger Abonnent sein? Du findest die Option zum Kündigen im Google Play Store unter \"Meine Apps und Spiele\".</string>
-  <string name="cancel_subscription_notgoogle.description">Du möchtest Dein Abonnement beenden? Aufgrund Deiner Zahlungsmethode kannst Du Dein Abonnement nur über die Webseite beenden. Benutze die Schaltfläche unten, um die Seite in Deinem Browser zu öffnen!</string>
+  <string name="cancel_subscription_google_description">Du willst nicht länger Abonnent sein? Du findest die Option zum Kündigen im Google Play Store unter \"Meine Apps und Spiele\".</string>
+  <string name="cancel_subscription_notgoogle_description">Du möchtest Dein Abonnement beenden? Aufgrund Deiner Zahlungsmethode kannst Du Dein Abonnement nur über die Webseite beenden. Benutze die Schaltfläche unten, um die Seite in Deinem Browser zu öffnen!</string>
   <string name="visit_habitica_website">Habitica-Internetseite besuchen</string>
   <string name="current_bonuses">Aktuelle Boni</string>
   <string name="months_subscribed">Abonnierte Monate</string>
@@ -462,56 +367,40 @@
   <string name="twelve_months">12 Monate</string>
   <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">Herausforderungsdetails</string>
-  <string name="challenge_leave_title">Herausforderung abbrechen</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 Herausforderungen</string>
-  <string name="public_challenges">Öffentlich</string>
-  <string name="challenges">Herausforderungen</string>
-  <string name="daily">Tägliche Aufgabe</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">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="challenge">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">Nachrichten</string>
-  <string name="FAQ">Häufig gestellte Fragen</string>
-  <string name="special">Spezial</string>
+    <string name="inbox">Nachrichten</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>
-  <string name="limited_count">%d übrig</string>
-  <string name="gem_shop">Edelstein</string>
+    <string name="gem_shop">Edelstein</string>
   <string name="mystery_item">Überraschungsgegenstand</string>
   <string name="myster_item_notes">Jeden Monat bekommen Abonnenten einen Überraschungsgegenstand. Dieser wird üblicherweise circa eine Woche vor Ende des Monats veröffentlicht.</string>
   <string name="open">Öffnen</string>
-  <string name="notification_mystery_item">Du öffnest die Kiste und findest %s!</string>
-  <string name="checkInRewardEarned">Du hast ein %1$s als Belohnung für Deine Hingabe, dein Leben zu verbessern, erhalten.</string>
+    <string name="checkInRewardEarned">Du hast ein %1$s als Belohnung für Deine Hingabe, dein Leben zu verbessern, erhalten.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Deine nächste Belohnung wird nach %1$d Log-Ins freigeschalten </string>
   <string name="pending_approval">Zustimmung ausstehend</string>
   <string name="filters">Filter</string>
   <string name="done">Fertig</string>
-  <string name="group_tasks_edit_description">Gruppenaufgaben können nicht bearbeitet werden.</string>
-  <string name="group_tasks_edit_title">Aufgabe kann nicht bearbeitet werden</string>
-  <string name="groups">Gruppen</string>
+    <string name="groups">Gruppen</string>
   <string name="all">Alles</string>
   <string name="none">Nichts</string>
   <string name="owned">Im Besitz</string>
   <string name="not_owned">Nicht im Besitz</string>
-  <string name="new_game">Neues\nSpiel</string>
-  <string name="login_btn_fb">Mit Facebook-Konto einloggen</string>
+    <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/n Sag mir doch als erstes wie wir Dich nennen sollen! Du kannst jederzeit ändern was ich ausgesucht habe. Wenn Du damit fertig bist, lass uns Deinen Avatar erstellen!</string>
@@ -543,7 +432,6 @@
   <string name="reload_content">Inhalt erneut laden</string>
   <string name="dailyDueDefaultView">Setze die Standards der täglichen Aufgaben auf \"fällig\"</string>
   <string name="dailyDueDefaultViewDescription">Mit der Auswahl dieser Option werden Deine täglichen Aufgaben auf \"fällig\" zurückgesetzt, anstelle von \"all\"</string>
-  <string name="repeat_summary">%1$s wird jeden %2$s %3$s %4$s wiederholt</string>
   <string name="no_billing_gems">Mit deinem Zugangsgerät hast Du keinen Zugriff auf die möglichen Zahlungsmethoden. Bitte nutze die Habitica Website um Edelsteine zu kaufen.</string>
   <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>
@@ -551,8 +439,7 @@
   <string name="gem_reward">Juwelen Preis</string>
   <string name="tasks">Aufgaben</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_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="identify_your_challenge_with_a_tag">Gib deiner Herausforderung einen kurzen Namen</string>
   <string name="challenge_create_error_tag">Du brauchst einen kurzen Namen um diese Herausforderung zu erstellen.</string>
@@ -562,44 +449,38 @@
   <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="start_quest">Starte eine neue Quest</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="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 Party verlassen willst?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Nächste Belohnung in %d Check-Ins</string>
-  <string name="pending">Ausstehend</string>
+    <string name="pending">Ausstehend</string>
   <string name="accepted">Angenommen</string>
   <string name="declined">Abgelehnt</string>
   <string name="participants">Teilnehmer</string>
   <string name="invitations">Einladungen</string>
-  <string name="quest_leader_header" formatted="false">Begonnen von %s</string>
+  <string name="quest_leader_header">Begonnen von %s</string>
   <string name="quest_abort_message">Willst Du diese Mission wirklich abbrechen?
 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="reloading_content">Inhalt wird erneut geladen</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
   <string name="billion_abbrev">b</string>
-  <string name="your_balance">Dein Kontostand:</string>
-  <string name="available_until" formatted="false">Verfügbar bis  zum %s</string>
-  <string name="gems_left_max" formatted="false">Monatliche Edelsteine: %1$d/%2$d verbleibend</string>
-  <string name="gems_left_nomax" formatted="false">Monatliche Edelsteine: %d verbleibend</string>
+    <string name="available_until">Verfügbar bis  zum %s</string>
+  <string name="gems_left_max">Monatliche Edelsteine: %1$d/%2$d verbleibend</string>
+  <string name="gems_left_nomax">Monatliche Edelsteine: %d verbleibend</string>
   <string name="health">Gesundheit</string>
   <string name="collect">Sammel</string>
   <string name="rage_meter">Wut-Meter</string>
   <string name="boss_quest">Boss Aufgabe</string>
   <string name="collection_quest">Sammel Aufgabe</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Erfahrungspunkte</string>
-  <string name="gold_reward" formatted="false">%d Gold</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Erfahrungspunkte</string>
+  <string name="gold_reward">%d Gold</string>
   <string name="quest_owner_rewards">Quest-Besitzer Belohnungen</string>
   <string name="str_abbrv">STR</string>
   <string name="per_abbrv">WAH</string>
@@ -612,8 +493,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</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>
-  <string name="nevermind">Egal</string>
-  <string name="resetting_account">Konto zurücksetzen</string>
+    <string name="resetting_account">Konto zurücksetzen</string>
   <string name="deleting_account">Konto löschen</string>
   <string name="insufficientGold">Du musst mehr Aufgaben erledigen bevor du Dir dieses Item leisten kannst!</string>
   <string name="insufficientGoldTitle">Nicht genug Gold</string>
@@ -647,8 +527,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="authentication_summary">Ändere Deine Authentifizierungsoptionen.</string>
   <string name="change_password">Passwort ändern</string>
   <string name="change_email">E-Mail-Adresse ändern</string>
-  <string name="change_login_name">Login-Name ändern</string>
-  <string name="change_username">Benutzername ändern</string>
+    <string name="change_username">Benutzername ändern</string>
   <string name="change">Ändern</string>
   <string name="character_level">Charakterlevel</string>
   <string name="auto_allocate_points">Punkte automatisch verteilen</string>
@@ -669,7 +548,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="distribute_class">Auf Basis der eigenen Klasse verteilen</string>
   <string name="distribute_task">Nach Aufgabenaktivität verteilen</string>
   <string name="no_points_to_allocate">Keine Punkte zum Verteilen</string>
-  <string name="points_to_allocate" formatted="false">%d Punkte zum Verteilen</string>
+  <string name="points_to_allocate">%d Punkte zum Verteilen</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>
@@ -679,9 +558,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</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="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>
@@ -695,19 +572,13 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</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="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="rage_strike_count">Wut-Angriff: %d/%d</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="strike_active_title">%s wurde angegriffen!</string>
+    <string name="strike_active_description">%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>
@@ -717,29 +588,21 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</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_description">Gib einem Party-Mitglied den Benutzernamen den Du unten finden kannst damit sie Dir eine Einladung senden können</string>
-  <string name="join_party_description_id">Gib ihnen Deine User ID oder lass sie Deinen QR Code scannen </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="join_party_title">Willst Du einer Party beitreten?</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="world_boss_description_title">Was ist ein Weltboss?</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="world_boss_action_prompt">Besiege den Boss, um spezielle Belohnungen zu erhalten und Habitica vom Terror des %ss zu befreien!</string>
+    <string name="questShop_owner_long">Ian der Questmeister</string>
   <string name="seasonalShop_owner_long">Jahreszeitenzauberin</string>
   <string name="rage_attack">Raserei-Angriff:</string>
   <string name="tavern_description_world_boss">Ihr Lieben, kümmert Euch nicht um das Monster -- dies ist immer noch ein sicherer Platz für eine kleine Pause zum Chatten.</string>
   <string name="report">Melden</string>
-  <string name="like">Mag ich</string>
-  <string name="reply">Antworten</string>
+    <string name="reply">Antworten</string>
   <string name="challenge_prize">Herausforderungspreis</string>
   <string name="challenge_categories">Herausforderungskategorien</string>
   <string name="created_challenge">Erstellte Herausforderung</string>
@@ -770,7 +633,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="confirm_username">Benutzernamen bestätigen</string>
   <string name="username_not_confirmed">Benutzername nicht bestätigt</string>
   <string name="username_confirmed">Benutzername bestätigt</string>
-  <string name="enter_recipient_username">@ Benutzernamen eines Empfängers eingeben</string>
+  <string name="enter_recipient_username">\@ Benutzernamen eines Empfängers eingeben</string>
   <string name="username_copied">Benutzername in Zwischenablage kopiert</string>
   <string name="welcomeNameTitle">Wie sollen wir Dich nennen?</string>
   <string name="display_name_length_error">Anzeigenamen müssen zwischen 1 und 30 Zeichen lang sein</string>
@@ -785,9 +648,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="last_login">Letzte Anmeldung</string>
   <string name="total_checkins">Gesamtanmeldungen</string>
   <string name="two_handed">Zweihändig</string>
-  <string name="confirmUsername">Benutzernamen bestätigen</string>
-  <string name="username_level">\@%s ・Lvl %d</string>
-  <string name="verification_pet">Eines dieser Veteranen-Haustiere wartet auf Dich wenn Du die Bestätigung abgeschlossen hast!</string>
+    <string name="verification_pet">Eines dieser Veteranen-Haustiere wartet auf Dich wenn Du die Bestätigung abgeschlossen hast!</string>
   <string name="gift_subscription">Abonnement verschenken</string>
   <string name="create_party">Gruppe erstellen</string>
   <string name="subscribe_gift_description">Möchtest Du jemandem die Vorteile eines Abos schenken\?</string>
@@ -806,16 +667,16 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.</string>
   <string name="create">Erstellen</string>
   <string name="only_leader_create_challenge">Nur ein Gruppenleiter kann Wettbewerbe erstellen</string>
   <string name="opting_out_progress">Abmelden</string>
-  <string name="subscribe1month.gemcap">25 Edelstein Grenze</string>
-  <string name="subscribe3month.gemcap">30 Edelstein-Grenze</string>
-  <string name="subscribe6month.gemcap">35 Edelstein Grenze</string>
-  <string name="subscribe12month.gemcap">45 Edelstein Grenze</string>
+  <string name="subscribe1month_gemcap">25 Edelstein Grenze</string>
+  <string name="subscribe3month_gemcap">30 Edelstein-Grenze</string>
+  <string name="subscribe6month_gemcap">35 Edelstein Grenze</string>
+  <string name="subscribe12month_gemcap">45 Edelstein Grenze</string>
   <string name="delete_oauth_account_description">Bist du dir sicher\? Dies wird dein Konto für immer löschen und es kann nicht wiederhergestellt werden! Du musst ein neues Konto erstellen um Habitica erneut nutzen zu können. Erreichte und ausgegebene Edelsteine werden nicht rückerstattet. Wenn du dir absolut sicher bist, schreibe DELETE in die untere Textbox.</string>
   <string name="daily_tip_7">Versuche Gegenstände aus dem Marktplatz an Deine Belohnungen anzuheften, um Dich zu motivieren sie Dir zu verdienen!</string>
   <string name="week_reminder_text">Pausen sind gesund, dennoch kannst du mit einfachen Aufgaben Punkte verdienen um Level aufzusteigen und coole Ausrüstung zu bekommen!</string>
   <string name="usernamePromptBody">Login Namen sind jetzt einzigartige Benutzernamen, welche sichtbar neben deinem Anzeigenamen sind und für Einladungen, Chat @Erwähnungen und Nachrichten benutzt werden.</string>
-  <string name="usernamePromptWiki">Wenn du mehr über diese Änderung erfahren möchtest, <a href="https://habitica.wikia.com/wiki/Player_Names">geh auf unsere Wiki.</a></string>
-  <string name="usernamePromptDisclaimer">Benutzernamen sollten mit unseren <a href="https://habitica.com/static/terms">Servicebedingungen</a> und <a href="https://habitica.com/static/community-guidelines">Gemeinschaftsleitlinien</a> übereinstimmen. Falls du vorher keinen Loginnamen festgelegt hast, wurde dein Benutzername auto-generiert.</string>
+  <string name="usernamePromptWiki">Wenn du mehr über diese Änderung erfahren möchtest, <a href="https://habitica.wikia_com/wiki/Player_Names">geh auf unsere Wiki.</a></string>
+  <string name="usernamePromptDisclaimer">Benutzernamen sollten mit unseren <a href="https://habitica.com/static/terms">Servicebedingungen</a> und <a href="https://habitica_com/static/community-guidelines">Gemeinschaftsleitlinien</a> übereinstimmen. Falls du vorher keinen Loginnamen festgelegt hast, wurde dein Benutzername auto-generiert.</string>
   <string name="confirm_username_description">Das Bestätigen deines Nutzernamens wird diesen öffentlich für Einladungen, @Erwähnungen und Nachrichten machen. Du kannst deinen Benutzernamen jederzeit in den Einstellungen ändern.</string>
   <string name="equipment_str">STR:</string>
   <string name="equipment_con">CON:</string>
diff --git a/Habitica/res/values-en-rGB/strings.profile.xml b/Habitica/res/values-en-rGB/strings.profile.xml
index d058d7631..1ee1e270d 100644
--- a/Habitica/res/values-en-rGB/strings.profile.xml
+++ b/Habitica/res/values-en-rGB/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Level:</string>
     <string name="profile_class_bonus">Class-Bonus:</string>
     <string name="profile_allocated">Allocated:</string>
-    <string name="profile_boosts">Boosts:</string>
     <string name="profile_private_message">Private Message</string>
     <string name="profile_achievements">Achievements</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Close</string>
 
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.sidebar.xml b/Habitica/res/values-en-rGB/strings.sidebar.xml
index 4a423790c..dcafc0645 100644
--- a/Habitica/res/values-en-rGB/strings.sidebar.xml
+++ b/Habitica/res/values-en-rGB/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tasks</string>
-  <string name="sidebar.skills">Skills</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.tavern">Tavern</string>
-  <string name="sidebar.party">Party</string>
-  <string name="sidebar.purchaseGems">Gems &amp; Subscription</string>
-  <string name="sidebar.guilds">Guilds</string>
-  <string name="sidebar.challenges">Challenges</string>
-  <string name="sidebar.section.inventory">Inventory</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Equipment</string>
-  <string name="sidebar.stable">Stable</string>
-  <string name="sidebar.news">News</string>
-  <string name="sidebar.settings">Settings</string>
-  <string name="sidebar.about">About</string>
+  <string name="sidebar_tasks">Tasks</string>
+  <string name="sidebar_skills">Skills</string>
+  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_tavern">Tavern</string>
+  <string name="sidebar_party">Party</string>
+  <string name="sidebar_purchaseGems">Gems &amp; Subscription</string>
+  <string name="sidebar_guilds">Guilds</string>
+  <string name="sidebar_challenges">Challenges</string>
+  <string name="sidebar.section_inventory">Inventory</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Equipment</string>
+  <string name="sidebar_stable">Stable</string>
+  <string name="sidebar_news">News</string>
+    <string name="sidebar_about">About</string>
   <string name="sidebar_shops">Shops </string>
-<string name="sidebar.inbox">Messages</string>
+<string name="sidebar_inbox">Messages</string>
     <string name="sidebar_stats">Stats</string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.tutorial.xml b/Habitica/res/values-en-rGB/strings.tutorial.xml
index b8a4b5033..6a115f2c0 100644
--- a/Habitica/res/values-en-rGB/strings.tutorial.xml
+++ b/Habitica/res/values-en-rGB/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Buy gear for your avatar with the gold you earn!</string>
   <string name="tutorial_rewards_2">You can also make real-world Custom Rewards based on what motivates you.</string>
   <string name="tutorial_tasks_complete">That\'s all for now. If you need a reminder, check the FAQ section.</string>
-  <string name="tutorial_equipment">When you buy equipment, it appears here. Your Battle Gear affects your stats, and your Costume (if enabled) affects what your avatar wears.</string>
-  <string name="tutorial_items">Earn items by completing tasks and levelling up. Tap on an item to use it!</string>
-  <string name="tutorial_pets">As you complete real-world tasks, you now have a random chance of finding eggs and potions. Combine them to hatch pets</string>
-  <string name="tutorial_skills">Skills are special abilities that have powerful effects! Tap on a skill to use it. It will cost Mana (the blue bar), which you earn by checking in every day and by completing your real-life tasks. Check out the FAQ in the menu for more info!</string>
+    <string name="tutorial_skills">Skills are special abilities that have powerful effects! Tap on a skill to use it. It will cost Mana (the blue bar), which you earn by checking in every day and by completing your real-life tasks. Check out the FAQ in the menu for more info!</string>
   <string name="tutorial_party">This is where you and your friends can hold each other accountable to your goals and fight monsters with your tasks!</string>
   <string name="tutorial_tavern">Welcome to the Tavern, a public, all-ages chatroom! Here you can chat about productivity and ask questions. Have fun!</string>
-  <string name="tutorial_classes">Choose to become a Warrior, Mage, Healer, or Rogue! Each class has unique equipment and skills. Tap the (?) to learn more!</string>
-<string name="tutorial_stats">Tap the grey button to allocate lots of your stats at once, or tap the arrows to add them one point at a time.</string>
+    <string name="tutorial_stats">Tap the grey button to allocate lots of your stats at once, or tap the arrows to add them one point at a time.</string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index bb8393799..6e3b42af9 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -4,19 +4,15 @@
   <string name="XP_default">Experience</string>
   <string name="HP_default">Health</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Preferences couldn\'t be loaded from the barcode</string>
   <!--Prefs-->
   <string name="PS_settings_title">Settings</string>
-  <string name="SP_address_hint">Your custom server</string>
   <string name="SP_userID_title">User ID</string>
   <string name="SP_userID_summary">Your User ID</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Your API Token</string>
   <string name="Language_title">Language</string>
   <string name="Language_summary">Change Habitica\'s language</string>
-  <string name="SP_user_qr_code">Your QR Code</string>
   <string name="PS_contact_title">Contact me</string>
-  <string name="unknown_error">An error occurred…</string>
   <string name="pref_account_header">Account</string>
   <string name="pref_first_day_of_the_week_title">First Day of the Week</string>
   <string name="pref_first_day_of_the_week_summary">First day of the week in all calendars</string>
@@ -24,7 +20,6 @@
   <string name="pref_reminder_checkbox">Activate Reminder</string>
   <string name="pref_reminder_picker">Set Reminder Time</string>
   <string name="pref_cds_header">Custom Day Start</string>
-  <string name="pref_cds_picker">Set Custom Day Start Time</string>
   <string name="pref_push_notifications_checkbox">User Push Notifications</string>
   <string name="push_notifications">Push Notifications</string>
   <string name="push_notifications_sum">Set your push notifications settings</string>
@@ -37,13 +32,7 @@
   <string name="preference_push_your_quest_has_begun">Your Quest has Begun</string>
   <string name="preference_push_invited_to_quest">Invited to Quest</string>
   <!--Adding tasks-->
-  <string name="task_value">Value</string>
-  <string name="new_todo">New To-Do</string>
-  <string name="new_reward">New Reward</string>
-  <string name="new_daily">New Daily</string>
-  <string name="new_habit">New Habit</string>
   <string name="action_edit">Edit</string>
-  <string name="action_delete">Delete</string>
   <string name="action_cancel">Cancel</string>
   <string name="login_btn">Log in</string>
   <string name="register_btn">Register</string>
@@ -54,31 +43,22 @@
   <string name="confirmpassword">Confirm password</string>
   <string name="logout">Log out</string>
   <string name="logout_description">Log out of your account</string>
-  <string name="account_details">Account Details</string>
   <string name="LoginActivityName">Welcome</string>
-  <string name="string_revive">Revive</string>
-  <string name="please_connect">Please connect through the application before using a widget</string>
-  <string name="about.title">About</string>
-  <string name="about.libraries">Libraries</string>
-  <string name="about.versionhistory">Version history</string>
-  <string name="about.habitica_open_source">Habitica is available as open source software on Github</string>
-  <string name="about.rate_our_app">Rate our App</string>
-  <string name="about.give_us_feedback">Send us Feedback!</string>
-  <string name="about.bugreport">Report a Bug</string>
-  <string name="about.source_code">Source Code</string>
-  <string name="repeatEvery">Repeat Every</string>
+  <string name="about_title">About</string>
+  <string name="about_libraries">Libraries</string>
+  <string name="about_habitica_open_source">Habitica is available as open source software on Github</string>
+  <string name="about_rate_our_app">Rate our App</string>
+  <string name="about_give_us_feedback">Send us Feedback!</string>
+  <string name="about_bugreport">Report a Bug</string>
+  <string name="about_source_code">Source Code</string>
   <!--Network Errors-->
-  <string name="network_error_title">Connection Error</string>
-  <string name="network_error_no_network_body">You are not connected to the internet.</string>
   <string name="internal_error_api">There seems to be a problem with the server. Try again later.</string>
   <string name="authentication_error_title">Authentication Error</string>
-  <string name="authentication_error_body">Your Username and/or Password was incorrect.</string>
   <string name="login_validation_error_title">Validation Error</string>
   <string name="login_validation_error_fieldsmissing">You have to fill out all fields.</string>
   <string name="save_changes">Save</string>
   <string name="copy">Copy</string>
   <string name="notes">Notes</string>
-  <string name="text">Text</string>
   <string name="difficulty">Difficulty</string>
   <string name="tags">Tags</string>
   <string name="trivial">Trivial</string>
@@ -90,18 +70,7 @@
   <string name="negative_habit_form">Negative ( - )</string>
   <string name="checklist">Checklist</string>
   <string name="reminders">Reminders</string>
-  <string name="actions">Actions</string>
   <string name="attributes">Attributes</string>
-  <string name="physical">Strength</string>
-  <string name="mental">Intelligence</string>
-  <string name="social">Constitution</string>
-  <string name="other">Perception</string>
-  <string name="frequency">Frequency</string>
-  <string name="frequency_weekly">On Certain Days of the Week</string>
-  <string name="frequency_daily">Every X Days</string>
-  <string name="repeatables_summary_title">Summary</string>
-  <string name="repeatables_title">Repeats</string>
-  <string name="repeatables_on_title">Repeats On</string>
   <string name="repeatables_frequency_daily">Daily</string>
   <string name="repeatables_frequency_weekly">Weekly</string>
   <string name="repeatables_frequency_monthly">Monthly</string>
@@ -120,23 +89,14 @@
   <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>
-  <string name="profile_image">Profile Image</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">You used %1$s for %2$d mana.</string>
   <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="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>
-  <string name="flag_confirm">Flag Message</string>
   <string name="unlock_lvl_11">Unlock at lvl 11</string>
-  <string name="no_party_message">You are not in a party. To join a party, please visit the website.</string>
   <string name="forgot_pw_btn">Forgot Password</string>
-  <string name="tavern.inn.checkOut">Re-activate your Dailies</string>
-  <string name="tavern.inn.rest">Pause your Dailies</string>
-  <string name="reward.dialog.buy">Buy</string>
-  <string name="reward.dialog.dismiss">Dismiss</string>
+  <string name="tavern.inn_checkOut">Re-activate your Dailies</string>
+  <string name="tavern.inn_rest">Pause your Dailies</string>
+  <string name="reward.dialog_buy">Buy</string>
+  <string name="reward.dialog_dismiss">Dismiss</string>
   <string name="party">Party</string>
   <string name="chat">Chat</string>
   <string name="members">Members</string>
@@ -144,8 +104,6 @@
   <string name="dailies">Dailies</string>
   <string name="todos">To-Dos</string>
   <string name="rewards">Rewards</string>
-  <string name="taskform.delete.title">Are you sure?</string>
-  <string name="taskform.delete.message">Do you really want to delete?</string>
   <string name="yes">Yes</string>
   <string name="no">No</string>
   <string name="quest">Quest</string>
@@ -153,14 +111,12 @@
   <string name="avatar_hair">Hair</string>
   <string name="avatar_shirt">Shirt</string>
   <string name="avatar_skin">Skin</string>
-  <string name="avatar_ears">Animal Ears</string>
   <string name="avatar_base">Base</string>
   <string name="avatar_color">Colour</string>
   <string name="avatar_beard">Beard</string>
   <string name="avatar_mustache">Moustache</string>
   <string name="avatar_flower">Flower</string>
   <string name="avatar_bangs">Bangs</string>
-  <string name="avatar_nothing">Nothing set</string>
   <string name="avatar_size">Size</string>
   <string name="avatar_size_slim">Slim</string>
   <string name="avatar_size_broad">Broad</string>
@@ -170,22 +126,16 @@
   <string name="purchase_button">Purchase</string>
   <string name="purchase_set_title">Purchase set %s</string>
   <string name="due_date">Due Date</string>
-  <string name="quest.accept">Accept</string>
-  <string name="quest.reject">Reject</string>
-  <string name="quest.begin">Begin Quest</string>
-  <string name="quest.cancel">Cancel Invitation</string>
-  <string name="quest.abort">Abort Quest</string>
-  <string name="quest.leave">Leave Quest</string>
-  <string name="quest.pending">Pending</string>
-  <string name="quest.accepted">Accepted</string>
-  <string name="quest.rejected">Rejected</string>
-  <string name="quest.participants">Participants</string>
+  <string name="quest_accept">Accept</string>
+  <string name="quest_reject">Reject</string>
+  <string name="quest_begin">Begin Quest</string>
+  <string name="quest_cancel">Cancel Invitation</string>
+  <string name="quest_abort">Abort Quest</string>
   <string name="version_info">Version %1$s (%2$d)</string>
   <string name="sidebar_help">Help &amp; FAQ</string>
   <string name="complete_tutorial">Got it!</string>
   <string name="dismiss_tutorial">Remind me again</string>
   <string name="intro_1_subtitle">Welcome to</string>
-  <string name="intro_1_title">Habitica</string>
   <string name="intro_1_description">It’s time to have fun while you get things done. Join over %s others improving their life one task at a time.</string>
   <string name="intro_2_subtitle">Progress in the game</string>
   <string name="intro_2_title">Progress in life</string>
@@ -194,11 +144,8 @@
   <string name="intro_3_title">Get social</string>
   <string name="intro_3_description">Keep your goals on track with help from your friends. Support each other in life and in battle as you improve together!</string>
   <string name="intro_finish_button">Let\'s start!</string>
-  <string name="previous_button">Previous</string>
   <string name="next_button">Next</string>
   <string name="skip_button">Skip</string>
-  <string name="setup_welcome_description">Welcome to Habitica, where advancing in the game will improve your real life! As you accomplish real-world goals, you\'ll unlock equipment, pets, quests, and more.</string>
-  <string name="setup_welcome_title">Welcome</string>
   <string name="avatar_setup_description">So, how would you like to look? Don\'t worry, you can change this later.</string>
   <string name="task_setup_description">Great! Now, what are you interested in working on throughout this journey?</string>
   <string name="setup_group_work">Work</string>
@@ -229,28 +176,19 @@
   <string name="setup_task_creativity_1">Study a master of the craft</string>
   <string name="setup_task_creativity_2">Work on creative project</string>
   <string name="setup_task_creativity_3">Finish creative project</string>
-  <string name="gem.purchase.support">Want to help us keep Habitica running? You can support the developers by buying gems!\n\nGems allow you to buy fun extras for your account, including: \n\n - Cool costumes for your avatar\n - Awesome backgrounds\n - Fun quests that reward you with pet eggs\n - The ability to change your class before level 100\n\nThank you so much for helping us make Habitica the best it can be. Your support means a lot to us!</string>
   <string name="my_guilds">My Guilds</string>
   <string name="public_guilds">Public Guilds</string>
   <string name="guild">Guild</string>
   <string name="leave">Leave</string>
   <string name="join">Join</string>
-  <string name="leader">Leader</string>
   <string name="gems">Gems</string>
-  <string name="copy_as_todo">Copy as To-Do</string>
-  <string name="send_pm">Send PM</string>
-  <string name="flag">Flag</string>
   <string name="delete">Delete</string>
   <string name="name">Name</string>
   <string name="description">Description</string>
   <string name="add_tag">Add new Tag</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Write Message</string>
-  <string name="post">Post</string>
   <string name="guild_search_hint">Search for guilds</string>
-  <string name="todo_due">Due: %s</string>
-  <string name="daily_streak">current streak: %d</string>
-  <string name="todo_has_duedate">Task has Due Date</string>
   <string name="battle_gear">Battle Gear</string>
   <string name="costume">Costume</string>
   <string name="outfit_head">Head</string>
@@ -264,8 +202,6 @@
   <string name="wear_costume">Wear Costume</string>
   <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.invitation.text">You have been invited to participate in a quest!</string>
   <string name="today">Today</string>
   <string name="sidebar_items">Items</string>
   <string name="eggs">Eggs</string>
@@ -277,12 +213,8 @@
   <string name="armoireEquipment">You found a piece of rare Equipment in the Armoire: %s! Awesome!</string>
   <string name="armoireFood">You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?</string>
   <string name="armoireExp">You wrestle with the Armoire and gain Experience. Take that!</string>
-  <string name="armoireNotesFull">Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining: %d</string>
-  <string name="armoireLastItem">You\'ve found the last piece of rare Equipment in the Enchanted Armoire.</string>
-  <string name="armoireNotesEmpty">The Armoire will have new Equipment in the first week of every month. Until then, keep clicking for Experience and Food!</string>
   <string name="sell">Sell (%d Gold)</string>
   <string name="hatch_with_potion">Hatch with potion</string>
-  <string name="feed_to_pet">Feed to pet</string>
   <string name="hatch_egg">Hatch with egg</string>
   <string name="invite_party">Invite party</string>
   <string name="dialog_feeding">Feed %s with:</string>
@@ -306,7 +238,6 @@
   <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>
   <string name="select_class">Select Class</string>
   <string name="opt_out_class">Opt Out</string>
-  <string name="opt_out_description">Can\'t be bothered with classes? Want to choose later? Opt out - you\'ll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time.</string>
   <string name="class_confirmation">Are you sure you want to be a %s?</string>
   <string name="class_changed">You are now a %s!</string>
   <string name="class_changed_description">You have new default Battle Gear that you can change under Equipment!</string>
@@ -320,12 +251,9 @@
   <string name="invite_existing_users">Invite Existing Users</string>
   <string name="send">Send</string>
   <string name="invite">Invite Friends</string>
-  <string name="invite_id_description">If you have friends already using Habitica, invite them by User ID here.</string>
   <string name="invite_email_description">If a friend joins Habitica via your email, they\'ll automatically be invited to your party!</string>
   <string name="add_invites">Add Invites</string>
-  <string name="user_id">User ID</string>
   <string name="email">Email</string>
-  <string name="invite_users">Invite to Party</string>
   <string name="share_using">Share using</string>
   <string name="share_levelup">I got to level %d in Habitica by improving my real-life habits!</string>
   <string name="share_hatched">I just hatched a %1$s %2$s pet in Habitica by completing my real-life tasks!</string>
@@ -333,43 +261,20 @@
   <string name="open_in_store">Open in Play Store</string>
   <string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
   <string name="change_class_equipment_warning">Warning: You will no longer be able to buy equipment from the %s class.</string>
-  <string name="leaderMessage">Message from %1$s</string>
-  <string name="leaderName">Leader: %1$s</string>
   <string name="confirm">Confirm</string>
   <string name="market">Market</string>
   <string name="timeTravelers">Time Travellers</string>
   <string name="seasonalShop">Seasonal Shop</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>
   <string name="successful_purchase">Purchased %1$s</string>
-  <string name="purchase_confirmation_title">Confirm purchase</string>
-  <string name="confirm_purchase_text">Purchase %1$s for %2$s %3$s</string>
-  <string name="gem">gem</string>
-  <string name="hourglass">hourglass</string>
-  <string name="hourglasses">hourglasses</string>
-  <string name="gold_singular">gold</string>
   <string name="gold_plural">gold</string>
   <string name="chat_message_copied">Message copied to Clipboard</string>
-  <string name="copy_chat_message">Copy to clipboard</string>
-  <string name="edit_tag_title">Edit Tag</string>
   <string name="edit_tag_btn_edit">Edit</string>
-  <string name="edit_tag_btn_done">Done</string>
-  <string name="edit_tag_btn_delete">Delete</string>
   <string name="confirm_delete_tag_title">Are you sure?</string>
   <string name="confirm_delete_tag_message">Do you really want to delete?</string>
-  <string name="filter_drawer_edit_tags">Edit Tags</string>
-  <string name="filter_drawer_filter_tags">Filter by Tags</string>
   <!--QR Strings-->
-  <string name="qr_section_title">Have someone invite you with this QR Code</string>
-  <string name="qr_save_message">QR Code saved at</string>
-  <string name="qr_dialogue_title">Your QR Code</string>
-  <string name="download">Download</string>
-  <string name="send_new_message">Send new message</string>
   <string name="choose_recipient_title">Choose Message Recipient</string>
   <string name="action_continue">Continue</string>
-  <string name="scan_qr_code">Scan QR Code</string>
-  <string name="enter_recipient_uuid">Enter Recipient\'s User ID</string>
   <string name="invited_to_party">You were invited to join a party!</string>
   <string name="stats_widget_label">Habitica Stats</string>
   <string name="add_task">Add Task</string>
@@ -381,15 +286,14 @@
   <string name="widget_habit_button">Habitica Do Habit</string>
   <string name="widget_dailies">Habitica Dailies</string>
   <string name="widget_todo_list">Habitica To-Do List</string>
-  <string name="widget_add_task">Habitica Add Task</string>
   <string name="google_services_missing">Google Play services could not be found.</string>
-  <string name="gem.purchase.toolbartitle">Purchase</string>
-  <string name="gem.purchase.title">Buying gems supports the developers and helps keep Habitica running</string>
-  <string name="gem.purchase.subtitle">Gems allow you to buy fun extras for your account, including:</string>
-  <string name="gem.purchase.listitem1">Cool costumes for your avatar</string>
-  <string name="gem.purchase.listitem2">Awesome backgrounds</string>
-  <string name="gem.purchase.listitem3">Quests that reward you with pet eggs</string>
-  <string name="gem.purchase.listitem4">The ability to change your class before level 100</string>
+  <string name="gem.purchase_toolbartitle">Purchase</string>
+  <string name="gem.purchase_title">Buying gems supports the developers and helps keep Habitica running</string>
+  <string name="gem.purchase_subtitle">Gems allow you to buy fun extras for your account, including:</string>
+  <string name="gem.purchase_listitem1">Cool costumes for your avatar</string>
+  <string name="gem.purchase_listitem2">Awesome backgrounds</string>
+  <string name="gem.purchase_listitem3">Quests that reward you with pet eggs</string>
+  <string name="gem.purchase_listitem4">The ability to change your class before level 100</string>
   <string name="support_habitica">Support Habitica</string>
   <string name="skill_transformation_use">use</string>
   <string name="hatching_market_info">Not getting the right drops? Check out the Market!</string>
@@ -403,26 +307,26 @@
   <string name="belongs_to_challenge">Belongs to Challenge</string>
   <string name="has_reminder">Has Reminder</string>
   <string name="has_tag">Has Tag</string>
-  <string name="subscribe.title">Subscribing supports the developers and helps keep Habitica running</string>
+  <string name="subscribe_title">Subscribing supports the developers and helps keep Habitica running</string>
   <string name="subscribe_prompt">Become a subscriber and you’ll get these useful benefits:</string>
-  <string name="subscribe.listitem1">Buy gems with gold</string>
-  <string name="subscribe.listitem2">Exclusive monthly items</string>
-  <string name="subscribe.listitem3">Retain additional history entries</string>
-  <string name="subscribe.listitem4">Daily drop-caps doubled</string>
+  <string name="subscribe_listitem1">Buy gems with gold</string>
+  <string name="subscribe_listitem2">Exclusive monthly items</string>
+  <string name="subscribe_listitem3">Retain additional history entries</string>
+  <string name="subscribe_listitem4">Daily drop-caps doubled</string>
   <string name="subscriptions">Subscriptions</string>
   <string name="subscription_duration">Recurring every %s</string>
   <string name="subscribe">Subscribe</string>
-  <string name="subscribe.listitem1.description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
-  <string name="subscribe.listitem2.description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travellers will grant you access to historic (and futuristic!) cosmetic items.</string>
-  <string name="subscribe.listitem3.description">Makes completed To-Dos and task history available for longer.</string>
-  <string name="subscribe.listitem4.description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
+  <string name="subscribe.listitem1_description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
+  <string name="subscribe.listitem2_description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travellers will grant you access to historic (and futuristic!) cosmetic items.</string>
+  <string name="subscribe.listitem3_description">Makes completed To-Dos and task history available for longer.</string>
+  <string name="subscribe.listitem4_description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
   <string name="subscription_hourglasses">+%d Mystic Hourglass</string>
   <string name="payment_method">Payment method</string>
   <string name="subscription">Subscription</string>
   <string name="active">Active</string>
   <string name="cancel_subscription">Cancel Subscription</string>
-  <string name="cancel_subscription_google.description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">No longer want to subscribe? Due to your payment method, you can only unsubscribe through the website. Click the button below, to open the site in your browser!</string>
+  <string name="cancel_subscription_google_description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">No longer want to subscribe? Due to your payment method, you can only unsubscribe through the website. Click the button below, to open the site in your browser!</string>
   <string name="visit_habitica_website">Visit Habitica Website</string>
   <string name="current_bonuses">Current Bonuses</string>
   <string name="months_subscribed">Months subscribed</string>
@@ -437,8 +341,6 @@
   <string name="twelve_months">12 months</string>
   <string name="subscribe_prompt_thanks">For Subscribing, you are receiving these useful benefits:</string>
   <string name="subscription_status">Subscription Status</string>
-  <string name="byLeader">by %s</string>
-  <string name="challenge_details">Challenge Details</string>
   <string name="challenge_leave_title">Leave Challenge</string>
   <string name="challenge_leave_text">Are you sure you want to leave the Challenge “%s”?</string>
   <string name="challenge_remove_tasks_title">Remove tasks</string>
@@ -446,45 +348,31 @@
   <string name="remove_tasks">Remove</string>
   <string name="keep_tasks">Keep</string>
   <string name="my_challenges">My Challenges</string>
-  <string name="public_challenges">Public</string>
-  <string name="challenges">Challenges</string>
   <string name="daily">Daily</string>
   <string name="habit">Habit</string>
   <string name="reward">Reward</string>
   <string name="todo">To-Do</string>
   <string name="official">Official</string>
-  <string name="participating">Participating</string>
   <string name="challenge">Challenge</string>
-  <string name="go_to_challenge">Go to Challenge</string>
   <string name="not_part_of_a_challenge">You’re not part of any Challenges right now!</string>
   <string name="join_a_challenge">Join a Challenge to add a curated set of tasks to your list, then compete against other Habiticans to win achievements and even gems!</string>
   <string name="check_the_public_challenge_tab">Tap the “Public” tab to find the user-created Challenges that are the best fit for you!</string>
-  <string name="add_reminder">Add Reminder</string>
-  <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="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>
-  <string name="limited_count">%d left</string>
   <string name="gem_shop">Gem</string>
   <string name="mystery_item">Mystery Item</string>
   <string name="myster_item_notes">Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month.</string>
   <string name="open">Open</string>
-  <string name="notification_mystery_item">You open the box and find %s!</string>
   <string name="checkInRewardEarned">You earned a %1$s as a reward for your devotion to improving your life.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Your next prize unlocks at %1$d Check-Ins</string>
   <string name="pending_approval">pending approval</string>
   <string name="filters">Filters</string>
   <string name="done">Done</string>
-  <string name="group_tasks_edit_description">Group tasks cannot be edited.</string>
-  <string name="group_tasks_edit_title">Can\'t edit this task</string>
   <string name="groups">Groups</string>
   <string name="all">All</string>
   <string name="none">None</string>
   <string name="owned">Owned</string>
   <string name="not_owned">Not owned</string>
-  <string name="new_game">New\nGame</string>
   <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>
@@ -515,7 +403,6 @@
   <string name="reload_content">Reload Content</string>
   <string name="dailyDueDefaultView">Set Dailies default to ‘due’ tab</string>
   <string name="dailyDueDefaultViewDescription">With this option set, the Dailies tasks will default to ‘due’ instead of ‘all’</string>
-  <string name="repeat_summary">Repeats %1$s every %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Your device does not have any of the supported payment methods. Please use the Habitica website if you want to purchase gems.</string>
   <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>
@@ -528,41 +415,36 @@
   <string name="new_challenge_title">New challenge title</string>
   <string name="ownership">Ownership</string>
   <string name="inn">Inn</string>
-  <string name="system">System</string>
   <string name="start_quest">Start a new Quest</string>
   <string name="leave_party">Leave Party</string>
   <string name="party_description">Party Description</string>
-  <string name="abort_confirmation">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="leave_quest_confirmation">Are you sure you want to leave the active quest? All your quest progress will be lost.</string>
   <string name="number_participants">%1$d Participants</string>
   <string name="welcome_back">Welcome Back</string>
   <string name="yesterdaililes_prompt">Did you do any of these Dailies yesterday?</string>
   <string name="start_day">Start My Day</string>
   <string name="leave_party_confirmation">Are you sure you want to leave the Party?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Next Prize in %d Check-ins</string>
   <string name="pending">Pending</string>
   <string name="accepted">Accepted</string>
   <string name="declined">Declined</string>
   <string name="participants">Participants</string>
   <string name="invitations">Invitations</string>
-  <string name="quest_leader_header" formatted="false">Started by %s</string>
+  <string name="quest_leader_header">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="reloading_content">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">Your balance:</string>
-  <string name="available_until" formatted="false">Available until %s</string>
-  <string name="gems_left_max" formatted="false">Monthly Gems: %1$d/%2$d Remaining</string>
-  <string name="gems_left_nomax" formatted="false">Monthly Gems: %d Remaining</string>
+  <string name="available_until">Available until %s</string>
+  <string name="gems_left_max">Monthly Gems: %1$d/%2$d Remaining</string>
+  <string name="gems_left_nomax">Monthly Gems: %d Remaining</string>
   <string name="health">Health</string>
   <string name="collect">Collect</string>
   <string name="rage_meter">Rage Meter</string>
   <string name="boss_quest">Boss Quest</string>
   <string name="collection_quest">Collection Quest</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Experience points</string>
-  <string name="gold_reward" formatted="false">%d Gold</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Experience points</string>
+  <string name="gold_reward">%d Gold</string>
   <string name="quest_owner_rewards">Quest Owner Rewards</string>
   <string name="reset_account">Reset Account</string>
   <string name="reset_account_description">WARNING! This resets many parts of your account. This is highly discouraged, but some people find it useful in the beginning after playing with the site for a short time.\n\nYou will lose all your levels, gold, and experience points. All your tasks (except those from challenges) will be deleted permanently and you will lose all of their historical data. You will lose all your equipment but you will be able to buy it all back, including all limited edition equipment or subscriber Mystery items that you already own (you will need to be in the correct class to re-buy class-specific gear). You will keep your current class and your pets and mounts. You might prefer to use an Orb of Rebirth instead, which is a much safer option and which will preserve your tasks and equipment.</string>
@@ -571,7 +453,6 @@
   <string name="reset_account_confirmation">reset my account</string>
   <string name="delete_account_confirmation">delete my account</string>
   <string name="danger_zone">Danger Zone</string>
-  <string name="nevermind">Never mind</string>
   <string name="resetting_account">Resetting Account</string>
   <string name="deleting_account">Deleting Account</string>
   <string name="levelup_header">You Reached Level %1$d!</string>
@@ -585,17 +466,8 @@
   <string name="ago_minutes">%dm ago</string>
   <string name="ago_hours">%dh ago</string>
   <string name="ago_1hour">1h ago</string>
-  <string name="evolved_pet_title">You have tamed %1$s %2$s, let\'s go for a ride!</string>
-  <string name="notification_purchase">You purchased %s</string>
+  <string name="evolved_pet_title">You have tamed %s, let\'s go for a ride!</string>
   <string name="notification_purchase_reward">You purchased a reward</string>
-  <string name="sectionpets">Standard</string>
-  <string name="sectionpremiumPets">Magic Potion</string>
-  <string name="sectionquestPets">Quest</string>
-  <string name="sectionspecialPets">Rare</string>
-  <string name="sectionmounts">Standard</string>
-  <string name="sectionpremiumMounts">Magic Potion</string>
-  <string name="sectionquestMounts">Quest</string>
-  <string name="sectionspecialMounts">Rare</string>
   <string name="inn_description">Need a break\? Check into Daniel’s Inn to pause some of Habitica’s more difficult game mechanics:
 \n
 \n • Missed Dailies won’t damage you
@@ -610,10 +482,10 @@
   <string name="login_incentive">Unlock by logging into Habitica regularly</string>
   <string name="create_account">Unlock by creating an account</string>
   <string name="subscription_duration_norenew">For %s</string>
-  <string name="subscribe1month.gemcap">25 Gem cap</string>
-  <string name="subscribe3month.gemcap">30 Gem cap</string>
-  <string name="subscribe6month.gemcap">35 Gem cap</string>
-  <string name="subscribe12month.gemcap">45 Gem cap</string>
+  <string name="subscribe1month_gemcap">25 Gem cap</string>
+  <string name="subscribe3month_gemcap">30 Gem cap</string>
+  <string name="subscribe6month_gemcap">35 Gem cap</string>
+  <string name="subscribe12month_gemcap">45 Gem cap</string>
   <string name="due">Due</string>
   <string name="inbox">Messages</string>
   <string name="welcome_text">Oh, you must be new here. I’m Justin, I’ll be your guide in Habitica.
@@ -622,11 +494,9 @@
   <string name="dated">Scheduled</string>
   <string name="gem_reward">Gem prize</string>
   <string name="create_challenge">Create Challenge</string>
-  <string name="edit_challenge">Edit</string>
   <string name="challenge_create_error_tavern_one_gem">You need at least 1 gem to create a public challenge.</string>
   <string name="identify_your_challenge_with_a_tag">Identify your challenge with a short name</string>
   <string name="challenge_create_error_tag">You need a short name to create this Challenge.</string>
-  <string name="loading">Loading…</string>
   <string name="str_abbrv">Str</string>
   <string name="per_abbrv">Per</string>
   <string name="int_abbrv">Int</string>
@@ -663,7 +533,6 @@
   <string name="authentication_summary">Change your authentication options.</string>
   <string name="change_password">Change Password</string>
   <string name="change_email">Change Email Address</string>
-  <string name="change_login_name">Change Login Name</string>
   <string name="change_username">Change Username</string>
   <string name="change">Change</string>
   <string name="character_level">Character Level</string>
@@ -685,7 +554,7 @@
   <string name="distribute_class">Distribute based on class</string>
   <string name="distribute_task">Distribute based on task activity</string>
   <string name="no_points_to_allocate">No points to Allocate</string>
-  <string name="points_to_allocate" formatted="false">%d Points to Allocate</string>
+  <string name="points_to_allocate">%d Points to Allocate</string>
   <string name="distribute_evenly_help">Assigns the same number of points to each attribute.</string>
   <string name="distribute_class_help">Assigns more points to the attributes important to your Class.</string>
   <string name="distribute_task_help">Assigns points based on the Strength, Intelligence, Constitution, and Perception categories associated with the tasks you complete.</string>
@@ -696,8 +565,6 @@
   <string name="class_equipment_shop_dialog">This item is only available to a specific class.
 \nYou can change your class from Settings.</string>
   <string name="class_gear_disclaimer">You can only purchase gear for your current class</string>
-  <string name="available_stats" formatted="false">%d points</string>
-  <string name="toogle_emojis">Toggle Emojis</string>
   <string name="tavern_description">Welcome to the Inn! Pull up a chair to chat, or take a break from your tasks.</string>
   <string name="check_into_inn">Check into Inn</string>
   <string name="community_guidelines">Community Guidelines</string>
@@ -712,20 +579,13 @@
   <string name="navigation_drawer_open">Open navigation drawer</string>
   <string name="navigation_drawer_close">Close navigation drawer</string>
   <string name="world_boss">World Boss</string>
-  <string name="world_boss_art">Boss Art</string>
   <string name="boss_art">Boss Art</string>
   <string name="world_boss_description">World Boss Description</string>
-  <string name="rage_strike_count" formatted="false">Rage Strikes: %d/%d</string>
-  <string name="pending_strike_description">This Strike hasn’t happened yet!
-\nThe World Boss will lash out and attack one of our friendly shopkeepers once its rage bar fills. Keep up with your Dailies to try and prevent it from happening!</string>
+  <string name="rage_strike_count">Rage Strikes: %d/%d</string>
   <string name="pending_strike_title">Pending Strike</string>
   <string name="strike_description_title">What\'s a Rage Strike\?</string>
-  <string name="strike_description_subtitle">There are 3 potential Rage Strikes</string>
-  <string name="strike_description_description">This gauge fills when Habiticans miss their Dailies. If it fills up, the DysHeartener will unleash its Shattering Heartbreak attack on one of Habitica\'s shopkeepers, so be sure to do your tasks!</string>
-  <string name="pending_strike_subtitle">This Strike hasn\'t happened yet!</string>
-  <string name="strike_active_title" formatted="false">The %s was Attacked!</string>
-  <string name="strike_active_subtitle" formatted="false">%s is Heartbroken!</string>
-  <string name="strike_active_description" formatted="false">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
+  <string name="strike_active_title">The %s was Attacked!</string>
+  <string name="strike_active_description">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
   <string name="questShop">Quest Shop</string>
   <string name="market_owner_long">Alex the Merchant</string>
   <string name="tavern_owner_long">Daniel the inn keeper</string>
@@ -735,32 +595,20 @@
   <string name="no_party_description">Take on quests with friends or on your own. Battle monsters, create Challenges, and help yourself stay accountable through Parties.</string>
   <string name="no_party_title">Play Habitica in a Party</string>
   <string name="join_party_description">Give a Party member the username found below and they can send you an invite</string>
-  <string name="join_party_description_id">Give them your User ID or have them scan your QR code whilst inviting</string>
   <string name="join_party_title">Want to join a party\?</string>
-  <string name="create_party_website">Open website to create party</string>
-  <string name="id_copied">ID copied to clipboard</string>
   <string name="insufficientSubscriberGems">You have bought all the Gems you can this month. More become available within the first three days of each month. Thanks for subscribing!</string>
-  <string name="insufficientSubscriberGemsTitle">Monthly Gem Cap Reached</string>
-  <string name="chat_message">Chat Message</string>
   <string name="world_boss_description_title">What\'s a World Boss\?</string>
-  <string name="world_boss_description_description">A World Boss is a special event where the whole community works together to take down a powerful monster with their tasks!
-\nComplete tasks to damage the Boss
-\nThe Boss won’t damage you for missed tasks, but its Rage metre will go up. If the bar fills up, the Boss will attack one of the shopkeepers!
-\nYou can continue with normal Quest Bosses, damage will apply to both
-\nCheck the Tavern to see Boss progress and Rage attacks</string>
   <string name="world_boss_description_intro">A World Boss is a special event where the whole community works together to take down a powerful monster with their tasks!</string>
   <string name="world_boss_description_1">Complete tasks to damage the Boss</string>
   <string name="world_boss_description_2">The Boss won’t damage you for missed tasks, but its Rage metre will go up. If the bar fills up, the Boss will attack one of the shopkeepers!</string>
   <string name="world_boss_description_3">You can continue with normal Quest Bosses, damage will apply to both</string>
   <string name="world_boss_description_4">Check the Tavern to see Boss progress and Rage attacks</string>
-  <string name="world_boss_action_prompt" formatted="false">Defeat the Boss to earn special rewards and save Habitica from %s’s Terror!</string>
-  <string name="world_boss_description_subtitle">%s attacks!</string>
+  <string name="world_boss_action_prompt">Defeat the Boss to earn special rewards and save Habitica from %s’s Terror!</string>
   <string name="questShop_owner_long">Ian the Quest Guide</string>
   <string name="seasonalShop_owner_long">Seasonal Sorceress</string>
   <string name="rage_attack">Rage attack:</string>
   <string name="tavern_description_world_boss">Oh dear, pay no heed to the monster below — this is still a safe haven to chat on your breaks.</string>
   <string name="report">Report</string>
-  <string name="like">Like</string>
   <string name="reply">Reply</string>
   <string name="challenge_prize">Challenge Prize</string>
   <string name="challenge_categories">Challenge Categories</string>
@@ -795,16 +643,14 @@
   <string name="two_handed">Two-handed</string>
   <string name="usernamePromptTitle">It’s time to set your username!</string>
   <string name="usernamePromptBody">Login names are now unique usernames that will be visible beside your display name and used for invitations, chat @mentions, and messaging.</string>
-  <string name="usernamePromptWiki">If you’d like to learn more about this change, <a href="https://habitica.wikia.com/wiki/Player_Names">visit our wiki.</a></string>
-  <string name="confirmUsername">Confirm Username</string>
-  <string name="usernamePromptDisclaimer">Usernames should conform to our <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica.com/static/community-guidelines">Community Guidelines</a>. If you didn’t previously set a login name, your username was auto-generated.</string>
+  <string name="usernamePromptWiki">If you’d like to learn more about this change, <a href="https://habitica.wikia_com/wiki/Player_Names">visit our wiki.</a></string>
+  <string name="usernamePromptDisclaimer">Usernames should conform to our <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica_com/static/community-guidelines">Community Guidelines</a>. If you didn’t previously set a login name, your username was auto-generated.</string>
   <string name="confirm_username_title">Are you sure you want to confirm your current username\?</string>
   <string name="confirm_username_description">Confirming your username will make it public for invitations, @mentions and messaging. You can change your username from settings at any time.</string>
   <string name="cancel">Cancel</string>
   <string name="confirm_username">Confirm Username</string>
   <string name="username_not_confirmed">Username not confirmed</string>
   <string name="username_confirmed">Username Confirmed</string>
-  <string name="username_level">\@%s ・Lvl %d</string>
   <string name="enter_recipient_username">Enter a Recipient\'s @ username</string>
   <string name="username_copied">Username copied to clipboard</string>
   <string name="verification_pet">One of these Veteran Pets will be waiting for you after you’ve finished confirming!</string>
diff --git a/Habitica/res/values-es/strings.profile.xml b/Habitica/res/values-es/strings.profile.xml
index dfeccc29f..4add76f2b 100644
--- a/Habitica/res/values-es/strings.profile.xml
+++ b/Habitica/res/values-es/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Nivel:</string>
     <string name="profile_class_bonus">Bonus de clase:</string>
     <string name="profile_allocated">Asignado:</string>
-    <string name="profile_boosts">Incrementos:</string>
     <string name="profile_private_message">Mensaje privado</string>
     <string name="profile_achievements">Logros</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Cerrar</string>
 
 </resources>
diff --git a/Habitica/res/values-es/strings.sidebar.xml b/Habitica/res/values-es/strings.sidebar.xml
index c43f52a94..285fda638 100644
--- a/Habitica/res/values-es/strings.sidebar.xml
+++ b/Habitica/res/values-es/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tareas</string>
-  <string name="sidebar.skills">Habilidades</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Mensajes</string>
-  <string name="sidebar.tavern">Taberna</string>
-  <string name="sidebar.party">Equipo</string>
-  <string name="sidebar.purchaseGems">Gemas y Suscripción</string>
-  <string name="sidebar.guilds">Gremios</string>
-  <string name="sidebar.challenges">Desafíos</string>
-  <string name="sidebar.section.inventory">Inventario</string>
-  <string name="sidebar.avatar">Personaje</string>
-  <string name="sidebar.equipment">Equipamiento</string>
-  <string name="sidebar.stable">Establo</string>
-  <string name="sidebar.news">Noticias</string>
-  <string name="sidebar.settings">Ajustes</string>
-  <string name="sidebar.about">Información</string>
+  <string name="sidebar_tasks">Tareas</string>
+  <string name="sidebar_skills">Habilidades</string>
+  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_inbox">Mensajes</string>
+  <string name="sidebar_tavern">Taberna</string>
+  <string name="sidebar_party">Equipo</string>
+  <string name="sidebar_purchaseGems">Gemas y Suscripción</string>
+  <string name="sidebar_guilds">Gremios</string>
+  <string name="sidebar_challenges">Desafíos</string>
+  <string name="sidebar.section_inventory">Inventario</string>
+  <string name="sidebar_avatar">Personaje</string>
+  <string name="sidebar_equipment">Equipamiento</string>
+  <string name="sidebar_stable">Establo</string>
+  <string name="sidebar_news">Noticias</string>
+    <string name="sidebar_about">Información</string>
   <string name="sidebar_shops">Tiendas</string>
   <string name="sidebar_stats">Atributos</string>
 </resources>
diff --git a/Habitica/res/values-es/strings.tutorial.xml b/Habitica/res/values-es/strings.tutorial.xml
index 55c7eb8bf..9a7b763c9 100644
--- a/Habitica/res/values-es/strings.tutorial.xml
+++ b/Habitica/res/values-es/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">¡Compra equipamiento para tu personaje con el oro que ganas!</string>
   <string name="tutorial_rewards_2">También puedes hacer Recompensas Personalizadas del mundo real basándote en lo que te motiva.</string>
   <string name="tutorial_tasks_complete">Eso es todo por ahora. Si necesitas un recordatorio, consulta la sección de Preguntas Frecuentes.</string>
-  <string name="tutorial_equipment">Cuando compres artículos de equipamiento, aparecerán aquí. El equipo de batalla que elijas afectará a tus atributos, y el disfraz (si lo habilitas) será lo que lleve tu personaje.</string>
-  <string name="tutorial_items">Consigue artículos completando tareas y subiendo de nivel. ¡Pulsa en un artículo para usarlo!</string>
-  <string name="tutorial_pets">A medida que completes tareas del mundo real, podrás encontrar huevos y pociones al azar. Combínalos para que nazca una mascota</string>
-  <string name="tutorial_skills">Las habilidades son competencias especiales con efectos muy poderosos. Para usar una habilidad, solo tienes que pulsar en ella. Te costará maná (la barra azul), que puedes recuperar entrando todos los días y realizando tareas en la vida real. Para obtener más información, puedes consultar la sección de preguntas frecuentes en el menú!</string>
+    <string name="tutorial_skills">Las habilidades son competencias especiales con efectos muy poderosos. Para usar una habilidad, solo tienes que pulsar en ella. Te costará maná (la barra azul), que puedes recuperar entrando todos los días y realizando tareas en la vida real. Para obtener más información, puedes consultar la sección de preguntas frecuentes en el menú!</string>
   <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 pública para 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. Pulsa en (\?) si necesitas más información!</string>
-  <string name="tutorial_stats">Toca el botón gris para asignar los puntos de tus atributos de una sola vez, o toca las flechas para agregarlos punto por punto.</string>
+    <string name="tutorial_stats">Toca el botón gris para asignar los puntos de tus atributos de una sola 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 183e7c9c5..de3237b01 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Experiencia</string>
   <string name="HP_default">Salud</string>
   <string name="MP_default">Maná</string>
-  <string name="ERR_pb_barcode">No se han podido cargar las preferencias a partir del código de barras</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Ajustes</string>
-  <string name="SP_address_hint">Tu servidor personalizado</string>
-  <string name="SP_userID_title">ID de usuario</string>
+    <string name="SP_userID_title">ID de usuario</string>
   <string name="SP_userID_summary">Tu ID de usuario</string>
   <string name="SP_APIToken_title">Token de API</string>
   <string name="SP_APIToken_summary">Tu token de API</string>
   <string name="Language_title">Idioma</string>
   <string name="Language_summary">Cambiar el idioma de Habitica</string>
-  <string name="SP_user_qr_code">Tu código QR</string>
-  <string name="PS_contact_title">Contactar</string>
-  <string name="unknown_error">Ha ocurrido un error…</string>
-  <string name="pref_account_header">Cuenta</string>
+    <string name="PS_contact_title">Contactar</string>
+    <string name="pref_account_header">Cuenta</string>
   <string name="pref_first_day_of_the_week_title">Primer día de la semana</string>
   <string name="pref_first_day_of_the_week_summary">Primer día de la semana en todos los calendarios</string>
   <string name="pref_reminder_header">Recordatorio diario</string>
   <string name="pref_reminder_checkbox">Activar recordatorio</string>
   <string name="pref_reminder_picker">Establecer hora de recordatorio</string>
   <string name="pref_cds_header">Personalizar comienzo del día</string>
-  <string name="pref_cds_picker">Establecer hora del comienzo del día personalizado</string>
-  <string name="pref_push_notifications_checkbox">Notificaciones push del usuario</string>
+    <string name="pref_push_notifications_checkbox">Notificaciones push del usuario</string>
   <string name="push_notifications">Notificaciones push</string>
   <string name="push_notifications_sum">Establecer tu configuración de notificaciones push</string>
   <string name="preference_push_you_won_challenge">¡Has ganado un desafío!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">La misión ha comenzado</string>
   <string name="preference_push_invited_to_quest">Invitado a una misión</string>
   <!--Adding tasks-->
-  <string name="task_value">Valor</string>
-  <string name="new_todo">Nueva Quehacer</string>
-  <string name="new_reward">Nuevo premio</string>
-  <string name="new_daily">Nueva Tarea Diaria</string>
-  <string name="new_habit">Nuevo hábito</string>
-  <string name="action_edit">Editar</string>
-  <string name="action_delete">Borrar</string>
-  <string name="action_cancel">Cancelar</string>
+    <string name="action_edit">Editar</string>
+    <string name="action_cancel">Cancelar</string>
   <string name="login_btn">Iniciar sesión</string>
   <string name="register_btn">Registrarse</string>
   <string name="username">Nombre de usuario</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Confirma la contraseña</string>
   <string name="logout">Cerrar sesión</string>
   <string name="logout_description">Cierra la sesión de tu cuenta</string>
-  <string name="account_details">Detalles de la cuenta</string>
-  <string name="LoginActivityName">Te damos la bienvenida</string>
-  <string name="string_revive">Revivir</string>
-  <string name="please_connect">Antes de usar un widget, conéctate a través de la aplicación</string>
-  <string name="about.title">Información</string>
-  <string name="about.libraries">Bibliotecas</string>
-  <string name="about.versionhistory">Historial de versiones</string>
-  <string name="about.habitica_open_source">Habitica está disponible como software de código abierto en Github</string>
-  <string name="about.rate_our_app">Califica nuestra aplicación</string>
-  <string name="about.give_us_feedback">¡Envíanos tus comentarios!</string>
-  <string name="about.bugreport">Notificar un error</string>
-  <string name="about.source_code">Código fuente</string>
-  <string name="repeatEvery">Repite Cada</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Error de conexión</string>
-  <string name="network_error_no_network_body">No tienes conexión a Internet.</string>
-  <string name="internal_error_api">Parece que hay un problema con el servidor. Vuelve a intentarlo más tarde.</string>
+    <string name="LoginActivityName">Te damos la bienvenida</string>
+    <string name="about_title">Información</string>
+  <string name="about_libraries">Bibliotecas</string>
+    <string name="about_habitica_open_source">Habitica está disponible como software de código abierto en Github</string>
+  <string name="about_rate_our_app">Califica nuestra aplicación</string>
+  <string name="about_give_us_feedback">¡Envíanos tus comentarios!</string>
+  <string name="about_bugreport">Notificar un error</string>
+  <string name="about_source_code">Código fuente</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Parece que hay un problema con el servidor. Vuelve a intentarlo más tarde.</string>
   <string name="authentication_error_title">Error de autenticación</string>
-  <string name="authentication_error_body">Tu usuario y/o contraseña es incorrecto.</string>
-  <string name="login_validation_error_title">Error de validación</string>
+    <string name="login_validation_error_title">Error de validación</string>
   <string name="login_validation_error_fieldsmissing">Tienes que rellenar todos los campos.</string>
   <string name="save_changes">Guardar</string>
   <string name="copy">Copiar</string>
   <string name="notes">Notas</string>
-  <string name="text">Texto</string>
-  <string name="difficulty">Dificultad</string>
+    <string name="difficulty">Dificultad</string>
   <string name="tags">Etiquetas</string>
   <string name="trivial">Trivial</string>
   <string name="easy">Fácil</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negativo ( - )</string>
   <string name="checklist">Listado</string>
   <string name="reminders">Recordatorios</string>
-  <string name="actions">Acciones</string>
-  <string name="attributes">Atributos</string>
-  <string name="physical">Fuerza</string>
-  <string name="mental">Inteligencia</string>
-  <string name="social">Constitución</string>
-  <string name="other">Percepción</string>
-  <string name="frequency">Frecuencia</string>
-  <string name="frequency_weekly">Ciertos días de la semana</string>
-  <string name="frequency_daily">Cada X días</string>
-  <string name="repeatables_summary_title">Resumen</string>
-  <string name="repeatables_title">Repeticiones</string>
-  <string name="repeatables_on_title">Repeticiones activadas</string>
-  <string name="repeatables_frequency_daily">Diario</string>
+    <string name="attributes">Atributos</string>
+    <string name="repeatables_frequency_daily">Diario</string>
   <string name="repeatables_frequency_weekly">Semanalmente</string>
   <string name="repeatables_frequency_monthly">Mensualmente</string>
   <string name="repeatables_frequency_yearly">Anualmente</string>
@@ -123,24 +92,15 @@
   <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>
-  <string name="profile_image">Imagen de perfil</string>
-  <string name="mana_price_button">%d PM</string>
-  <string name="used_skill">Has usado %1$s por %2$d de maná.</string>
-  <string name="used_skill_without_mana">Has usado %1$s.</string>
+    <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 marcar tus tareas completadas</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>
-  <string name="flag_confirm">Denunciar mensaje</string>
-  <string name="unlock_lvl_11">Se desbloquea en el nivel 11</string>
-  <string name="no_party_message">No formas parte de ningún grupo. Para unirte a uno, entra en la página web.</string>
-  <string name="forgot_pw_btn">He olvidado la contraseña</string>
-  <string name="tavern.inn.checkOut">Reactivar tareas diarias</string>
-  <string name="tavern.inn.rest">Pausar tareas diarias</string>
-  <string name="reward.dialog.buy">Comprar</string>
-  <string name="reward.dialog.dismiss">Descartar</string>
+    <string name="reminder_title">Acuérdate de marcar tus tareas completadas</string>
+    <string name="unlock_lvl_11">Se desbloquea en el nivel 11</string>
+    <string name="forgot_pw_btn">He olvidado la contraseña</string>
+  <string name="tavern.inn_checkOut">Reactivar tareas diarias</string>
+  <string name="tavern.inn_rest">Pausar tareas diarias</string>
+  <string name="reward.dialog_buy">Comprar</string>
+  <string name="reward.dialog_dismiss">Descartar</string>
   <string name="party">Equipo</string>
   <string name="chat">Conversación</string>
   <string name="members">Miembros</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Tareas diarias</string>
   <string name="todos">Tareas</string>
   <string name="rewards">Recompensas</string>
-  <string name="taskform.delete.title">¿Seguro?</string>
-  <string name="taskform.delete.message">¿Seguro que quieres borrarlo?</string>
-  <string name="yes">Sí</string>
+    <string name="yes">Sí</string>
   <string name="no">No</string>
   <string name="quest">Misión</string>
   <string name="avatar_body">Cuerpo</string>
   <string name="avatar_hair">Cabello</string>
   <string name="avatar_shirt">Camisa</string>
   <string name="avatar_skin">Piel</string>
-  <string name="avatar_ears">Orejas de animales</string>
-  <string name="avatar_base">Base</string>
+    <string name="avatar_base">Base</string>
   <string name="avatar_color">Color</string>
   <string name="avatar_beard">Barba</string>
   <string name="avatar_mustache">Bigote</string>
   <string name="avatar_flower">Flor</string>
   <string name="avatar_bangs">Flequillo</string>
-  <string name="avatar_nothing">Nada seleccionado</string>
-  <string name="avatar_size">Talla</string>
+    <string name="avatar_size">Talla</string>
   <string name="avatar_size_slim">Delgado</string>
   <string name="avatar_size_broad">Ancho</string>
   <string name="avatar_background">Fondo</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Comprar</string>
   <string name="purchase_set_title">Comprar conjunto %s</string>
   <string name="due_date">Fecha límite</string>
-  <string name="quest.accept">Aceptar</string>
-  <string name="quest.reject">Rechazar</string>
-  <string name="quest.begin">Comenzar misión</string>
-  <string name="quest.cancel">Cancelar invitación</string>
-  <string name="quest.abort">Anular misión</string>
-  <string name="quest.leave">Abandonar misión</string>
-  <string name="quest.pending">Pendiente</string>
-  <string name="quest.accepted">Aceptada</string>
-  <string name="quest.rejected">Rechazada</string>
-  <string name="quest.participants">Participantes</string>
-  <string name="version_info">Versión %1$s (%2$d)</string>
+  <string name="quest_accept">Aceptar</string>
+  <string name="quest_reject">Rechazar</string>
+  <string name="quest_begin">Comenzar misión</string>
+  <string name="quest_cancel">Cancelar invitación</string>
+  <string name="quest_abort">Anular misión</string>
+    <string name="version_info">Versión %1$s (%2$d)</string>
   <string name="sidebar_help">Ayuda y preguntas frecuentes</string>
   <string name="complete_tutorial">¡Ya está!</string>
   <string name="dismiss_tutorial">Vuelve a recordármelo</string>
   <string name="intro_1_subtitle">Te damos la bienvenida a</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Es hora de divertirse mientras realizas tareas. Únete a más de %s personas que han mejorado su vida realizando tareas.</string>
+    <string name="intro_1_description">Es hora de divertirse mientras realizas tareas. Únete a más de %s personas que han mejorado su vida realizando tareas.</string>
   <string name="intro_2_subtitle">Progreso en el juego</string>
   <string name="intro_2_title">Progreso en la vida</string>
   <string name="intro_2_description">Desbloquea funciones del juego completando tareas en el mundo real. Obtén recompensas, como armaduras, mascotas y otras cosas, por cumplir tus objetivos.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Socialízate</string>
   <string name="intro_3_description">No pierdas de vista tus objetivos y deja que te ayuden tus amigos. ¡Apoyaos mutuamente en la vida y en la lucha para mejorar juntos!</string>
   <string name="intro_finish_button">¡Empezar!</string>
-  <string name="previous_button">Anterior</string>
-  <string name="next_button">Siguiente</string>
+    <string name="next_button">Siguiente</string>
   <string name="skip_button">Omitir</string>
-  <string name="setup_welcome_description">Te damos la bienvenida a Habitica, donde al progresar dentro del juego, mejorarás en la vida real. A medida que cumplas tus objetivos del mundo real, desbloquearás piezas de equipamiento, mascotas, misiones y mucho más.</string>
-  <string name="setup_welcome_title">Te damos la bienvenida</string>
-  <string name="avatar_setup_description">Bien, ¿cómo te gustaría verte? No te preocupes, puedes cambiar ésto más tarde.</string>
+    <string name="avatar_setup_description">Bien, ¿cómo te gustaría verte? No te preocupes, puedes cambiar ésto más tarde.</string>
   <string name="task_setup_description">¡Genial! Ahora, ¿en qué estás interesado en trabajar a lo largo de este viaje?</string>
   <string name="setup_group_work">Trabajo</string>
   <string name="setup_group_exercise">Ejercicio</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Estudiar hasta dominar la técnica</string>
   <string name="setup_task_creativity_2">Trabajar en proyecto creativo</string>
   <string name="setup_task_creativity_3">Terminar proyecto creativo</string>
-  <string name="gem.purchase.support">¿Quieres contribuir a que Habitica siga en funcionamiento? Puedes ayudar a los desarrolladores comprando gemas.\n\nLas gemas te permiten comprar artículos adicionales para tu cuenta, por ejemplo: \n\n - Fantásticos trajes para tu personaje\n - Increíbles fondos\n - Divertidas misiones que te recompensan con huevos de mascotas\n - La capacidad de cambiar de clase antes de llegar al nivel 100\n\nMuchísimas gracias por ayudarnos a hacer que Habitica sea lo mejor posible. ¡Valoramos enormemente vuestras contribuciones!</string>
-  <string name="my_guilds">Mis Gremios</string>
+    <string name="my_guilds">Mis Gremios</string>
   <string name="public_guilds">Gremios públicos</string>
   <string name="guild">Gremio</string>
   <string name="leave">Abandonar</string>
   <string name="join">Unirse</string>
-  <string name="leader">Líder</string>
-  <string name="gems">Gemas</string>
-  <string name="copy_as_todo">Copiar como tarea pendiente</string>
-  <string name="send_pm">Enviar mensaje privado</string>
-  <string name="flag">Marcar</string>
-  <string name="delete">Borrar</string>
+    <string name="gems">Gemas</string>
+    <string name="delete">Borrar</string>
   <string name="name">Nombre</string>
   <string name="description">Descripción</string>
   <string name="add_tag">Añadir nueva etiqueta</string>
   <string name="privacy">Privacidad</string>
   <string name="write_message">Escribir mensaje</string>
-  <string name="post">Publicar</string>
-  <string name="guild_search_hint">Buscar gremios</string>
-  <string name="todo_due">Para: %s</string>
-  <string name="daily_streak">racha actual: %d</string>
-  <string name="todo_has_duedate">La tarea tiene fecha límite</string>
-  <string name="battle_gear">Equipo de batalla</string>
+    <string name="guild_search_hint">Buscar gremios</string>
+    <string name="battle_gear">Equipo de batalla</string>
   <string name="costume">Disfraz</string>
   <string name="outfit_head">Cabeza</string>
   <string name="outfit_headAccessory">Accesorio para la cabeza</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Llevar disfraz</string>
   <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? ¡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 1d</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="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>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">¡Genial! Has encontrado una prenda insólita en el Armario: %s.</string>
   <string name="armoireFood">Rebuscando en el Armario, encuentras esto: %1$s %2$s. ¿Qué hace aquí?</string>
   <string name="armoireExp">Te peleas con el Armario y ganas experiencia. ¡Ahí lo llevas!</string>
-  <string name="armoireNotesFull">Abre el Armario para recibir prendas especiales, experiencia o comida al azar. Prendas que te faltan por conseguir: %d.</string>
-  <string name="armoireLastItem">Has encontrado la última prenda insólita del Armario encantado.</string>
-  <string name="armoireNotesEmpty">El Armario dispondrá de nuevas prendas la primera semana de cada mes. ¡Hasta entonces, sigue haciendo clic en él para ganar Experiencia y Comida!</string>
-  <string name="sell">Vender (%d de oro)</string>
+    <string name="sell">Vender (%d de oro)</string>
   <string name="hatch_with_potion">Mezclar con poción</string>
-  <string name="feed_to_pet">Alimentar a mascota</string>
-  <string name="hatch_egg">Mezclar con huevo</string>
+    <string name="hatch_egg">Mezclar con huevo</string>
   <string name="invite_party">Invitar al equipo</string>
   <string name="dialog_feeding">Dar de comer a %s:</string>
   <string name="use_animal">Usar</string>
@@ -305,17 +237,8 @@
   <string name="close">Cerrar</string>
   <string name="share">Compartir</string>
   <string name="notification_pet_fed">¡Tu %s ha comido!</string>
-  <string name="notification_purchase">Has comprado %s</string>
-  <string name="notification_purchase_reward">Has comprado una recompensa</string>
-  <string name="sectiondrop">Estandar</string>
-  <string name="sectionpremium">Poción Mágica</string>
-  <string name="sectionquest">Misión</string>
-  <string name="sectionspecial">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="notification_purchase_reward">Has comprado una recompensa</string>
+    <string name="world_quest">Misión mundial</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
@@ -334,8 +257,7 @@
   <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 equipo o si te atrae la idea de esquivar a la Muerte con tu esfuerzo.</string>
   <string name="select_class">Elegir Clase</string>
   <string name="opt_out_class">No elegir</string>
-  <string name="opt_out_description">¿Te dan igual las clases? ¿Quieres decidirlo más adelante? No elijas nada y serás un guerrero sin ninguna habilidad especial. Cuando quieras, puedes informarte sobre el sistema de clases en la wiki y activarlas.</string>
-  <string name="class_confirmation">¿Seguro que quieres ser %s?</string>
+    <string name="class_confirmation">¿Seguro que quieres ser %s?</string>
   <string name="class_changed">¡Ahora eres un %s!</string>
   <string name="class_changed_description">¡Tienes un nuevo Equipo de Combate que puedes ponerte en tu Equipamiento!</string>
   <string name="choose_class">Elegir clase</string>
@@ -349,23 +271,18 @@
   <string name="invite_existing_users">Invitar a usuarios registrados</string>
   <string name="send">Enviar</string>
   <string name="invite">Invitar a amigos</string>
-  <string name="invite_id_description">Si tienes amigos que ya usan Habitica, invítalos desde aquí indicando su ID de usuario.</string>
-  <string name="invite_username_description">Si tienes amigos que ya usan Habitica, invítalos indicando su nombre de usuario aquí.</string>
+    <string name="invite_username_description">Si tienes amigos que ya usan Habitica, invítalos indicando su nombre de usuario aquí.</string>
   <string name="invite_email_description">Si un amigo se apunta a Habitica a través del correo electrónico que le has enviado, se le invitará automáticamente a tu equipo.</string>
   <string name="add_invites">Añadir invitaciones</string>
-  <string name="user_id">ID de usuario</string>
-  <string name="email">Correo electrónico</string>
-  <string name="invite_users">Invitar al grupo</string>
-  <string name="share_using">Compartir con</string>
+    <string name="email">Correo electrónico</string>
+    <string name="share_using">Compartir con</string>
   <string name="share_levelup">¡He subido al nivel %d en Habitica mejorando mis hábitos en el mundo real!</string>
   <string name="share_hatched">¡He criado un %1$s %2$s de mascota en Habitica realizando tareas en mi vida real!</string>
   <string name="share_raised">¡He conseguido una montura de %1$s en Habitica realizando tareas en mi vida real!</string>
   <string name="open_in_store">Abrir en Play Store</string>
   <string name="change_class_confirmation">¿Seguro que quieres cambiar de clase? Te costará 3 gemas.</string>
   <string name="change_class_equipment_warning">Aviso: Ya no podrás comprar equipamiento para la clase %s</string>
-  <string name="leaderMessage">Mensaje de %1$s</string>
-  <string name="leaderName">Líder: %1$s</string>
-  <string name="confirm">Confirmar</string>
+    <string name="confirm">Confirmar</string>
   <string name="market">Mercado</string>
   <string name="timeTravelers">Viajeros del tiempo</string>
   <string name="seasonalShop">Tienda estacional</string>
@@ -373,37 +290,16 @@
   <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>
-  <string name="purchase_confirmation_title">Confirmar la compra</string>
-  <string name="confirm_purchase_text">Comprar %1$s para %2$s %3$s</string>
-  <string name="gem">gema</string>
-  <string name="hourglass">reloj de arena</string>
-  <string name="hourglasses">relojes de arena</string>
-  <string name="gold_singular">oro</string>
-  <string name="gold_plural">oro</string>
+    <string name="successful_purchase">Has comprado %1$s</string>
+    <string name="gold_plural">oro</string>
   <string name="chat_message_copied">Mensaje copiado al portapapeles</string>
-  <string name="copy_chat_message">Copiar al portapapeles</string>
-  <string name="edit_tag_title">Editar etiqueta</string>
-  <string name="edit_tag_btn_edit">Editar</string>
-  <string name="edit_tag_btn_done">Listo</string>
-  <string name="edit_tag_btn_delete">Eliminar</string>
-  <string name="confirm_delete_tag_title">¿Seguro?</string>
+    <string name="edit_tag_btn_edit">Editar</string>
+    <string name="confirm_delete_tag_title">¿Seguro?</string>
   <string name="confirm_delete_tag_message">¿Seguro que quieres realizar la eliminación?</string>
-  <string name="filter_drawer_edit_tags">Editar etiquetas</string>
-  <string name="filter_drawer_filter_tags">Filtrar por etiquetas</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Pídele a alguien que te invite con este código QR</string>
-  <string name="qr_save_message">Código QR guardado en</string>
-  <string name="qr_dialogue_title">Tu código QR</string>
-  <string name="download">Descargar</string>
-  <string name="send_new_message">Enviar un nuevo mensaje</string>
-  <string name="choose_recipient_title">Elige el destinatario del mensaje</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Elige el destinatario del mensaje</string>
   <string name="action_continue">Continuar</string>
-  <string name="scan_qr_code">Leer código QR</string>
-  <string name="enter_recipient_uuid">Introduce el ID de usuario del destinatario</string>
-  <string name="invited_to_party">¡Te han invitado a un Equipo!</string>
+    <string name="invited_to_party">¡Te han invitado a un Equipo!</string>
   <string name="stats_widget_label">Estadísticas de Habitica</string>
   <string name="add_task">Añadir Tarea</string>
   <string name="add_habit">Añadir Hábito</string>
@@ -414,15 +310,14 @@
   <string name="widget_habit_button">Hábitos Habitica</string>
   <string name="widget_dailies">Tareas Diarias Habitica</string>
   <string name="widget_todo_list">Tareas Pendientes</string>
-  <string name="widget_add_task">Añadir Tarea Habitica</string>
-  <string name="google_services_missing">No pudieron encontrarse los servidores de Google Play.</string>
-  <string name="gem.purchase.toolbartitle">Compra</string>
-  <string name="gem.purchase.title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
-  <string name="gem.purchase.subtitle">Las Gemas te permiten comprar divertidos extras para tu cuenta, incluyendo:</string>
-  <string name="gem.purchase.listitem1">Disfraces geniales para tu personaje</string>
-  <string name="gem.purchase.listitem2">Fondos increíbles</string>
-  <string name="gem.purchase.listitem3">Misiones que te recompensan con huevos de mascota</string>
-  <string name="gem.purchase.listitem4">La habilidad para cambiar tu clase antes del nivel 100</string>
+    <string name="google_services_missing">No pudieron encontrarse los servidores de Google Play.</string>
+  <string name="gem.purchase_toolbartitle">Compra</string>
+  <string name="gem.purchase_title">Comprar gemas apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
+  <string name="gem.purchase_subtitle">Las Gemas te permiten comprar divertidos extras para tu cuenta, incluyendo:</string>
+  <string name="gem.purchase_listitem1">Disfraces geniales para tu personaje</string>
+  <string name="gem.purchase_listitem2">Fondos increíbles</string>
+  <string name="gem.purchase_listitem3">Misiones que te recompensan con huevos de mascota</string>
+  <string name="gem.purchase_listitem4">La habilidad para cambiar tu clase antes del nivel 100</string>
   <string name="support_habitica">Apoya Habitica</string>
   <string name="skill_transformation_use">usa</string>
   <string name="hatching_market_info">¿No consigues los objetos que necesitas? ¡Echa un vistazo al Mercado!</string>
@@ -436,32 +331,32 @@
   <string name="belongs_to_challenge">Pertenece a un Desafío</string>
   <string name="has_reminder">Tiene Recordatorio</string>
   <string name="has_tag">Tiene Etiqueta</string>
-  <string name="subscribe.title">La suscripción apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
+  <string name="subscribe_title">La suscripción apoya a los desarrolladores y ayuda a mantener Habitica en funcionamiento</string>
   <string name="subscribe_prompt">Conviértete en suscriptor y obtendrás estos útiles beneficios:</string>
-  <string name="subscribe.listitem1">Compra gemas con oro</string>
-  <string name="subscribe.listitem2">Exclusivos artículos mensuales</string>
-  <string name="subscribe.listitem3">Conservar entradas de historial adicionales</string>
-  <string name="subscribe.listitem4">Los límites diarios se duplicaron</string>
+  <string name="subscribe_listitem1">Compra gemas con oro</string>
+  <string name="subscribe_listitem2">Exclusivos artículos mensuales</string>
+  <string name="subscribe_listitem3">Conservar entradas de historial adicionales</string>
+  <string name="subscribe_listitem4">Los límites diarios se duplicaron</string>
   <string name="subscriptions">Suscripciones</string>
   <string name="subscription_duration">Se repite cada %s</string>
   <string name="subscription_duration_norenew">Por %s</string>
   <string name="subscribe">Suscríbete</string>
-  <string name="subscribe.listitem1.description">El comerciante Alejandro te venderá las Gemas para 20 oro cada una! Sus cargamentos mensuales están  limitados a 25 Gemas cada mes, pero puede aumentar según la duración de suscripción. El tope aumenta en 5 Gemas por cada tres meses de suscripción consecutiva, hasta un máximo de 50 Gemas por mes!</string>
-  <string name="subscribe.listitem2.description">¡Cada mes recibirás un artículo cosmético único para tu avatar! Además, por cada tres meses de suscripción consecutiva, Viajeros en Tiempo Misteriosos te otorgará acceso a artículos cosméticos históricos (y futuristas!).</string>
-  <string name="subscribe.listitem3.description">Hace que las tareas completas y la historia de tareas estén disponibles por más tiempo.</string>
-  <string name="subscribe.listitem4.description">Doble caída gorras te permitirá recibir más elementos de tus tareas completadas todos los días, ayudando a completar tu establo más rápido!</string>
-  <string name="subscribe1month.gemcap">Límite de 25 gemas</string>
-  <string name="subscribe3month.gemcap">Límite de 30 gemas</string>
-  <string name="subscribe6month.gemcap">Límite de 35 gemas</string>
-  <string name="subscribe12month.gemcap">Límite de 45 gemas</string>
+  <string name="subscribe.listitem1_description">El comerciante Alejandro te venderá las Gemas para 20 oro cada una! Sus cargamentos mensuales están  limitados a 25 Gemas cada mes, pero puede aumentar según la duración de suscripción. El tope aumenta en 5 Gemas por cada tres meses de suscripción consecutiva, hasta un máximo de 50 Gemas por mes!</string>
+  <string name="subscribe.listitem2_description">¡Cada mes recibirás un artículo cosmético único para tu avatar! Además, por cada tres meses de suscripción consecutiva, Viajeros en Tiempo Misteriosos te otorgará acceso a artículos cosméticos históricos (y futuristas!).</string>
+  <string name="subscribe.listitem3_description">Hace que las tareas completas y la historia de tareas estén disponibles por más tiempo.</string>
+  <string name="subscribe.listitem4_description">Doble caída gorras te permitirá recibir más elementos de tus tareas completadas todos los días, ayudando a completar tu establo más rápido!</string>
+  <string name="subscribe1month_gemcap">Límite de 25 gemas</string>
+  <string name="subscribe3month_gemcap">Límite de 30 gemas</string>
+  <string name="subscribe6month_gemcap">Límite de 35 gemas</string>
+  <string name="subscribe12month_gemcap">Límite de 45 gemas</string>
   <string name="subscription_hourglasses">+%d Relojes de Arena Místicos</string>
   <string name="payment_method">Método de pago</string>
   <string name="subscription">Suscripción</string>
   <string name="active">Activa</string>
   <string name="due">Vence</string>
   <string name="cancel_subscription">Cancelar suscripción</string>
-  <string name="cancel_subscription_google.description">¿Ya no quieres suscribirte? Puedes encontrar la opción de cancelar la suscripción en la sección \"Mis aplicaciones\" de la Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">¿Ya no quieres suscribirte? Debido a tu método de pago, sólo puedes cancelar tu suscripción a través del sitio de ueb. Haga clic en el botón de abajo, para abrir el sitio en tu navegador!</string>
+  <string name="cancel_subscription_google_description">¿Ya no quieres suscribirte? Puedes encontrar la opción de cancelar la suscripción en la sección \"Mis aplicaciones\" de la Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">¿Ya no quieres suscribirte? Debido a tu método de pago, sólo puedes cancelar tu suscripción a través del sitio de ueb. Haga clic en el botón de abajo, para abrir el sitio en tu navegador!</string>
   <string name="visit_habitica_website">Visitar la página de Habitica</string>
   <string name="current_bonuses">Bonificaciones Actuales</string>
   <string name="months_subscribed">Meses suscrito</string>
@@ -476,56 +371,40 @@
   <string name="twelve_months">12 meses</string>
   <string name="subscribe_prompt_thanks">Por Suscribirte disfrutas de estos útiles beneficios:</string>
   <string name="subscription_status">Estado de Suscripción</string>
-  <string name="byLeader">por %s</string>
-  <string name="challenge_details">Detalles del Desafío</string>
-  <string name="challenge_leave_title">Abandonar Desafío</string>
+    <string name="challenge_leave_title">Abandonar Desafío</string>
   <string name="challenge_leave_text">¿Seguro que quieres abandonar el Desafio \"%s\"?</string>
   <string name="challenge_remove_tasks_title">Eliminar tareas</string>
   <string name="challenge_remove_tasks_text">¿Quieres eliminar las tareas?</string>
   <string name="remove_tasks">Eliminar</string>
   <string name="keep_tasks">Mantener</string>
   <string name="my_challenges">Mis Desafíos</string>
-  <string name="public_challenges">Público</string>
-  <string name="challenges">Desafíos</string>
-  <string name="daily">Tarea diaria</string>
+    <string name="daily">Tarea diaria</string>
   <string name="habit">Hábito</string>
   <string name="reward">Recompensa</string>
   <string name="todo">Tarea Pendiente</string>
   <string name="official">Oficial</string>
-  <string name="participating">Participando</string>
-  <string name="challenge">Desafío</string>
-  <string name="go_to_challenge">Ir al Desafío</string>
-  <string name="not_part_of_a_challenge">¡Ahora mismo no formas parte de ningún Desafío!</string>
+    <string name="challenge">Desafío</string>
+    <string name="not_part_of_a_challenge">¡Ahora mismo no formas parte de ningún Desafío!</string>
   <string name="join_a_challenge">Únete a un desafío para agregar un conjunto de tareas de comisariados a tu lista, luego compite contra otros Habiticanos para ganar logros e incluso joyas!</string>
   <string name="check_the_public_challenge_tab">Toque la pestaña \"Público\" para encontrar los Desafíos creados por el usuario que son de tu preferencia!</string>
-  <string name="add_reminder">Añadir Recordatorio</string>
-  <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">Mensajes</string>
-  <string name="FAQ">Preguntas Frecuentes</string>
-  <string name="special">Especial</string>
+    <string name="inbox">Mensajes</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>
-  <string name="limited_count">%d restantes</string>
-  <string name="gem_shop">Gema</string>
+    <string name="gem_shop">Gema</string>
   <string name="mystery_item">Objeto Misterioso</string>
   <string name="myster_item_notes">Cada mes, los suscriptores recibirán un objeto misterioso. Suele entregarse una semana antes del final de mes.</string>
   <string name="open">Abrir</string>
-  <string name="notification_mystery_item">¡Abres la caja y encuentras %s!</string>
-  <string name="checkInRewardEarned">Ganaste %1$s como recompensa por tu devoción por mejorar tu vida. </string>
+    <string name="checkInRewardEarned">Ganaste %1$s como recompensa por tu devoción por mejorar tu vida. </string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Tu próximo premio se desbloqueará en %1$d Registros</string>
   <string name="pending_approval">Esperando aprobación</string>
   <string name="filters">Filtros</string>
   <string name="done">Hecho</string>
-  <string name="group_tasks_edit_description">Las Tareas de Grupo no pueden editarse.</string>
-  <string name="group_tasks_edit_title">No se puede editar esta tarea</string>
-  <string name="groups">Grupos</string>
+    <string name="groups">Grupos</string>
   <string name="all">Todo</string>
   <string name="none">Ningún </string>
   <string name="owned">Poseído</string>
   <string name="not_owned">No poseído</string>
-  <string name="new_game">Nuevo Juego</string>
-  <string name="login_btn_fb">Iniciar sesión con Facebook</string>
+    <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.\n\nPara empezar, ¿cómo debemos llamarte? Siéntete libre de cambiar el nombre que he elegido. Cuando estés listo, ¡Vamos a crear tu avatar!</string>
@@ -557,7 +436,6 @@
   <string name="reload_content">Recargar Contenido</string>
   <string name="dailyDueDefaultView">Establecer Tareas Diarias por defecto en la pestaña \'debido\'</string>
   <string name="dailyDueDefaultViewDescription">Con esta opción establecida, Tareas Diarias tendrán por defecto \'debido\' en lugar de \'todo\'</string>
-  <string name="repeat_summary">Repite %1$scada%2$s%3$s%4$s</string>
   <string name="no_billing_gems">Tu dispositivo no tiene ninguno de los métodos de pago compatibles. Por favor utilice el sitio web de habitica si deseas comprar Gemas.</string>
   <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>
@@ -565,8 +443,7 @@
   <string name="gem_reward">Premio en Gemas</string>
   <string name="tasks">Tareas</string>
   <string name="create_challenge">Crear Desafío</string>
-  <string name="edit_challenge">Editar</string>
-  <string name="challenge_create_error_tavern_one_gem">Necesitas al menos 1 Gema para crear un Desafío público.</string>
+    <string name="challenge_create_error_tavern_one_gem">Necesitas al menos 1 Gema para crear un Desafío público.</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 desafío con un nombre corto</string>
   <string name="challenge_create_error_tag">Necesitas un nombre corto para crear este Desafío.</string>
@@ -576,42 +453,36 @@
   <string name="new_challenge_title">Nuevo título del Reto</string>
   <string name="ownership">Propiedad</string>
   <string name="inn">Posada</string>
-  <string name="system">Sistema</string>
-  <string name="start_quest">Iniciar una nueva Búsqueda</string>
+    <string name="start_quest">Iniciar una nueva Búsqueda</string>
   <string name="leave_party">Dejar Equipo</string>
   <string name="party_description">Descripción del Equipo</string>
-  <string name="abort_confirmation">¿Estás seguro de que quieres abortar esta misión\? Se abortará para todos en el equipo y todo progreso se perderá. El Pergamino de Misión se devolverá al propietario de la misión.</string>
-  <string name="leave_quest_confirmation">¿Estás seguro de que quieres dejar la Misión activa\? Todo tu progreso de misión se perderá.</string>
-  <string name="number_participants">%1$dParticipantes</string>
+    <string name="number_participants">%1$dParticipantes</string>
   <string name="welcome_back">¡Bienvenido/a de vuelta!</string>
   <string name="yesterdaililes_prompt">¿Has hecho alguno de estos Diarios ayer?</string>
   <string name="start_day">Empezar mi día</string>
   <string name="leave_party_confirmation">¿Seguro que quieres salir del Equipo\?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Siguiente premio en %d Registros</string>
-  <string name="pending">Pendiente</string>
+    <string name="pending">Pendiente</string>
   <string name="accepted">Aceptado</string>
   <string name="declined">Rechazado</string>
   <string name="participants">Participantes</string>
   <string name="invitations">Invitaciones</string>
-  <string name="quest_leader_header" formatted="false">Comenzado por %s</string>
+  <string name="quest_leader_header">Comenzado por %s</string>
   <string name="quest_abort_message">¿Estás seguro de que quieres abortar esta misión\? Se abortará para todos en el equipo y todo progreso se perderá. El Pergamino de Misión será devuelto al propietario de la misión.</string>
-  <string name="loading">Cargando…</string>
-  <string name="reloading_content">Recargando Contenido</string>
+    <string name="reloading_content">Recargando Contenido</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">m</string>
   <string name="billion_abbrev">b</string>
-  <string name="your_balance">Tu saldo:</string>
-  <string name="available_until" formatted="false">Disponible hasta %s</string>
-  <string name="gems_left_max" formatted="false">Gemas Mensuales:%1$d/%2$d Restante</string>
-  <string name="gems_left_nomax" formatted="false">Gemas Mensuales: %d Restante</string>
+    <string name="available_until">Disponible hasta %s</string>
+  <string name="gems_left_max">Gemas Mensuales:%1$d/%2$d Restante</string>
+  <string name="gems_left_nomax">Gemas Mensuales: %d Restante</string>
   <string name="health">Salud</string>
   <string name="collect">Recoger</string>
   <string name="rage_meter">Metro de Rabia</string>
   <string name="boss_quest">Búsqueda del Capo</string>
   <string name="collection_quest">Búsqueda de Recaudación</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Puntos de Experiencia</string>
-  <string name="gold_reward" formatted="false">%d Oro</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Puntos de Experiencia</string>
+  <string name="gold_reward">%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>
@@ -624,8 +495,7 @@
   <string name="reset_account_confirmation">Reestablecer mi cuenta</string>
   <string name="delete_account_confirmation">Borrar mi cuenta</string>
   <string name="danger_zone">Zona Peligrosa</string>
-  <string name="nevermind">No importa</string>
-  <string name="resetting_account">Reestableciendo cuenta</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="insufficientGoldTitle">Insuficiente oro</string>
@@ -659,8 +529,7 @@
   <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_username">Cambiar Nombre de usuario</string>
+    <string name="change_username">Cambiar Nombre de usuario</string>
   <string name="change">Cambiar</string>
   <string name="character_level">Nivel de Personaje</string>
   <string name="auto_allocate_points">Asignar Puntos Automáticamente</string>
@@ -681,7 +550,7 @@
   <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="points_to_allocate">%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>
@@ -691,9 +560,7 @@
   <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 emoticonos</string>
-  <string name="tavern_description">¡Bienvenido a la posada! Trae una silla para conversar, o toma un descanso de sus tareas.</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>
@@ -707,19 +574,13 @@
   <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="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="rage_strike_count">Ataque de ira: %d/%d</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="strike_active_title">¡El %s ha sido atacado!</string>
+    <string name="strike_active_description">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>
@@ -729,29 +590,21 @@
   <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_description">Dale el nombre de usuario que hay abajo al un miembro del Equipo y ellos podrán mandarte una invitación</string>
-  <string name="join_party_description_id">Dales tu ID de Usuario o haz que escaneen tu código QR cuando te inviten</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="join_party_title">¿Quieres unirte a un equipo?</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="world_boss_description_title">¿Qué es un Jefe Mundial?</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="world_boss_action_prompt">¡Derrota al Jefe para ganar recompensas especiales y salvar a Habitica del terror de %s!</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="tavern_description_world_boss">Ay por favor, no prestes atención a ese monstruo. Este es aún un refugio seguro para conversar durante tus descansos.</string>
   <string name="report">Reportar</string>
-  <string name="like">Me gusta</string>
-  <string name="reply">Contestar</string>
+    <string name="reply">Contestar</string>
   <string name="challenge_prize">Premio del Desafío</string>
   <string name="challenge_categories">Categoría del Desafío</string>
   <string name="created_challenge">Desafío creado</string>
@@ -785,17 +638,15 @@
   <string name="two_handed">A dos manos</string>
   <string name="usernamePromptTitle">¡Hora de establecer tu nombre de usuario!</string>
   <string name="usernamePromptBody">Los nombre de inicio de sesión ahora son nombres de usuario únicos, que se mostrarán al lado de tu nombre público y se usará para invitaciones, @menciones en los chats, y mensajes. </string>
-  <string name="usernamePromptWiki">Si quieres saber más de este cambio, <a href="https://habitica.wikia.com/wiki/Player_Names">visita nuestra wiki.</a></string>
-  <string name="confirmUsername">Confirma tu Nombre de usuario</string>
-  <string name="usernamePromptDisclaimer">Los nombres de usuario deben conformarse a nuestros <a href="https://habitica.com/static/terms">Términos de Servicio</a> y <a href="https://habitica.com/static/community-guidelines">Normas de Comunidad</a>. Si no habías establecido previamente un nombre de inicio de sesión, tu nombre de usuario ha sido autogenerado.</string>
+  <string name="usernamePromptWiki">Si quieres saber más de este cambio, <a href="https://habitica.wikia_com/wiki/Player_Names">visita nuestra wiki.</a></string>
+    <string name="usernamePromptDisclaimer">Los nombres de usuario deben conformarse a nuestros <a href="https://habitica.com/static/terms">Términos de Servicio</a> y <a href="https://habitica_com/static/community-guidelines">Normas de Comunidad</a>. Si no habías establecido previamente un nombre de inicio de sesión, tu nombre de usuario ha sido autogenerado.</string>
   <string name="confirm_username_title">¿Estás seguro de que quieres confirmar tu nombre de usuario actual?</string>
   <string name="confirm_username_description">Confirmar tu nombre de usuario lo hará público para invitations, @menciones y mensajes. Puedes cambiar tu nombre de usuario en los ajustes en cualquier momento.</string>
   <string name="cancel">Cancelar</string>
   <string name="confirm_username">Confirmar Nombre de usuario</string>
   <string name="username_not_confirmed">Nombre de usuario no confirmado</string>
   <string name="username_confirmed">Nombre de usuario Confirmado</string>
-  <string name="username_level">\@%s ・Nvl %d</string>
-  <string name="enter_recipient_username">Entra el @ nombre de usuario del Receptor</string>
+    <string name="enter_recipient_username">Entra el @ nombre de usuario del Receptor</string>
   <string name="username_copied">Nombre de usuario copiado al portapapeles</string>
   <string name="verification_pet">¡Una de estas Mascotas Veteranas estará esperándote cuando termines de confirmar!</string>
   <string name="welcomeNameTitle">¿Cómo debemos llamarte?</string>
diff --git a/Habitica/res/values-fr/strings.profile.xml b/Habitica/res/values-fr/strings.profile.xml
index 8dd3677ce..4b5934634 100644
--- a/Habitica/res/values-fr/strings.profile.xml
+++ b/Habitica/res/values-fr/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Niveau :</string>
     <string name="profile_class_bonus">Bonus de classe :</string>
     <string name="profile_allocated">Points alloués :</string>
-    <string name="profile_boosts">Bonus :</string>
     <string name="profile_private_message">Message privé</string>
     <string name="profile_achievements">Succès</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Fermer</string>
 
 </resources>
diff --git a/Habitica/res/values-fr/strings.sidebar.xml b/Habitica/res/values-fr/strings.sidebar.xml
index b757c2ad3..4357cdc85 100644
--- a/Habitica/res/values-fr/strings.sidebar.xml
+++ b/Habitica/res/values-fr/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <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">Messages</string>
-  <string name="sidebar.tavern">Auberge</string>
-  <string name="sidebar.party">Équipe</string>
-  <string name="sidebar.purchaseGems">Gemmes et abonnement</string>
-  <string name="sidebar.guilds">Guildes</string>
-  <string name="sidebar.challenges">Défis</string>
-  <string name="sidebar.section.inventory">Inventaire</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Équipement</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>
+  <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">Messages</string>
+  <string name="sidebar_tavern">Auberge</string>
+  <string name="sidebar_party">Équipe</string>
+  <string name="sidebar_purchaseGems">Gemmes et abonnement</string>
+  <string name="sidebar_guilds">Guildes</string>
+  <string name="sidebar_challenges">Défis</string>
+  <string name="sidebar.section_inventory">Inventaire</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Équipement</string>
+  <string name="sidebar_stable">Écurie</string>
+  <string name="sidebar_news">Nouveautés</string>
+    <string name="sidebar_about">À propos</string>
   <string name="sidebar_shops">Magasins</string>
   <string name="sidebar_stats">Stats</string>
 </resources>
diff --git a/Habitica/res/values-fr/strings.tutorial.xml b/Habitica/res/values-fr/strings.tutorial.xml
index e8841f209..9f5a5af97 100644
--- a/Habitica/res/values-fr/strings.tutorial.xml
+++ b/Habitica/res/values-fr/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Achetez de l\'équipement pour votre avatar avec l\'or que vous gagnez !</string>
   <string name="tutorial_rewards_2">Vous pouvez aussi créer des récompenses personnalisées en fonction de ce qui vous motive.</string>
   <string name="tutorial_tasks_complete">C\'est tout pour l\'instant. Si vous avez besoin d\'un rappel, consultez la section FAQ.</string>
-  <string name="tutorial_equipment">Quand vous achetez de l\'équipement, il apparaît ici. Votre Equipement de Combat affecte vos caractéristiques, et votre Costume (si utilisé) change l\'apparence de votre avatar.</string>
-  <string name="tutorial_items">Gagnez des objets en accomplissant des tâches et en changeant de niveau. Tapez sur un objet pour l\'utiliser !</string>
-  <string name="tutorial_pets">En accomplissant des tâches dans le monde réel, vous avez désormais une chance de trouver des œufs et des potions. Combinez-les pour faire éclore des familiers</string>
-  <string name="tutorial_skills">Les compétences sont des capacités spéciales qui ont des effets puissants ! Tapez sur une compétence pour l\'utiliser. Cela vous coûtera de la Mana (la barre bleue), que vous gagnez en faisant le point tous les jours et en accomplissant des tâches dans la vie réelle. Allez voir les FAQ dans le menu pour plus d\'infos !</string>
+    <string name="tutorial_skills">Les compétences sont des capacités spéciales qui ont des effets puissants ! Tapez sur une compétence pour l\'utiliser. Cela vous coûtera de la Mana (la barre bleue), que vous gagnez en faisant le point tous les jours et en accomplissant des tâches dans la vie réelle. Allez voir les FAQ dans le menu pour plus d\'infos !</string>
   <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>
+    <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 32ef265e2..5697a07d4 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Expérience</string>
   <string name="HP_default">Santé</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Les préférences n\'ont pas pu être chargées depuis le QR Code</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Paramètres</string>
-  <string name="SP_address_hint">Votre serveur personnalisé</string>
-  <string name="SP_userID_title">ID d\'utilisateur</string>
+    <string name="SP_userID_title">ID d\'utilisateur</string>
   <string name="SP_userID_summary">Votre ID d\'utilisateur</string>
   <string name="SP_APIToken_title">Jeton d\'API</string>
   <string name="SP_APIToken_summary">Votre jeton d\'API</string>
   <string name="Language_title">Langage</string>
   <string name="Language_summary">Changer la langue d\'Habitica</string>
-  <string name="SP_user_qr_code">Votre QR code</string>
-  <string name="PS_contact_title">Contactez-moi</string>
-  <string name="unknown_error">Une erreur est survenue…</string>
-  <string name="pref_account_header">Compte</string>
+    <string name="PS_contact_title">Contactez-moi</string>
+    <string name="pref_account_header">Compte</string>
   <string name="pref_first_day_of_the_week_title">Premier jour de la semaine</string>
   <string name="pref_first_day_of_the_week_summary">Premier jour de la semaine dans tous les calendriers</string>
   <string name="pref_reminder_header">Rappel quotidien</string>
   <string name="pref_reminder_checkbox">Activer le rappel</string>
   <string name="pref_reminder_picker">Changer l\'heure du rappel</string>
   <string name="pref_cds_header">Heure personnalisée de début de journée</string>
-  <string name="pref_cds_picker">Définir l\'heure personnalisée de début de journée</string>
-  <string name="pref_push_notifications_checkbox">Notifications push de l\'utilisateur</string>
+    <string name="pref_push_notifications_checkbox">Notifications push de l\'utilisateur</string>
   <string name="push_notifications">Notifications push</string>
   <string name="push_notifications_sum">Paramétrez vos notifications push</string>
   <string name="preference_push_you_won_challenge">Vous avez gagné un défi !</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Votre quête a commencé</string>
   <string name="preference_push_invited_to_quest">Invitation à une quête</string>
   <!--Adding tasks-->
-  <string name="task_value">Valeur</string>
-  <string name="new_todo">Nouvelle tâche à faire</string>
-  <string name="new_reward">Nouvelle récompense</string>
-  <string name="new_daily">Nouvelle tâche quotidienne</string>
-  <string name="new_habit">Nouvelle habitude</string>
-  <string name="action_edit">Modifier</string>
-  <string name="action_delete">Supprimer</string>
-  <string name="action_cancel">Annuler</string>
+    <string name="action_edit">Modifier</string>
+    <string name="action_cancel">Annuler</string>
   <string name="login_btn">Se connecter</string>
   <string name="register_btn">Créer un compte</string>
   <string name="username">Nom d\'utilisateur</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Confirmez votre mot de passe</string>
   <string name="logout">Se déconnecter</string>
   <string name="logout_description">Déconnexion de votre compte</string>
-  <string name="account_details">Détails du compte</string>
-  <string name="LoginActivityName">Bienvenue</string>
-  <string name="string_revive">Résurrection</string>
-  <string name="please_connect">Veuillez vous connecter à l\'application avant d\'utiliser un widget</string>
-  <string name="about.title">À propos</string>
-  <string name="about.libraries">Bibliothèques</string>
-  <string name="about.versionhistory">Historique des versions</string>
-  <string name="about.habitica_open_source">Habitica est disponible sur Github en open source </string>
-  <string name="about.rate_our_app">Notez notre application</string>
-  <string name="about.give_us_feedback">Envoyez nous votre avis !</string>
-  <string name="about.bugreport">Signaler un bug</string>
-  <string name="about.source_code">Code source</string>
-  <string name="repeatEvery">Répéter tous les</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Erreur lors de la connexion</string>
-  <string name="network_error_no_network_body">Vous n\'êtes pas connecté·e à Internet.</string>
-  <string name="internal_error_api">Il semblerait qu\'il y ait un problème avec le serveur. Essayez plus tard.</string>
+    <string name="LoginActivityName">Bienvenue</string>
+    <string name="about_title">À propos</string>
+  <string name="about_libraries">Bibliothèques</string>
+    <string name="about_habitica_open_source">Habitica est disponible sur Github en open source </string>
+  <string name="about_rate_our_app">Notez notre application</string>
+  <string name="about_give_us_feedback">Envoyez nous votre avis !</string>
+  <string name="about_bugreport">Signaler un bug</string>
+  <string name="about_source_code">Code source</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Il semblerait qu\'il y ait un problème avec le serveur. Essayez plus tard.</string>
   <string name="authentication_error_title">Erreur d\'authentification</string>
-  <string name="authentication_error_body">Votre nom d\'utilisateur et/ou mot de passe est incorrect.</string>
-  <string name="login_validation_error_title">Erreur de validation</string>
+    <string name="login_validation_error_title">Erreur de validation</string>
   <string name="login_validation_error_fieldsmissing">Vous devez renseigner tous les champs.</string>
   <string name="save_changes">Enregistrer</string>
   <string name="copy">Copier</string>
   <string name="notes">Notes</string>
-  <string name="text">Texte</string>
-  <string name="difficulty">Difficulté</string>
+    <string name="difficulty">Difficulté</string>
   <string name="tags">Étiquettes</string>
   <string name="trivial">Banal</string>
   <string name="easy">Facile</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Négatif ( - )</string>
   <string name="checklist">Liste de vérification</string>
   <string name="reminders">Rappels</string>
-  <string name="actions">Instructions/Actions</string>
-  <string name="attributes">Attributs</string>
-  <string name="physical">Force</string>
-  <string name="mental">Intelligence</string>
-  <string name="social">Constitution</string>
-  <string name="other">Perception</string>
-  <string name="frequency">Répéter</string>
-  <string name="frequency_weekly">Certains jours de la semaine</string>
-  <string name="frequency_daily">Tous les X jours</string>
-  <string name="repeatables_summary_title">Résumé</string>
-  <string name="repeatables_title">Se répète</string>
-  <string name="repeatables_on_title">Se répète le</string>
-  <string name="repeatables_frequency_daily">Quotidiennement</string>
+    <string name="attributes">Attributs</string>
+    <string name="repeatables_frequency_daily">Quotidiennement</string>
   <string name="repeatables_frequency_weekly">Hebdomadairement</string>
   <string name="repeatables_frequency_monthly">Mensuellement</string>
   <string name="repeatables_frequency_yearly">Annuellement</string>
@@ -117,30 +86,20 @@
   <string name="sunday">Dimanche</string>
   <string name="levelup_header">Vous avez atteint le niveau %1$d !</string>
   <string name="levelup_detail">En atteignant vos buts dans la vie réelle, vous avez gagné un niveau et êtes maintenant complètement guéri !</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, votre 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>
-  <string name="profile_image">Image de profil</string>
-  <string name="mana_price_button">%d points de mana</string>
-  <string name="used_skill">Vous avez utilisé %1$s pour %2$d points de mana.</string>
-  <string name="used_skill_without_mana">Vous avez utilisé %1$s.</string>
+    <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">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>
-  <string name="flag_confirm">Signaler</string>
-  <string name="unlock_lvl_11">Disponible au niveau 11</string>
-  <string name="no_party_message">Vous ne faites pas partie d\'une équipe. Pour rejoindre une équipe, veuillez visiter le site.</string>
-  <string name="forgot_pw_btn">Mot de passe oublié</string>
-  <string name="tavern.inn.checkOut">Réactiver vos tâches quotidiennes</string>
-  <string name="tavern.inn.rest">Suspendre vos tâches quotidiennes</string>
-  <string name="reward.dialog.buy">Acheter</string>
-  <string name="reward.dialog.dismiss">Annuler</string>
+    <string name="reminder_title">Rappelez-vous de cocher vos tâches quotidiennes</string>
+    <string name="unlock_lvl_11">Disponible au niveau 11</string>
+    <string name="forgot_pw_btn">Mot de passe oublié</string>
+  <string name="tavern.inn_checkOut">Réactiver vos tâches quotidiennes</string>
+  <string name="tavern.inn_rest">Suspendre vos tâches quotidiennes</string>
+  <string name="reward.dialog_buy">Acheter</string>
+  <string name="reward.dialog_dismiss">Annuler</string>
   <string name="party">Équipe</string>
   <string name="chat">Discussion</string>
   <string name="members">Membres</string>
@@ -148,24 +107,20 @@
   <string name="dailies">Tâches quotidiennes</string>
   <string name="todos">À faire</string>
   <string name="rewards">Récompenses</string>
-  <string name="taskform.delete.title">Êtes-vous sûr·e \?</string>
-  <string name="taskform.delete.message">Voulez-vous vraiment supprimer ceci ?</string>
-  <string name="yes">Oui</string>
+    <string name="yes">Oui</string>
   <string name="no">Non</string>
   <string name="quest">Quête</string>
   <string name="avatar_body">Corps</string>
   <string name="avatar_hair">Cheveux</string>
   <string name="avatar_shirt">Tunique</string>
   <string name="avatar_skin">Peau</string>
-  <string name="avatar_ears">Oreilles d\'animaux</string>
-  <string name="avatar_base">Nuque</string>
+    <string name="avatar_base">Nuque</string>
   <string name="avatar_color">Couleur</string>
   <string name="avatar_beard">Barbe</string>
   <string name="avatar_mustache">Moustache</string>
   <string name="avatar_flower">Fleur</string>
   <string name="avatar_bangs">Frange</string>
-  <string name="avatar_nothing">Sélection vide</string>
-  <string name="avatar_size">Taille</string>
+    <string name="avatar_size">Taille</string>
   <string name="avatar_size_slim">Mince</string>
   <string name="avatar_size_broad">Trapu</string>
   <string name="avatar_background">Arrière-plan</string>
@@ -174,23 +129,17 @@
   <string name="purchase_button">Acheter</string>
   <string name="purchase_set_title">Acheter le lot %s</string>
   <string name="due_date">Échéance</string>
-  <string name="quest.accept">Accepter</string>
-  <string name="quest.reject">Refuser</string>
-  <string name="quest.begin">Lancer la quête</string>
-  <string name="quest.cancel">Annuler l\'invitation</string>
-  <string name="quest.abort">Annuler la quête</string>
-  <string name="quest.leave">Abandonner la quête</string>
-  <string name="quest.pending">En attente</string>
-  <string name="quest.accepted">Acceptée</string>
-  <string name="quest.rejected">Rejetée</string>
-  <string name="quest.participants">Participants</string>
-  <string name="version_info">Version %1$s (%2$d)</string>
+  <string name="quest_accept">Accepter</string>
+  <string name="quest_reject">Refuser</string>
+  <string name="quest_begin">Lancer la quête</string>
+  <string name="quest_cancel">Annuler l\'invitation</string>
+  <string name="quest_abort">Annuler la quête</string>
+    <string name="version_info">Version %1$s (%2$d)</string>
   <string name="sidebar_help">Aide &amp; FAQ</string>
   <string name="complete_tutorial">J\'ai compris !</string>
   <string name="dismiss_tutorial">Rappelez-le moi plus tard</string>
   <string name="intro_1_subtitle">Bienvenue sur</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Il est temps de s\'amuser en menant vos tâches à bien. Rejoignez plus de %s personnes qui progressent dans la vie tâche par tâche.</string>
+    <string name="intro_1_description">Il est temps de s\'amuser en menant vos tâches à bien. Rejoignez plus de %s personnes qui progressent dans la vie tâche par tâche.</string>
   <string name="intro_2_subtitle">Progrès en jeu</string>
   <string name="intro_2_title">Progrès dans la vie</string>
   <string name="intro_2_description">Débloquez des fonctionnalités en jeu en validant vos tâches dans la vraie vie. Obtenez des équipements, des familiers, et d\'autres récompenses pour l\'accomplissement de vos objectifs.</string>
@@ -198,12 +147,9 @@
   <string name="intro_3_title">Sociabilisez-vous</string>
   <string name="intro_3_description">Restez sur les rails de l\'accomplissement de vos buts avec l\'aide de vos amis. Épaulez-vous dans la vie et dans la bataille en vous améliorant ensemble !</string>
   <string name="intro_finish_button">C\'est parti !</string>
-  <string name="previous_button">Précédent</string>
-  <string name="next_button">Suivant</string>
+    <string name="next_button">Suivant</string>
   <string name="skip_button">Passer</string>
-  <string name="setup_welcome_description">Bienvenue sur Habitica, où progresser dans le jeu améliorera votre vie quotidienne ! En accomplissant vos buts dans le monde réel, vous débloquerez de l’équipement, des animaux, des quêtes, et bien plus encore.</string>
-  <string name="setup_welcome_title">Bienvenue</string>
-  <string name="avatar_setup_description">Alors, à quoi voudriez-vous ressembler ? Ne vous inquiétez pas, vous pourrez changer d\'apparence plus tard.</string>
+    <string name="avatar_setup_description">Alors, à quoi voudriez-vous ressembler ? Ne vous inquiétez pas, vous pourrez changer d\'apparence plus tard.</string>
   <string name="task_setup_description">Bien ! Maintenant, que voudriez-vous travailler pendant cette aventure ?</string>
   <string name="setup_group_work">Travailler</string>
   <string name="setup_group_exercise">Faire de l\'exercice</string>
@@ -233,38 +179,20 @@
   <string name="setup_task_creativity_1">Étudier un maître de l\'art</string>
   <string name="setup_task_creativity_2">Travailler sur un projet créatif</string>
   <string name="setup_task_creativity_3">Finir un projet créatif</string>
-  <string name="gem.purchase.support">Vous voulez aider Habitica à continuer d\'exister \? Vous pouvez soutenir les développeurs en achetant des gemmes !
-\n
-\nLes gemmes vous permettent d\'acheter des éléments supplémentaires pour votre compte, comme : 
-\n
-\n - De super costumes pour votre avatar
-\n - Des arrière-plans géniaux
-\n - Des quêtes amusantes où vous gagnez des œufs de familiers
-\n - La possibilité de changer de classe avant le niveau 100
-\n
-\nMerci infiniment de nous aider à faire d\'Habitica le meilleur site possible. Votre soutien signifie beaucoup pour nous !</string>
-  <string name="my_guilds">Mes guildes</string>
+    <string name="my_guilds">Mes guildes</string>
   <string name="public_guilds">Guildes publiques</string>
   <string name="guild">Guilde</string>
   <string name="leave">Quitter</string>
   <string name="join">Rejoindre</string>
-  <string name="leader">Responsable</string>
-  <string name="gems">Gemmes</string>
-  <string name="copy_as_todo">Copier comme une tâche à faire</string>
-  <string name="send_pm">Envoyer un MP</string>
-  <string name="flag">Signaler</string>
-  <string name="delete">Supprimer</string>
+    <string name="gems">Gemmes</string>
+    <string name="delete">Supprimer</string>
   <string name="name">Nom</string>
   <string name="description">Description</string>
   <string name="add_tag">Ajouter une nouvelle étiquette</string>
   <string name="privacy">Sécurité</string>
   <string name="write_message">Écrire un message</string>
-  <string name="post">Envoyer</string>
-  <string name="guild_search_hint">Chercher des guildes</string>
-  <string name="todo_due">Échéance : %s</string>
-  <string name="daily_streak">combo actuel : %d</string>
-  <string name="todo_has_duedate">La tâche a une date d\'échéance</string>
-  <string name="battle_gear">Équipement de combat</string>
+    <string name="guild_search_hint">Chercher des guildes</string>
+    <string name="battle_gear">Équipement de combat</string>
   <string name="costume">Costume</string>
   <string name="outfit_head">Tête</string>
   <string name="outfit_headAccessory">Accessoire de tête</string>
@@ -277,10 +205,8 @@
   <string name="wear_costume">Porter un costume</string>
   <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 1j</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="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>
@@ -297,13 +223,9 @@
   <string name="armoireEquipment">Vous avez trouvé une pièce d\'équipement rare dans l\'Armoire : %s! Génial !</string>
   <string name="armoireFood">Vous farfouillez dans l\'Armoire et trouvez une %1$s %2$s. Qu\'est-ce que ça fait là ?</string>
   <string name="armoireExp">Vous luttez contre l\'Armoire et gagnez de l\'expérience. Prends ça !</string>
-  <string name="armoireNotesFull">Ouvrez l\'Armoire pour recevoir au hasard de l\'équipement spécial, de l\'expérience ou de la nourriture ! Pièces d\'équipement restantes : %d</string>
-  <string name="armoireLastItem">Vous avez trouvé la dernière pièce d\'équipement rare dans l\'Armoire enchantée.</string>
-  <string name="armoireNotesEmpty">L\'Armoire contiendra de nouvelles pièces d\'équipement la première semaine de chaque mois. D\'ici là, continuez à cliquer pour obtenir de l\'expérience et de la nourriture !</string>
-  <string name="sell">Vendre (%d pièces d\'or)</string>
+    <string name="sell">Vendre (%d pièces d\'or)</string>
   <string name="hatch_with_potion">Faire éclore avec la potion</string>
-  <string name="feed_to_pet">Donner au familier</string>
-  <string name="hatch_egg">Faire éclore avec l\'œuf</string>
+    <string name="hatch_egg">Faire éclore avec l\'œuf</string>
   <string name="invite_party">Inviter l\'équipe</string>
   <string name="dialog_feeding">Nourrissez votre %s avec :</string>
   <string name="use_animal">Utiliser</string>
@@ -314,8 +236,7 @@
   <string name="close">Fermer</string>
   <string name="share">Partager</string>
   <string name="notification_pet_fed">Vous avez nourri votre %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="notification_purchase_reward">Vous avez acheté une récompense</string>
   <string name="world_quest">Quête mondiale</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
@@ -336,8 +257,7 @@
   <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>
   <string name="select_class">Sélectionner une classe</string>
   <string name="opt_out_class">Désactiver</string>
-  <string name="opt_out_description">Les classes vous ennuient ? Vous voulez choisir plus tard ? Désactivez-les - vous serez un combattant sans capacités spéciales. Vous pouvez vous renseigner plus tard sur le système de classe sur le wiki et activer les classes à tout moment.</string>
-  <string name="class_confirmation">Êtes vous sûr de vouloir devenir un %s \?</string>
+    <string name="class_confirmation">Êtes vous sûr de vouloir devenir un %s \?</string>
   <string name="class_changed">Vous êtes maintenant un %s !</string>
   <string name="class_changed_description">Vous avez une nouvelle tenue de combat par défaut que vous pouvez changer dans l\'équipement !</string>
   <string name="choose_class">Choisissez une classe</string>
@@ -351,23 +271,18 @@
   <string name="invite_existing_users">Inviter des utilisateurs•trices existant•e•s</string>
   <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_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>
-  <string name="email">Email</string>
-  <string name="invite_users">Inviter dans l\'équipe</string>
-  <string name="share_using">Partager avec</string>
+    <string name="email">Email</string>
+    <string name="share_using">Partager avec</string>
   <string name="share_levelup">J\'ai atteint le niveau %d à Habitica en améliorant mes habitudes dans le monde réel !</string>
   <string name="share_hatched">Je viens de faire éclore un familier%1$s %2$s à Habitica en réalisant mes tâches quotidiennes</string>
   <string name="share_raised">Je viens de gagner un-e %1$s monture en réalisant mes tâches quotidiennes!</string>
   <string name="open_in_store">Ouvrir dans le Play Store</string>
   <string name="change_class_confirmation">Êtes-vous sûr·e de vouloir changer de classe ? Cela vous coûtera 3 gemmes.</string>
   <string name="change_class_equipment_warning">Attention : vous ne pourrez plus acheter l\'équipement de la classe %s.</string>
-  <string name="leaderMessage">Message de %1$s</string>
-  <string name="leaderName">Leader : %1$s</string>
-  <string name="confirm">Confirmer</string>
+    <string name="confirm">Confirmer</string>
   <string name="market">Marché</string>
   <string name="timeTravelers">Voyageurs temporels</string>
   <string name="seasonalShop">Boutique saisonnière</string>
@@ -375,37 +290,16 @@
   <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>
-  <string name="purchase_confirmation_title">Confirmer l\'achat</string>
-  <string name="confirm_purchase_text">Acheter %1$s pour %2$s %3$s</string>
-  <string name="gem">gemme</string>
-  <string name="hourglass">sablier</string>
-  <string name="hourglasses">sabliers</string>
-  <string name="gold_singular">pièce d\'or</string>
-  <string name="gold_plural">pièces d\'or</string>
+    <string name="successful_purchase">%1$s acheté</string>
+    <string name="gold_plural">pièces d\'or</string>
   <string name="chat_message_copied">Message copié dans le presse-papier</string>
-  <string name="copy_chat_message">Copier dans le presse-papier</string>
-  <string name="edit_tag_title">Modifier l\'étiquette</string>
-  <string name="edit_tag_btn_edit">Modifier</string>
-  <string name="edit_tag_btn_done">Terminé</string>
-  <string name="edit_tag_btn_delete">Supprimer</string>
-  <string name="confirm_delete_tag_title">Confirmez-vous ?</string>
+    <string name="edit_tag_btn_edit">Modifier</string>
+    <string name="confirm_delete_tag_title">Confirmez-vous ?</string>
   <string name="confirm_delete_tag_message">Voulez-vous vraiment supprimer ceci \?</string>
-  <string name="filter_drawer_edit_tags">Modifier les étiquettes</string>
-  <string name="filter_drawer_filter_tags">Filtrer par étiquette</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Laissez quelqu\'un vous inviter avec ce QR code</string>
-  <string name="qr_save_message">QR code enregistré sous</string>
-  <string name="qr_dialogue_title">Votre QR code</string>
-  <string name="download">Télécharger</string>
-  <string name="send_new_message">Envoyer un nouveau message</string>
-  <string name="choose_recipient_title">Choisissez un destinataire</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Choisissez un destinataire</string>
   <string name="action_continue">Continuer</string>
-  <string name="scan_qr_code">Scanner le QR code</string>
-  <string name="enter_recipient_uuid">Saisissez l\'identifiant du destinataire</string>
-  <string name="invited_to_party">Vous avez été invité·e à rejoindre une équipe !</string>
+    <string name="invited_to_party">Vous avez été invité·e à rejoindre une équipe !</string>
   <string name="stats_widget_label">Statistiques d\'Habitica</string>
   <string name="add_task">Ajouter une tâche</string>
   <string name="add_habit">Ajouter une habitude</string>
@@ -416,15 +310,14 @@
   <string name="widget_habit_button">Réaliser une tâche Habitica</string>
   <string name="widget_dailies">Quotidiennes Habitica</string>
   <string name="widget_todo_list">Liste des tâches Habitica</string>
-  <string name="widget_add_task">Ajouter une tâche Habitica</string>
-  <string name="google_services_missing">Le service Google Play n\'a pas pu être trouvé.</string>
-  <string name="gem.purchase.toolbartitle">Acheter</string>
-  <string name="gem.purchase.title">Acheter des gemmes soutient les développeurs et aide Habitica à fonctionner</string>
-  <string name="gem.purchase.subtitle">Les gemmes permettent d\'acheter des extras amusants pour votre compte, comme :</string>
-  <string name="gem.purchase.listitem1">Des costumes chouettes pour votre avatar</string>
-  <string name="gem.purchase.listitem2">De magnifiques arrière-plans</string>
-  <string name="gem.purchase.listitem3">Des quêtes qui vous récompensent avec des oeufs de familiers</string>
-  <string name="gem.purchase.listitem4">La possibilité de changer de classe avant le niveau 100</string>
+    <string name="google_services_missing">Le service Google Play n\'a pas pu être trouvé.</string>
+  <string name="gem.purchase_toolbartitle">Acheter</string>
+  <string name="gem.purchase_title">Acheter des gemmes soutient les développeurs et aide Habitica à fonctionner</string>
+  <string name="gem.purchase_subtitle">Les gemmes permettent d\'acheter des extras amusants pour votre compte, comme :</string>
+  <string name="gem.purchase_listitem1">Des costumes chouettes pour votre avatar</string>
+  <string name="gem.purchase_listitem2">De magnifiques arrière-plans</string>
+  <string name="gem.purchase_listitem3">Des quêtes qui vous récompensent avec des oeufs de familiers</string>
+  <string name="gem.purchase_listitem4">La possibilité de changer de classe avant le niveau 100</string>
   <string name="support_habitica">Soutenir Habitica</string>
   <string name="skill_transformation_use">Utiliser</string>
   <string name="hatching_market_info">Vous ne recevez pas le bon butin ? Allez voir au marché !</string>
@@ -438,32 +331,32 @@
   <string name="belongs_to_challenge">Appartient au défi</string>
   <string name="has_reminder">A un rappel</string>
   <string name="has_tag">A une étiquette</string>
-  <string name="subscribe.title">L\'abonnement aide l\'équipe de développement et permet à Habitica de fonctionner</string>
+  <string name="subscribe_title">L\'abonnement aide l\'équipe de développement et permet à Habitica de fonctionner</string>
   <string name="subscribe_prompt">Abonnez vous et vous obtiendrez ces bénéfices utiles :</string>
-  <string name="subscribe.listitem1">Acheter des gemmes avec de l\'or</string>
-  <string name="subscribe.listitem2">Objets mensuels exclusifs</string>
-  <string name="subscribe.listitem3">Conservez plus d\'historique de tâches</string>
-  <string name="subscribe.listitem4">Limites de butin doublées</string>
+  <string name="subscribe_listitem1">Acheter des gemmes avec de l\'or</string>
+  <string name="subscribe_listitem2">Objets mensuels exclusifs</string>
+  <string name="subscribe_listitem3">Conservez plus d\'historique de tâches</string>
+  <string name="subscribe_listitem4">Limites de butin doublées</string>
   <string name="subscriptions">Abonnements</string>
   <string name="subscription_duration">Périodique tous les %s</string>
   <string name="subscription_duration_norenew">Pour %s</string>
   <string name="subscribe">S\'abonner</string>
-  <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 écurie plus rapidement !</string>
-  <string name="subscribe1month.gemcap">Plafond de 25 gemmes</string>
-  <string name="subscribe3month.gemcap">Plafond de 30 gemmes</string>
-  <string name="subscribe6month.gemcap">Plafond de 35 gemmes</string>
-  <string name="subscribe12month.gemcap">Plafond de 45 gemmes</string>
+  <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 écurie plus rapidement !</string>
+  <string name="subscribe1month_gemcap">Plafond de 25 gemmes</string>
+  <string name="subscribe3month_gemcap">Plafond de 30 gemmes</string>
+  <string name="subscribe6month_gemcap">Plafond de 35 gemmes</string>
+  <string name="subscribe12month_gemcap">Plafond de 45 gemmes</string>
   <string name="subscription_hourglasses">+%d sabliers mystiques</string>
   <string name="payment_method">Méthode de paiement</string>
   <string name="subscription">Abonnement</string>
   <string name="active">Actif</string>
   <string name="due">Echéance</string>
   <string name="cancel_subscription">Annuler l\'inscription</string>
-  <string name="cancel_subscription_google.description">Vous ne voulez plus vous abonner ? Vous trouverez l\'option pour vous désabonner dans la section \"Mes applications\" de Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Vous ne voulez plus vous abonner ? A cause de votre méthode de paiement, vous ne pouvez vous désinscrire qu\'à travers le site. Cliquez sur le bouton ci-dessous pour ouvrir le site dans votre navigateur !</string>
+  <string name="cancel_subscription_google_description">Vous ne voulez plus vous abonner ? Vous trouverez l\'option pour vous désabonner dans la section \"Mes applications\" de Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">Vous ne voulez plus vous abonner ? A cause de votre méthode de paiement, vous ne pouvez vous désinscrire qu\'à travers le site. Cliquez sur le bouton ci-dessous pour ouvrir le site dans votre navigateur !</string>
   <string name="visit_habitica_website">Rendez vous sur le site Habitica</string>
   <string name="current_bonuses">Bonus actuels</string>
   <string name="months_subscribed">Mois souscrits</string>
@@ -478,56 +371,40 @@
   <string name="twelve_months">12 mois</string>
   <string name="subscribe_prompt_thanks">Pour votre abonnement, vous recevez ces bénéfices :</string>
   <string name="subscription_status">Etat de l\'abonnement</string>
-  <string name="byLeader">par %s</string>
-  <string name="challenge_details">Détails du défi</string>
-  <string name="challenge_leave_title">Quitter le défi</string>
+    <string name="challenge_leave_title">Quitter le défi</string>
   <string name="challenge_leave_text">Voulez-vous vraiment quitter le défi \"%s\" ?</string>
   <string name="challenge_remove_tasks_title">Supprimer les tâches</string>
   <string name="challenge_remove_tasks_text">Voulez-vous supprimer les tâches ?</string>
   <string name="remove_tasks">Supprimer</string>
   <string name="keep_tasks">Conserver</string>
   <string name="my_challenges">Mes défis</string>
-  <string name="public_challenges">Publique</string>
-  <string name="challenges">Défis</string>
-  <string name="daily">Quotidienne</string>
+    <string name="daily">Quotidienne</string>
   <string name="habit">Habitude</string>
   <string name="reward">Récompense</string>
   <string name="todo">A faire</string>
   <string name="official">Officiel</string>
-  <string name="participating">Participe</string>
-  <string name="challenge">Défi</string>
-  <string name="go_to_challenge">Aller au défi</string>
-  <string name="not_part_of_a_challenge">Vous ne faites pas encore partie de ce défi !</string>
+    <string name="challenge">Défi</string>
+    <string name="not_part_of_a_challenge">Vous ne faites pas encore partie de ce défi !</string>
   <string name="join_a_challenge">Rejoignez un défi pour ajouter une sélection de tâches à votre liste, puis affrontez les autres participants pour gagner des succès ou même des gemmes !</string>
   <string name="check_the_public_challenge_tab">Sélectionnez l\'onglet \"Publique\" pour trouver les défi créés par la communauté qui vous sont le plus adaptés !</string>
-  <string name="add_reminder">Ajouter un rappel</string>
-  <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">Messages</string>
-  <string name="FAQ">Questions fréquentes (FAQ)</string>
-  <string name="special">Spécial</string>
+    <string name="inbox">Messages</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>
-  <string name="limited_count">%d restantes</string>
-  <string name="gem_shop">Gemme</string>
+    <string name="gem_shop">Gemme</string>
   <string name="mystery_item">Objet mystère</string>
   <string name="myster_item_notes">Chaque mois, votre abonnement vous donnera accès à un objet mystère. Il est généralement disponible une semaine avant la fin du mois.</string>
   <string name="open">Ouvrir</string>
-  <string name="notification_mystery_item">Vous ouvrez le paquet et trouvez %s !</string>
-  <string name="checkInRewardEarned">Vous avez mérité cette récompense : %1$s pour votre dévotion à améliorer votre vie.</string>
+    <string name="checkInRewardEarned">Vous avez mérité cette récompense : %1$s pour votre dévotion à améliorer votre vie.</string>
   <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">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>
+    <string name="groups">Groupes</string>
   <string name="all">Tous</string>
   <string name="none">Aucun</string>
   <string name="owned">Possédé</string>
   <string name="not_owned">Non possédé</string>
-  <string name="new_game">Nouvelle\nPartie</string>
-  <string name="login_btn_fb">Se connecter via Facebook</string>
+    <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.
@@ -561,7 +438,6 @@
   <string name="reload_content">Recharger le contenu</string>
   <string name="dailyDueDefaultView">Passez le quotidiennes sur l\'onglet \'échéance\' par défaut</string>
   <string name="dailyDueDefaultViewDescription">Une fois cette option définie, les quotidiennes seront par défait sur l\'onglet \'échéance\' à la place de \'toutes\'</string>
-  <string name="repeat_summary">Se répète %1$s chaque %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Votre appareil ne dispose pas de méthode de paiement supportée. Veuillez utiliser le site habitica si vous voulez acheter des gemmes.</string>
   <string name="no_billing_subscriptions">Votre appareil ne dispose pas de méthode de paiement supportée. Veuillez utiliser le site habitica si vous voulez payer un abonnement.</string>
   <string name="save">Enregistrer</string>
@@ -569,8 +445,7 @@
   <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</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_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">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>
@@ -580,42 +455,36 @@
   <string name="new_challenge_title">Nouveau titre du défi</string>
   <string name="ownership">Propriété</string>
   <string name="inn">Auberge</string>
-  <string name="system">Système</string>
-  <string name="start_quest">Démarrer une nouvelle quête</string>
+    <string name="start_quest">Démarrer une nouvelle quête</string>
   <string name="leave_party">Quitter l\'équipe</string>
   <string name="party_description">Description de l\'équipe</string>
-  <string name="abort_confirmation">Voulez-vous vraiment abandonner cette mission ? Elle sera abandonnée pour tout le monde dans votre équipe, et tout progrès sera perdu. Le parchemin de quête sera renvoyé au propriétaire de la quête.</string>
-  <string name="leave_quest_confirmation">Voulez-vous vraiment quitter la quête en cours ? Tout vos progrès dans la quête seront perdu.</string>
-  <string name="number_participants">%1$d participants</string>
+    <string name="number_participants">%1$d participants</string>
   <string name="welcome_back">Bienvenue à nouveau</string>
   <string name="yesterdaililes_prompt">Avez-vous réalisé une de ces quotidiennes hier ?</string>
   <string name="start_day">Démarrer ma journée</string>
   <string name="leave_party_confirmation">Voulez-vous vraiment quitter l\'équipe ?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Prochaine récompense dans %d connexions</string>
-  <string name="pending">En cours</string>
+    <string name="pending">En cours</string>
   <string name="accepted">Accepté</string>
   <string name="declined">Refusé</string>
   <string name="participants">Participants</string>
   <string name="invitations">Invitations</string>
-  <string name="quest_leader_header" formatted="false">Lancé par %s</string>
+  <string name="quest_leader_header">Lancé par %s</string>
   <string name="quest_abort_message">Voulez-vous vraiment annuler cette mission ? Cela l\'annulera pour tout le   monde dans l\'équipe et toute avancée sera perdue. Le parchemin de quête retournera à son propriétaire. </string>
-  <string name="loading">Chargement…</string>
-  <string name="reloading_content">Recharger le contenu</string>
+    <string name="reloading_content">Recharger le contenu</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">mo</string>
   <string name="billion_abbrev">ma</string>
-  <string name="your_balance">Votre solde :</string>
-  <string name="available_until" formatted="false">Disponible jusqu\'au %s</string>
-  <string name="gems_left_max" formatted="false">Gemmes mensuelles : %1$d/%2$d restantes</string>
-  <string name="gems_left_nomax" formatted="false">Gemmes mensuelles : %d restantes</string>
+    <string name="available_until">Disponible jusqu\'au %s</string>
+  <string name="gems_left_max">Gemmes mensuelles : %1$d/%2$d restantes</string>
+  <string name="gems_left_nomax">Gemmes mensuelles : %d restantes</string>
   <string name="health">Santé</string>
   <string name="collect">Réunir</string>
   <string name="rage_meter">Barre de rage</string>
   <string name="boss_quest">Quête de boss</string>
   <string name="collection_quest">Quête de collecte</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <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_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d points d\'expérience</string>
+  <string name="gold_reward">%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>
@@ -628,8 +497,7 @@
   <string name="reset_account_confirmation">réinitialiser mon compte</string>
   <string name="delete_account_confirmation">supprimer mon compte</string>
   <string name="danger_zone">Zone de danger</string>
-  <string name="nevermind">Peu importe</string>
-  <string name="resetting_account">Réinitialisation du compte</string>
+    <string name="resetting_account">Réinitialisation du compte</string>
   <string name="deleting_account">Suppression du compte</string>
   <string name="insufficientGold">Vous devez compléter plus de taches avant de pouvoir vous offrir cet objet ! </string>
   <string name="insufficientGems">Vous n\'avez pas assez de gemmes pour acheter cet objet !</string>
@@ -662,8 +530,7 @@
   <string name="authentication_summary">Modifiez vos options d\'authentification.</string>
   <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_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>
@@ -684,7 +551,7 @@
   <string name="distribute_class">Répartir selon la classe</string>
   <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="points_to_allocate">%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>
@@ -694,9 +561,7 @@
   <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="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>
@@ -710,19 +575,13 @@
   <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="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="rage_strike_count">Attaques de rage : %d/%d</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="strike_active_title">%s a été attaqué !</string>
+    <string name="strike_active_description">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>
@@ -732,33 +591,21 @@
   <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="join_party_title">Vous voulez rejoindre une équipe ?</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="world_boss_description_title">Qu\'est-ce qu\'un boss mondial ?</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="world_boss_action_prompt">Combattez le boss pour obtenir une récompense spéciale et sauver Habitica de la terreur de %s !</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="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>
@@ -792,17 +639,15 @@
   <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="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="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="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>
diff --git a/Habitica/res/values-hr-rHR/strings.profile.xml b/Habitica/res/values-hr-rHR/strings.profile.xml
index 2c5685c8a..29b59cc00 100644
--- a/Habitica/res/values-hr-rHR/strings.profile.xml
+++ b/Habitica/res/values-hr-rHR/strings.profile.xml
@@ -9,10 +9,7 @@
     <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 ef42b6fef..ab72ce5e5 100644
--- a/Habitica/res/values-hr-rHR/strings.sidebar.xml
+++ b/Habitica/res/values-hr-rHR/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <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">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">Štala</string>
-  <string name="sidebar.news">Vijesti</string>
-  <string name="sidebar.settings">Postavke</string>
-  <string name="sidebar.about">O nama</string>
+  <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">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">Štala</string>
+  <string name="sidebar_news">Vijesti</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 4eabd7926..78477e40c 100644
--- a/Habitica/res/values-hr-rHR/strings.tutorial.xml
+++ b/Habitica/res/values-hr-rHR/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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_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>
+    <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 4f52b1c7a..576e4cb18 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Iskustvo</string>
   <string name="HP_default">Zdravlje</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Opcije nisu mogle biti učitane iz barkoda</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Postavke</string>
-  <string name="SP_address_hint">Tvoj prilagođeni server</string>
-  <string name="SP_userID_title">Korisnikov ID</string>
+    <string name="SP_userID_title">Korisnikov ID</string>
   <string name="SP_userID_summary">Tvoj Korisnički ID</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="PS_contact_title">Kontaktiraj me</string>
+    <string name="pref_account_header">Račun</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="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>
@@ -37,14 +32,8 @@
   <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="action_edit">Uredi</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>
@@ -54,32 +43,23 @@
   <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šao/la</string>
-  <string name="string_revive">Oživi</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.bugreport">Prijavi grešku</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 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="LoginActivityName">Dobrodošao/la</string>
+    <string name="about_title">O nama</string>
+  <string name="about_libraries">Knjižnice</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_bugreport">Prijavi grešku</string>
+  <string name="about_source_code">Izvorni kod</string>
+    <!--Network Errors-->
+    <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_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="difficulty">Težina</string>
   <string name="tags">Oznake</string>
   <string name="trivial">Jako lagano</string>
   <string name="easy">Lagano</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negativno ( - )</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_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="attributes">Atributi</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>
@@ -125,24 +94,15 @@
  
  </string>
   <string name="filter">Filtriraj</string>
-  <string name="profile_image">Profilna slika</string>
-  <string name="mana_price_button">%d MP</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="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">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="reminder_title">Ne zaboravi prekrižiti svoje zadatke</string>
+    <string name="unlock_lvl_11">Otključava se na levelu 11</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">Družina</string>
   <string name="chat">Chat</string>
   <string name="members">Članovi</string>
@@ -150,24 +110,20 @@
   <string name="dailies">Svakodnevni zadaci</string>
   <string name="todos">Zadaci</string>
   <string name="rewards">Nagrade </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="yes">Da</string>
   <string name="no">Ne</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_base">Baza</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 nije postavljeno</string>
-  <string name="avatar_size">Veličina</string>
+    <string name="avatar_size">Veličina</string>
   <string name="avatar_size_slim">Vitko</string>
   <string name="avatar_size_broad">Široko</string>
   <string name="avatar_background">Pozadina</string>
@@ -176,23 +132,17 @@
   <string name="purchase_button">Kupi</string>
   <string name="purchase_set_title">Kupi set %s</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 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>
-  <string name="quest.participants">Sudionici </string>
-  <string name="version_info">Verzija %1$s (%2$d)</string>
+  <string name="quest_accept">Prihvati </string>
+  <string name="quest_reject">Odbij</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="version_info">Verzija %1$s (%2$d)</string>
   <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_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_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>
@@ -200,12 +150,9 @@
   <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">Sljedeće</string>
+    <string name="next_button">Sljedeće</string>
   <string name="skip_button">Preskoči</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="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">Tjelovježba</string>
@@ -235,29 +182,20 @@
   <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 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="my_guilds">Moji Cehovi</string>
   <string name="public_guilds">Javni Cehovi</string>
   <string name="guild">Ceh</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="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="gems">Dragulji</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="post">Objavi</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="guild_search_hint">Pretraži cehove</string>
+    <string name="battle_gear">Borbena Oprema</string>
   <string name="costume">Kostim</string>
   <string name="outfit_head">Glava</string>
   <string name="outfit_headAccessory">Dodatak za glavu</string>
@@ -270,10 +208,8 @@
   <string name="wear_costume">Nosi Kostim </string>
   <string name="equipped">Opremljeno</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="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="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>
@@ -290,13 +226,9 @@
   <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 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="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="hatch_egg">Izlegni s jajetom</string>
   <string name="invite_party">Pozovi družinu</string>
   <string name="dialog_feeding">Nahrani %s s:</string>
   <string name="use_animal">Koristi</string>
@@ -307,17 +239,8 @@
   <string name="close">Zatvori</string>
   <string name="share">Podijeli</string>
   <string name="notification_pet_fed">Nahranio/la si svoju/ga %s!</string>
-  <string name="notification_purchase">Kupio/la si %s</string>
-  <string name="notification_purchase_reward">Kupio/la si nagradu</string>
-  <string name="sectiondrop">Standardni</string>
-  <string name="sectionpremium">Čarobnih napitaka</string>
-  <string name="sectionquest">Pustolovni</string>
-  <string name="sectionspecial">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="notification_purchase_reward">Kupio/la si nagradu</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
@@ -336,8 +259,7 @@
   <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">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_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>
@@ -351,23 +273,18 @@
   <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 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_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">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="email">E-mail</string>
+    <string name="share_using">Podijeli koristeći</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 ž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="confirm">Potvrdi</string>
   <string name="market">Tržnica</string>
   <string name="timeTravelers">Vremenski putnici</string>
   <string name="seasonalShop">Sezonski dućan</string>
@@ -375,37 +292,16 @@
   <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="successful_purchase">Kupljen %1$s</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="edit_tag_btn_edit">Uredi</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>
+    <!--QR Strings-->
+    <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="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>
@@ -416,13 +312,12 @@
   <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="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>
@@ -478,56 +373,40 @@
   <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_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="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="challenge">U sklopu 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="inbox">Poruke</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="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="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="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_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>
@@ -559,7 +438,6 @@
   <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>
@@ -567,8 +445,7 @@
   <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_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>
@@ -578,42 +455,36 @@
   <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="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="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="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_leader_header">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="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="available_until">Dostupno do %s</string>
+  <string name="gems_left_max">Mjesečni Dragulji: %1$d/%2$d preostalo</string>
+  <string name="gems_left_nomax">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_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d bodova Iskustva</string>
+  <string name="gold_reward">%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>
@@ -626,8 +497,7 @@
   <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="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>
@@ -660,8 +530,7 @@
   <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_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>
@@ -682,7 +551,7 @@
   <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="points_to_allocate">%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>
@@ -692,9 +561,7 @@
   <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="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>
@@ -708,19 +575,13 @@
   <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="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="rage_strike_count">Udari Bijesa: %d/%d</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="strike_active_title">%s je bio napadnut!</string>
+    <string name="strike_active_description">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>
@@ -730,29 +591,21 @@
   <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="join_party_title">Želiš se priključiti Družini?</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="world_boss_description_title">Što je Svjetski Bos?</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="world_boss_action_prompt">Porazi Bosa kako bi dobio/la posebne nagrade i spasio/la Habiticu od terora %s.</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="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>
@@ -787,16 +640,14 @@
   <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="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="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>
diff --git a/Habitica/res/values-in/strings.sidebar.xml b/Habitica/res/values-in/strings.sidebar.xml
index 66bb7a707..914278a37 100644
--- a/Habitica/res/values-in/strings.sidebar.xml
+++ b/Habitica/res/values-in/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tugas</string>
-  <string name="sidebar.skills">Kemampuan</string>
-  <string name="sidebar.section.social">Sosial</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>
-  <string name="sidebar.equipment">Perlengkapan</string>
-  <string name="sidebar.stable">Istal</string>
-  <string name="sidebar.news">Berita</string>
-  <string name="sidebar.settings">Pengaturan</string>
-  <string name="sidebar.about">Tentang Kami</string>
+  <string name="sidebar_tasks">Tugas</string>
+  <string name="sidebar_skills">Kemampuan</string>
+  <string name="sidebar.section_social">Sosial</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>
+  <string name="sidebar_equipment">Perlengkapan</string>
+  <string name="sidebar_stable">Istal</string>
+  <string name="sidebar_news">Berita</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 1eceff370..9624db2fa 100644
--- a/Habitica/res/values-in/strings.tutorial.xml
+++ b/Habitica/res/values-in/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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 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_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! 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>
+    <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 e86d67dc5..0befaa313 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -4,19 +4,15 @@
   <string name="XP_default">Pengalaman </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 Penggunamu</string>
   <string name="SP_APIToken_title">Token API</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">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>
@@ -24,7 +20,6 @@
   <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 Pengguna</string>
   <string name="push_notifications">Notifikasi</string>
   <string name="push_notifications_sum">Pengaturan notifikasi</string>
@@ -37,13 +32,7 @@
   <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">Sunting</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>
@@ -54,31 +43,22 @@
   <string name="confirmpassword">Konfirmasi kata sandi</string>
   <string name="logout">Keluar</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">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">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>
+  <string name="about_title">Tentang Kami</string>
+  <string name="about_libraries">Pustaka</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>
   <!--Network Errors-->
-  <string name="network_error_title">Koneksi Gagal</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">Nama Pengguna dan/atau Kata Sandi salah.</string>
   <string name="login_validation_error_title">Validasi Gagal</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">Sepele</string>
@@ -90,18 +70,7 @@
   <string name="negative_habit_form">Negatif (-)</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>
@@ -120,23 +89,14 @@
   <string name="faint_header">Kamu kehabisan Nyawa!</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">item cek baru</string>
-  <string name="add_checklist_item">Tambahkan</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 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">Tutup</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">Tutup</string>
   <string name="party">Party</string>
   <string name="chat">Obrolan</string>
   <string name="members">Anggota</string>
@@ -144,8 +104,6 @@
   <string name="dailies">Keseharian</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 menghapusnya?</string>
   <string name="yes">Ya</string>
   <string name="no">Tidak</string>
   <string name="quest">Misi</string>
@@ -153,14 +111,12 @@
   <string name="avatar_hair">Rambut</string>
   <string name="avatar_shirt">Baju</string>
   <string name="avatar_skin">Kulit</string>
-  <string name="avatar_ears">Telinga Hewan</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>
   <string name="avatar_flower">Bunga</string>
   <string name="avatar_bangs">Poni</string>
-  <string name="avatar_nothing">Tidak ada yang digunakan</string>
   <string name="avatar_size">Ukuran</string>
   <string name="avatar_size_slim">Kurus</string>
   <string name="avatar_size_broad">Bidang</string>
@@ -170,22 +126,16 @@
   <string name="purchase_button">Beli</string>
   <string name="purchase_set_title">Beli set %s</string>
   <string name="due_date">Tenggat Waktu</string>
-  <string name="quest.accept">Terima</string>
-  <string name="quest.reject">Tolak</string>
-  <string name="quest.begin">Mulai Misi</string>
-  <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">Menunggu</string>
-  <string name="quest.accepted">Diterima</string>
-  <string name="quest.rejected">Ditolak</string>
-  <string name="quest.participants">Partisipan</string>
+  <string name="quest_accept">Terima</string>
+  <string name="quest_reject">Tolak</string>
+  <string name="quest_begin">Mulai Misi</string>
+  <string name="quest_cancel">Batalkan Undangan</string>
+  <string name="quest_abort">Batalkan Misi</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">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>
@@ -194,11 +144,8 @@
   <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="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>
@@ -229,28 +176,19 @@
   <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\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">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">Cari guild</string>
-  <string name="todo_due">Tenggat: %s</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>
@@ -264,9 +202,7 @@
   <string name="wear_costume">Gunakan Kostum</string>
   <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_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>
@@ -278,12 +214,8 @@
   <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="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 party</string>
   <string name="dialog_feeding">Beri makan %s dengan:</string>
@@ -294,16 +226,7 @@
   <string name="close">Tutup</string>
   <string name="share">Bagikan</string>
   <string name="notification_pet_fed">Kamu memberi makan %s!</string>
-  <string name="notification_purchase">%s telah dibeli</string>
   <string name="notification_purchase_reward">Kamu membeli sebuah hadiah</string>
-  <string name="sectiondrop">Standard</string>
-  <string name="sectionpremium">Ramuan Ajaib</string>
-  <string name="sectionquest">Misi</string>
-  <string name="sectionspecial">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">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
@@ -322,7 +245,6 @@
   <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>
   <string name="select_class">Pilih Profesi</string>
   <string name="opt_out_class">Matikan Fitur</string>
-  <string name="opt_out_description">Tidak ingin diganggu dengan profesi? Ingin memilih nanti saja? Matikan fitur - kamu akan menjadi seorang Prajurit tanpa kemampuan spesial. Kamu dapat membaca mengenai sistem profesi nanti di wiki dan mengaktifkan fitur profesi kapan saja.</string>
   <string name="class_confirmation">Apakah kamu yakin ingin menjadi seorang %s?</string>
   <string name="class_changed">Kamu sekarang seorang %s! </string>
   <string name="class_changed_description">Kamu memiliki Baju Perang baru yang dapat diganti pada menu Perlengkapan! </string>
@@ -337,12 +259,9 @@
   <string name="invite_existing_users">Undang Pengguna yang telah ada</string>
   <string name="send">Kirim</string>
   <string name="invite">Undang Teman</string>
-  <string name="invite_id_description">Jika kamu memiliki teman yang telah menggunakan Habitica, undang melalui ID Pengguna di sini.</string>
   <string name="invite_email_description">Jika seorang teman bergabung dengan Habitica melalui emailmu, mereka otomatis akan diundang ke dalam kelompokmu!</string>
   <string name="add_invites">Tambahkan Undangan</string>
-  <string name="user_id">ID Pengguna</string>
   <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>
@@ -350,8 +269,6 @@
   <string name="open_in_store">Buka di Play Store</string>
   <string name="change_class_confirmation">Apa kamu yakin untuk mengubah kelas? Ini akan membutuhkan 3 permata.</string>
   <string name="change_class_equipment_warning">Peringatan: Kamu tidak akan dapat membeli perlengkapan untuk profesi %s. </string>
-  <string name="leaderMessage">Pesan dari %1$s</string>
-  <string name="leaderName">Ketua: %1$s</string>
   <string name="confirm">Pastikan</string>
   <string name="market">Pasar</string>
   <string name="timeTravelers">Penjelajah Waktu</string>
@@ -360,36 +277,15 @@
   <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>
-  <string name="hourglass">Jam Pasir</string>
-  <string name="hourglasses">Jam-jam Pasir</string>
-  <string name="gold_singular">Koin Emas</string>
   <string name="gold_plural">Koin Emas</string>
   <string name="chat_message_copied">Pesan telah tersalin di Papan pencatat</string>
-  <string name="copy_chat_message">Salin di Papan pencatat</string>
-  <string name="edit_tag_title">Rubah Label</string>
   <string name="edit_tag_btn_edit">Rubah</string>
-  <string name="edit_tag_btn_done">Selesai</string>
-  <string name="edit_tag_btn_delete">Hapus</string>
   <string name="confirm_delete_tag_title">Kamu yakin?</string>
   <string name="confirm_delete_tag_message">Apa kamu yakin ingin menghapus?</string>
-  <string name="filter_drawer_edit_tags">Rubah Label</string>
-  <string name="filter_drawer_filter_tags">Saring berdasarkan Label</string>
   <!--QR Strings-->
-  <string name="qr_section_title">Pinta seseorang untuk mengundangmu melalui Kode QR</string>
-  <string name="qr_save_message">Kode QR tersimpan pada</string>
-  <string name="qr_dialogue_title">Kode QR-mu</string>
-  <string name="download">Unduh</string>
-  <string name="send_new_message">Kirim pesan baru</string>
   <string name="choose_recipient_title">Pilih Penerima Pesan</string>
   <string name="action_continue">Lanjutkan</string>
-  <string name="scan_qr_code">Pindai Kode QR</string>
-  <string name="enter_recipient_uuid">Masukan User ID Penerima</string>
   <string name="invited_to_party">Kamu telah diundang untuk bergabung dalam sebuah party!</string>
   <string name="stats_widget_label">Status Habitica</string>
   <string name="add_task">Tambah Tugas</string>
@@ -401,15 +297,14 @@
   <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>
-  <string name="gem.purchase.title">Membeli gem dapat mendukung pengembang dan menjaga Habitica tetap berjalan</string>
-  <string name="gem.purchase.subtitle">Permata membuatmu dapat membeli tambahan yang menyenangkan untuk akunmu, termasuk:</string>
-  <string name="gem.purchase.listitem1">Kostum keren untuk avatarmu</string>
-  <string name="gem.purchase.listitem2">Latar belakang yang keren</string>
-  <string name="gem.purchase.listitem3">Misi yang memberikanmu hadiah telur</string>
-  <string name="gem.purchase.listitem4">Kemampuan untuk mengganti profesi sebelum level 100</string>
+  <string name="gem.purchase_toolbartitle">Bayar</string>
+  <string name="gem.purchase_title">Membeli gem dapat mendukung pengembang dan menjaga Habitica tetap berjalan</string>
+  <string name="gem.purchase_subtitle">Permata membuatmu dapat membeli tambahan yang menyenangkan untuk akunmu, termasuk:</string>
+  <string name="gem.purchase_listitem1">Kostum keren untuk avatarmu</string>
+  <string name="gem.purchase_listitem2">Latar belakang yang keren</string>
+  <string name="gem.purchase_listitem3">Misi yang memberikanmu hadiah telur</string>
+  <string name="gem.purchase_listitem4">Kemampuan untuk mengganti profesi sebelum level 100</string>
   <string name="support_habitica">Dukung Habitica</string>
   <string name="skill_transformation_use">gunakan</string>
   <string name="hatching_market_info">Tidak mendapatkan item yang diinginkan? Beli di Market!</string>
@@ -423,26 +318,26 @@
   <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_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="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="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="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 ingin berlangganan lagi\? Kamu bisa menemukan opsi untuk berhenti berlangganan di bagian \"Aplikasi Saya\" dari Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Tidak ingin 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="cancel_subscription_google_description">Tidak ingin berlangganan lagi\? Kamu bisa menemukan opsi untuk berhenti berlangganan di bagian \"Aplikasi Saya\" dari Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">Tidak ingin 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>
@@ -457,8 +352,6 @@
   <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>
@@ -466,46 +359,32 @@
   <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>
@@ -537,7 +416,6 @@
   <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>
@@ -550,41 +428,36 @@
   <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_leader_header">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="available_until">Tersedia hingga %s</string>
+  <string name="gems_left_max">Permata Bulanan: %1$d/%2$d Tersisa</string>
+  <string name="gems_left_nomax">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_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d poin Pengalaman</string>
+  <string name="gold_reward">%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>
@@ -596,7 +469,6 @@
   <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>
@@ -630,7 +502,6 @@
   <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>
@@ -651,7 +522,7 @@
   <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="points_to_allocate">%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>
@@ -661,8 +532,6 @@
   <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>
@@ -676,19 +545,13 @@
   <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="rage_strike_count">Tingkat Kemarahan 1%d/1%d</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="strike_active_title">Sang %s telah Diserang!</string>
+  <string name="strike_active_description">%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>
@@ -698,11 +561,8 @@
   <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>
-<string name="levelup_header">Kamu Telah Mencapai Level %1$d!</string>
+  <string name="levelup_header">Kamu Telah Mencapai Level %1$d!</string>
     <string name="levelup_detail">Dengan menyelesaikan tujuan hidupmu, kamu naik level dan sekarang sepenuhnya pulih!</string>
     <string name="faint_penalty_body">Kamu kehilangan satu level, uangmu, and sebagian perlengkapan, tapi kamu bisa mendapatkannya kembali dengan kerja keras! Semoga beruntung—kamu bisa melakukannya dengan baik.</string>
     <string name="reminder_title">Ingatlah untuk selalu memeriksa tugas anda</string>
@@ -712,42 +572,36 @@
     <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="evolved_pet_title">Kamu telah menjinakkan %1$s %2$s, ayo pergi naik!</string>
+    <string name="evolved_pet_title">Kamu telah menjinakkan %s, ayo pergi naik!</string>
     <string name="opting_out_progress">Memilih Keluar</string>
     <string name="invite_username_description">Jika kamu memiliki teman yang telah menggunakan Habitica, undang mereka dengan mencantumkan nama penggunanya disini.</string>
     <string name="subscription_duration_norenew">Untuk %s</string>
-    <string name="subscribe1month.gemcap">Batas 25 Gem</string>
-    <string name="subscribe3month.gemcap">Batas 30 Gem</string>
-    <string name="subscribe6month.gemcap">Batas 35 Gem</string>
-    <string name="subscribe12month.gemcap">Batas 45 Gem</string>
+    <string name="subscribe1month_gemcap">Batas 25 Gem</string>
+    <string name="subscribe3month_gemcap">Batas 30 Gem</string>
+    <string name="subscribe6month_gemcap">Batas 35 Gem</string>
+    <string name="subscribe12month_gemcap">Batas 45 Gem</string>
     <string name="due">Tenggat waktu</string>
     <string name="welcome_text">Wah, kamu pasti orang baru disini. Aku Justin, aku akan menjadi pemandumu di Habitica
 \n
 \nPertama-tama, bagaimana sebaiknya aku memanggilmu\? Jangan ragu untuk mengubah apa yang telah dipilih. Saat Anda siap, mari buat avatar Anda!</string>
     <string name="gem_reward">Hadiah Permata</string>
     <string name="create_challenge">Buat Tantangan</string>
-    <string name="edit_challenge">Sunting</string>
-    <string name="challenge_create_error_tavern_one_gem">Kamu butuh setidaknya 1 permata untuk membuat tantangan publik.</string>
+  <string name="challenge_create_error_tavern_one_gem">Kamu butuh setidaknya 1 permata untuk membuat tantangan publik.</string>
     <string name="identify_your_challenge_with_a_tag">Identifikasi tantanganmu dengan nama yang pendek</string>
     <string name="challenge_create_error_tag">Kamu butuh nama yang pendek untuk membuat Tantangan ini.</string>
-    <string name="loading">Memuat…</string>
-    <string name="change_username">Ganti Nama Pengguna</string>
-    <string name="chat_message">Pesan Obrolan</string>
-    <string name="world_boss_description_title">Apa itu Boss Dunia\?</string>
+  <string name="change_username">Ganti Nama Pengguna</string>
+  <string name="world_boss_description_title">Apa itu Boss Dunia\?</string>
     <string name="world_boss_description_1">Selesaikan tugas-tugas untuk menyerang Boss</string>
-    <string name="world_boss_action_prompt" formatted="false">Kalahkan boss untuk mendapatkan hadiah spesial dan menyelamatkan Habitica dari teror %s!</string>
-    <string name="world_boss_description_subtitle">%s menyerangmu!</string>
-    <string name="questShop_owner_long">Ian sang Pemandu Quest</string>
+    <string name="world_boss_action_prompt">Kalahkan boss untuk mendapatkan hadiah spesial dan menyelamatkan Habitica dari teror %s!</string>
+  <string name="questShop_owner_long">Ian sang Pemandu Quest</string>
     <string name="report">Laporkan</string>
-    <string name="like">Suka</string>
-    <string name="reply">Balas</string>
+  <string name="reply">Balas</string>
     <string name="confirm_username_title">Apakah kamu yakin ingin mengkonfirmasi nama pengguna saat ini\?</string>
     <string name="cancel">Batalkan</string>
     <string name="confirm_username">Konfirmasi Nama Pengguna</string>
     <string name="username_not_confirmed">Nama Pengguna tidak terkonfirmasi</string>
     <string name="username_confirmed">Nama Pengguna Terkonfirmasi</string>
-    <string name="username_level">\@%s ・Lvl %d</string>
-    <string name="username_copied">Nama Pengguna berhasil disalin ke clipboard</string>
+  <string name="username_copied">Nama Pengguna berhasil disalin ke clipboard</string>
     <string name="welcomeNameTitle">Bagaimana kami memanggil anda\?</string>
     <string name="display_name_length_error">Nama Tampilan harus berisikan 1 sampai 20 karakter</string>
     <string name="setup_task_reward">Beri hadiah untuk dirimu sendiri</string>
diff --git a/Habitica/res/values-it/strings.profile.xml b/Habitica/res/values-it/strings.profile.xml
index 1d410af8b..c8d1466cb 100644
--- a/Habitica/res/values-it/strings.profile.xml
+++ b/Habitica/res/values-it/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Livello:</string>
     <string name="profile_class_bonus">Bonus classe:</string>
     <string name="profile_allocated">Allocati:</string>
-    <string name="profile_boosts">Bonus:</string>
     <string name="profile_private_message">Messaggio privato</string>
     <string name="profile_achievements">Medaglie</string>
-    <string name="profile_achievement_ok">Ok</string>
-    <string name="profile_qrcode_close">Chiudi</string>
 
 </resources>
diff --git a/Habitica/res/values-it/strings.sidebar.xml b/Habitica/res/values-it/strings.sidebar.xml
index 6d80c686f..cd15da1ea 100644
--- a/Habitica/res/values-it/strings.sidebar.xml
+++ b/Habitica/res/values-it/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Attività</string>
-  <string name="sidebar.skills">Abilità</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Messaggi</string>
-  <string name="sidebar.tavern">Taverna</string>
-  <string name="sidebar.party">Squadra</string>
-  <string name="sidebar.purchaseGems">Gemme e abbonamento</string>
-  <string name="sidebar.guilds">Gilde</string>
-  <string name="sidebar.challenges">Sfide</string>
-  <string name="sidebar.section.inventory">Inventario</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Equipaggiamento</string>
-  <string name="sidebar.stable">Scuderia</string>
-  <string name="sidebar.news">Novità</string>
-  <string name="sidebar.settings">Impostazioni</string>
-  <string name="sidebar.about">Su Habitica</string>
+  <string name="sidebar_tasks">Attività</string>
+  <string name="sidebar_skills">Abilità</string>
+  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_inbox">Messaggi</string>
+  <string name="sidebar_tavern">Taverna</string>
+  <string name="sidebar_party">Squadra</string>
+  <string name="sidebar_purchaseGems">Gemme e abbonamento</string>
+  <string name="sidebar_guilds">Gilde</string>
+  <string name="sidebar_challenges">Sfide</string>
+  <string name="sidebar.section_inventory">Inventario</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Equipaggiamento</string>
+  <string name="sidebar_stable">Scuderia</string>
+  <string name="sidebar_news">Novità</string>
+    <string name="sidebar_about">Su Habitica</string>
   <string name="sidebar_shops">Negozi</string>
   <string name="sidebar_stats">Statistiche</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.tutorial.xml b/Habitica/res/values-it/strings.tutorial.xml
index 278738393..c83ef1f18 100644
--- a/Habitica/res/values-it/strings.tutorial.xml
+++ b/Habitica/res/values-it/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Compra oggetti per il tuo avatar con l\'oro che ottieni!</string>
   <string name="tutorial_rewards_2">Puoi anche creare delle ricompense reali, basate su ciò che ti motiva.</string>
   <string name="tutorial_tasks_complete">Per ora è tutto. Se hai bisogno di un ripasso, consulta la sezione FAQ.</string>
-  <string name="tutorial_equipment">Quando compri dell\'equipaggiamento, apparirà qui. Il tuo equipaggiamento di battaglia influisce sulle tue statistiche, e il tuo Costume (se attivato) cambia ciò che indossa il tuo avatar.</string>
-  <string name="tutorial_items">Guadagnati degli oggetti completando attività e salendo di livello. Tocca un oggetto per usarlo!</string>
-  <string name="tutorial_pets">Man mano che porti a termine attività nella vita reale, ora potrai trovare casualmente uova e pozioni. Combinali per far nascere degli animali!</string>
-  <string name="tutorial_skills">Le Abilità sono dei poteri con straordinari effetti! Tocca un\'abilità per utilizzarla. Costerà del Mana (la barra blu), che puoi ottenere usando Habitica ogni giorno e completando attività. Dai un\'occhiata alle FAQ nel menù per avere maggiori informazioni!</string>
+    <string name="tutorial_skills">Le Abilità sono dei poteri con straordinari effetti! Tocca un\'abilità per utilizzarla. Costerà del Mana (la barra blu), che puoi ottenere usando Habitica ogni giorno e completando attività. Dai un\'occhiata alle FAQ nel menù per avere maggiori informazioni!</string>
   <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>
+    <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 e6c454fb9..37a571383 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Esperienza</string>
   <string name="HP_default">Salute</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Non è stato possibile importare le preferenze dal codice a barre</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Impostazioni</string>
-  <string name="SP_address_hint">Il tuo server personalizzato</string>
-  <string name="SP_userID_title">ID utente</string>
+    <string name="SP_userID_title">ID utente</string>
   <string name="SP_userID_summary">Il tuo ID utente</string>
   <string name="SP_APIToken_title">Chiave API</string>
   <string name="SP_APIToken_summary">La tua Chiave API</string>
   <string name="Language_title">Lingua</string>
   <string name="Language_summary">Cambia la lingua di Habitica</string>
-  <string name="SP_user_qr_code">Il tuo codice QR</string>
-  <string name="PS_contact_title">Contattami</string>
-  <string name="unknown_error">Si è verificato un errore...</string>
-  <string name="pref_account_header">Account</string>
+    <string name="PS_contact_title">Contattami</string>
+    <string name="pref_account_header">Account</string>
   <string name="pref_first_day_of_the_week_title">Primo giorno della settimana</string>
   <string name="pref_first_day_of_the_week_summary">Primo giorno della settimana in tutti i calendari</string>
   <string name="pref_reminder_header">Notifica giornaliera</string>
   <string name="pref_reminder_checkbox">Attiva notifica</string>
   <string name="pref_reminder_picker">Imposta ora notifica</string>
   <string name="pref_cds_header">Inizio giorno personalizzato</string>
-  <string name="pref_cds_picker">Imposta ora di inizio giorno</string>
-  <string name="pref_push_notifications_checkbox">Notifiche push utente</string>
+    <string name="pref_push_notifications_checkbox">Notifiche push utente</string>
   <string name="push_notifications">Notifiche Push</string>
   <string name="push_notifications_sum">Gestisci le impostazioni delle notifiche push</string>
   <string name="preference_push_you_won_challenge">Hai vinto una Sfida!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">La tua missione è cominciata</string>
   <string name="preference_push_invited_to_quest">Invito ad una Missione</string>
   <!--Adding tasks-->
-  <string name="task_value">Valore</string>
-  <string name="new_todo">Nuova To-Do</string>
-  <string name="new_reward">Nuova Ricompensa</string>
-  <string name="new_daily">Nuova Daily</string>
-  <string name="new_habit">Nuova Abitudine</string>
-  <string name="action_edit">Modifica</string>
-  <string name="action_delete">Elimina</string>
-  <string name="action_cancel">Annulla</string>
+    <string name="action_edit">Modifica</string>
+    <string name="action_cancel">Annulla</string>
   <string name="login_btn">Accedi</string>
   <string name="register_btn">Registrati</string>
   <string name="username">Nome utente</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Conferma password</string>
   <string name="logout">Esci</string>
   <string name="logout_description">Esci dal tuo account</string>
-  <string name="account_details">Dettagli account</string>
-  <string name="LoginActivityName">Benvenuto</string>
-  <string name="string_revive">Rianima</string>
-  <string name="please_connect">Dovresti connetterti attraverso l\'applicazione prima di usare un widget</string>
-  <string name="about.title">Info</string>
-  <string name="about.libraries">Librerie</string>
-  <string name="about.versionhistory">Cronologia versioni</string>
-  <string name="about.habitica_open_source">Habitica è disponibile come software open source su Github</string>
-  <string name="about.rate_our_app">Valuta la nostra app</string>
-  <string name="about.give_us_feedback">Invia suggerimenti!</string>
-  <string name="about.bugreport">Segnala un bug</string>
-  <string name="about.source_code">Codice sorgente</string>
-  <string name="repeatEvery">Ripeti ogni</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Errore di connessione</string>
-  <string name="network_error_no_network_body">Non sei connesso ad internet.</string>
-  <string name="internal_error_api">Sembra esserci un problema col server. Riprova più tardi.</string>
+    <string name="LoginActivityName">Benvenuto</string>
+    <string name="about_title">Info</string>
+  <string name="about_libraries">Librerie</string>
+    <string name="about_habitica_open_source">Habitica è disponibile come software open source su Github</string>
+  <string name="about_rate_our_app">Valuta la nostra app</string>
+  <string name="about_give_us_feedback">Invia suggerimenti!</string>
+  <string name="about_bugreport">Segnala un bug</string>
+  <string name="about_source_code">Codice sorgente</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Sembra esserci un problema col server. Riprova più tardi.</string>
   <string name="authentication_error_title">Errore di autenticazione</string>
-  <string name="authentication_error_body">Il tuo nome utente e/o password non è corretto.</string>
-  <string name="login_validation_error_title">Errore di validazione</string>
+    <string name="login_validation_error_title">Errore di validazione</string>
   <string name="login_validation_error_fieldsmissing">Devi compilare tutti i campi.</string>
   <string name="save_changes">Salva</string>
   <string name="copy">Copia</string>
   <string name="notes">Note</string>
-  <string name="text">Testo</string>
-  <string name="difficulty">Difficoltà</string>
+    <string name="difficulty">Difficoltà</string>
   <string name="tags">Etichette</string>
   <string name="trivial">Triviale</string>
   <string name="easy">Facile</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negativa ( - )</string>
   <string name="checklist">Checklist</string>
   <string name="reminders">Promemoria</string>
-  <string name="actions">Azioni</string>
-  <string name="attributes">Attributi</string>
-  <string name="physical">Forza</string>
-  <string name="mental">Intelligenza</string>
-  <string name="social">Costituzione</string>
-  <string name="other">Percezione</string>
-  <string name="frequency">Frequenza</string>
-  <string name="frequency_weekly">Certi giorni della settimana</string>
-  <string name="frequency_daily">Ogni X giorni</string>
-  <string name="repeatables_summary_title">Riepilogo</string>
-  <string name="repeatables_title">Si ripete</string>
-  <string name="repeatables_on_title">Ripeti di</string>
-  <string name="repeatables_frequency_daily">Quotidianamente</string>
+    <string name="attributes">Attributi</string>
+    <string name="repeatables_frequency_daily">Quotidianamente</string>
   <string name="repeatables_frequency_weekly">Settimanalmente</string>
   <string name="repeatables_frequency_monthly">Mensilmente</string>
   <string name="repeatables_frequency_yearly">Annualmente</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">Hai finito i punti salute!</string>
   <string name="faint_button">Ripristina Salute &amp; Riprova</string>
   <string name="filter">Filtro</string>
-  <string name="profile_image">Immagine profilo</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Hai usato %1$s per %2$d mana.</string>
-  <string name="used_skill_without_mana">Hai usato %1$s.</string>
+    <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 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>
-  <string name="flag_confirm">Segnala messaggio</string>
-  <string name="unlock_lvl_11">Sblocca al liv. 11</string>
-  <string name="no_party_message">Non sei in una squadra. Per unirti ad una squadra, per favore visita il sito web di Habitica.</string>
-  <string name="forgot_pw_btn">Password dimenticata</string>
-  <string name="tavern.inn.checkOut">Riattiva le tue Daily</string>
-  <string name="tavern.inn.rest">Sospendi le tue Daily</string>
-  <string name="reward.dialog.buy">Compra</string>
-  <string name="reward.dialog.dismiss">Annulla</string>
+    <string name="reminder_title">Ricorda di completare le tue attività</string>
+    <string name="unlock_lvl_11">Sblocca al liv. 11</string>
+    <string name="forgot_pw_btn">Password dimenticata</string>
+  <string name="tavern.inn_checkOut">Riattiva le tue Daily</string>
+  <string name="tavern.inn_rest">Sospendi le tue Daily</string>
+  <string name="reward.dialog_buy">Compra</string>
+  <string name="reward.dialog_dismiss">Annulla</string>
   <string name="party">Squadra</string>
   <string name="chat">Chat</string>
   <string name="members">Membri</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Daily</string>
   <string name="todos">To-do</string>
   <string name="rewards">Ricompense</string>
-  <string name="taskform.delete.title">Sei sicuro/a?</string>
-  <string name="taskform.delete.message">Vuoi davvero eliminare?</string>
-  <string name="yes">Sì</string>
+    <string name="yes">Sì</string>
   <string name="no">No</string>
   <string name="quest">Missione</string>
   <string name="avatar_body">Corpo</string>
   <string name="avatar_hair">Capelli</string>
   <string name="avatar_shirt">Maglia</string>
   <string name="avatar_skin">Pelle</string>
-  <string name="avatar_ears">Orecchie animali</string>
-  <string name="avatar_base">Base</string>
+    <string name="avatar_base">Base</string>
   <string name="avatar_color">Colore</string>
   <string name="avatar_beard">Barba</string>
   <string name="avatar_mustache">Baffi</string>
   <string name="avatar_flower">Fiore</string>
   <string name="avatar_bangs">Frangia</string>
-  <string name="avatar_nothing">Niente impostato</string>
-  <string name="avatar_size">Corporatura</string>
+    <string name="avatar_size">Corporatura</string>
   <string name="avatar_size_slim">Snello</string>
   <string name="avatar_size_broad">Robusto</string>
   <string name="avatar_background">Sfondo</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Compra</string>
   <string name="purchase_set_title">Compra set  %s</string>
   <string name="due_date">Data di scadenza</string>
-  <string name="quest.accept">Accetta</string>
-  <string name="quest.reject">Rifiuta</string>
-  <string name="quest.begin">Inizia missione</string>
-  <string name="quest.cancel">Annulla invito</string>
-  <string name="quest.abort">Annulla missione</string>
-  <string name="quest.leave">Abbandona Missione</string>
-  <string name="quest.pending">In attesa</string>
-  <string name="quest.accepted">Accettata</string>
-  <string name="quest.rejected">Rifiutata</string>
-  <string name="quest.participants">Partecipanti</string>
-  <string name="version_info">Versione %1$s (%2$d)</string>
+  <string name="quest_accept">Accetta</string>
+  <string name="quest_reject">Rifiuta</string>
+  <string name="quest_begin">Inizia missione</string>
+  <string name="quest_cancel">Annulla invito</string>
+  <string name="quest_abort">Annulla missione</string>
+    <string name="version_info">Versione %1$s (%2$d)</string>
   <string name="sidebar_help">Aiuto &amp; FAQ</string>
   <string name="complete_tutorial">Capito!</string>
   <string name="dismiss_tutorial">Ricordamelo ancora</string>
   <string name="intro_1_subtitle">Benvenuto in</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">È il momento di divertirsi raggiungendo i propri obiettivi. Unisciti ad oltre %s altre persone che migliorano la propria vita un\'attività alla volta.</string>
+    <string name="intro_1_description">È il momento di divertirsi raggiungendo i propri obiettivi. Unisciti ad oltre %s altre persone che migliorano la propria vita un\'attività alla volta.</string>
   <string name="intro_2_subtitle">Progressi nel gioco</string>
   <string name="intro_2_title">Progressi nella vita</string>
   <string name="intro_2_description">Sblocca nuovi elementi nel gioco portando a termine gli impegni della vita reale. Ottieni armature, animali e altro come ricompensa per aver raggiunto i tuoi obiettivi.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Sii Social</string>
   <string name="intro_3_description">Tieni traccia dei tuoi obiettivi con l\'aiuto dei tuoi amici. Supportatevi a vicenda nella vita e nelle battaglie per migliorare insieme!</string>
   <string name="intro_finish_button">Iniziamo!</string>
-  <string name="previous_button">Indietro</string>
-  <string name="next_button">Avanti</string>
+    <string name="next_button">Avanti</string>
   <string name="skip_button">Salta</string>
-  <string name="setup_welcome_description">Benvenuto in Habitica, dove progredire nel gioco migliorerà la tua vita! Man mano che raggiungerai obiettivi nella vita reale, sbloccherai equipaggiamento, animali, missioni e altro.</string>
-  <string name="setup_welcome_title">Benvenuto</string>
-  <string name="avatar_setup_description">Quindi, che aspetto ti piacerebbe avere? Non preoccuparti, lo potrai cambiare in seguito.</string>
+    <string name="avatar_setup_description">Quindi, che aspetto ti piacerebbe avere? Non preoccuparti, lo potrai cambiare in seguito.</string>
   <string name="task_setup_description">Splendido! Ora dimmi, su cosa vorresti lavorare durante questo viaggio?</string>
   <string name="setup_group_work">Lavoro</string>
   <string name="setup_group_exercise">Esercizio fisico</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Studia un artista</string>
   <string name="setup_task_creativity_2">Lavora su un progetto creativo</string>
   <string name="setup_task_creativity_3">Completa un progetto creativo</string>
-  <string name="gem.purchase.support">Vuoi aiutare a tenere Habitica attivo? Puoi sostenere gli sviluppatori comprando delle gemme!\n\nLe gemme ti permettono di comprare dei simpatici extra per il tuo account, inclusi: \n\n - Originali costumi per il tuo avatar\n - Sfondi magnifici\n - Divertenti missioni che ti premiano con uova di animali\n - La possibilità di cambiare classe prima del livello 10\n\nGrazie infinite per aiutarci a rendere Habitica sempre migliore. Il tuo supporto significa molto per noi!</string>
-  <string name="my_guilds">Le mie Gilde</string>
+    <string name="my_guilds">Le mie Gilde</string>
   <string name="public_guilds">Gilde pubbliche</string>
   <string name="guild">Gilda</string>
   <string name="leave">Abbandona</string>
   <string name="join">Partecipa</string>
-  <string name="leader">Leader</string>
-  <string name="gems">Gemme</string>
-  <string name="copy_as_todo">Copia come To-Do</string>
-  <string name="send_pm">Invia messaggio privato</string>
-  <string name="flag">Segnala</string>
-  <string name="delete">Elimina</string>
+    <string name="gems">Gemme</string>
+    <string name="delete">Elimina</string>
   <string name="name">Nome</string>
   <string name="description">Descrizione</string>
   <string name="add_tag">Aggiungi una nuova etichetta</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Scrivi messaggio</string>
-  <string name="post">Invia</string>
-  <string name="guild_search_hint">Cerca gilde</string>
-  <string name="todo_due">Scade: %s</string>
-  <string name="daily_streak">serie: %d</string>
-  <string name="todo_has_duedate">L\' attività ha una scadenza</string>
-  <string name="battle_gear">Assetto da battaglia</string>
+    <string name="guild_search_hint">Cerca gilde</string>
+    <string name="battle_gear">Assetto da battaglia</string>
   <string name="costume">Costume</string>
   <string name="outfit_head">Testa</string>
   <string name="outfit_headAccessory">Accessorio da testa</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Indossa Costume</string>
   <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_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="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="ago_1day">1 giorno fa</string>
   <string name="ago_days">%d giorni fa</string>
   <string name="ago_1Minute">1 min. fa</string>
   <string name="ago_minutes">%d min. fa</string>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">Hai trovato dell\'equipaggiamento raro nello Scrigno Incantato: %s! Fantastico!</string>
   <string name="armoireFood">Frughi nello Scrigno e trovi %1$s %2$s. Cosa ci fa qui dentro?</string>
   <string name="armoireExp">Fai a botte con lo Scrigno e ottieni Esperienza. Prendi questo!</string>
-  <string name="armoireNotesFull">Apri lo Scrigno Incantato per ricevere casualmente Equipaggiamento speciale, Esperienza o cibo! Oggetti rimanenti: %d</string>
-  <string name="armoireLastItem">Hai trovato l\'ultimo oggetto raro disponibile nello Scrigno Incantato.</string>
-  <string name="armoireNotesEmpty">Nello Scrigno Incantato compariranno nuovi oggetti la prima settimana di ogni mese. Fino ad allora, continua a cliccare sullo Scrigno per ottenere Esperienza e Cibo!</string>
-  <string name="sell">Vendi (%d Oro)</string>
+    <string name="sell">Vendi (%d Oro)</string>
   <string name="hatch_with_potion">Schiudi con pozione</string>
-  <string name="feed_to_pet">Dai ad animale</string>
-  <string name="hatch_egg">Schiudi con uovo</string>
+    <string name="hatch_egg">Schiudi con uovo</string>
   <string name="invite_party">Invita squadra</string>
   <string name="dialog_feeding">Dai da mangiare a %s:</string>
   <string name="use_animal">Usa</string>
@@ -305,8 +237,7 @@
   <string name="close">Chiudi</string>
   <string name="share">Condividi</string>
   <string name="notification_pet_fed">Hai dato da mangiare al tuo %s!</string>
-  <string name="notification_purchase">Hai comprato %s</string>
-  <string name="notification_purchase_reward">Hai comprato una ricompensa</string>
+    <string name="notification_purchase_reward">Hai comprato una ricompensa</string>
   <string name="world_quest">World Quest</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
@@ -327,8 +258,7 @@
 Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno sempre modo di recuperare Vita dagli sbagli. Gioca come Guaritore se vuoi aiutare gli altri giocatori della tua squadra, o se l\'idea di fregare la morte con il duro lavoro ti ispira!</string>
   <string name="select_class">Seleziona classe</string>
   <string name="opt_out_class">Rinuncia</string>
-  <string name="opt_out_description">Non ti vuoi preoccupare dellle classi? Vuoi scegliere dopo? Puoi essere un guerriero senza abilità speciali. Puoi leggere a proposito del sistema di classi più tardi nella Wiki ed abilitare le classi quando vuoi.</string>
-  <string name="class_confirmation">Vuoi davvero essere un %s?</string>
+    <string name="class_confirmation">Vuoi davvero essere un %s?</string>
   <string name="class_changed">Ora sei un %s!</string>
   <string name="class_changed_description">Hai del nuovo equipaggiamento da battaglia che puoi indossare, vai nella sezione Equipaggiamento!</string>
   <string name="choose_class">Scegli classe</string>
@@ -342,23 +272,18 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="invite_existing_users">Invita utenti esistenti</string>
   <string name="send">Invia</string>
   <string name="invite">Invita amici</string>
-  <string name="invite_id_description">Se hai degli amici che già usano Habitica, invitali inserendo qui il loro ID Utente.</string>
-  <string name="invite_username_description">Se i tuoi amici usano già Habitica, invitali qui usando il loro nome utente.</string>
+    <string name="invite_username_description">Se i tuoi amici usano già Habitica, invitali qui usando il loro nome utente.</string>
   <string name="invite_email_description">Se un amico/a si unisce ad Habitica attraverso la tua e-mail, verrà automaticamente invitato/a nella tua squadra!</string>
   <string name="add_invites">Aggiungi inviti</string>
-  <string name="user_id">ID Utente</string>
-  <string name="email">E-mail</string>
-  <string name="invite_users">Invita nella squadra</string>
-  <string name="share_using">Condividi con</string>
+    <string name="email">E-mail</string>
+    <string name="share_using">Condividi con</string>
   <string name="share_levelup">Ho raggiunto il livello %d su Habitica migliorando le mie abitudini nella vita reale!</string>
   <string name="share_hatched">Ho appena schiuso un %1$s %2$s in Habitica completando le mie attività nella vita reale!</string>
   <string name="share_raised">Ho appena ottenuto un %1$s in Habitica completando le mie attività nella vita reale!</string>
   <string name="open_in_store">Apri nel Play Store</string>
   <string name="change_class_confirmation">Vuoi davvero cambiare la tua classe? Costerà 3 gemme.</string>
   <string name="change_class_equipment_warning">Attenzione: non potrai più comprare equipaggiamento per la classe %s.</string>
-  <string name="leaderMessage">Messaggio da %1$s</string>
-  <string name="leaderName">Leader: %1$s</string>
-  <string name="confirm">Conferma</string>
+    <string name="confirm">Conferma</string>
   <string name="market">Mercato</string>
   <string name="timeTravelers">Viaggiatori del Tempo</string>
   <string name="seasonalShop">Negozio Stagionale</string>
@@ -366,37 +291,16 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <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>
-  <string name="purchase_confirmation_title">Conferma acquisto</string>
-  <string name="confirm_purchase_text">Compra %1$s per %2$s %3$s</string>
-  <string name="gem">gemma</string>
-  <string name="hourglass">clessidra</string>
-  <string name="hourglasses">clessidre</string>
-  <string name="gold_singular">oro</string>
-  <string name="gold_plural">oro</string>
+    <string name="successful_purchase">Acquistato %1$s</string>
+    <string name="gold_plural">oro</string>
   <string name="chat_message_copied">Messaggio copiato negli Appunti</string>
-  <string name="copy_chat_message">Copia testo</string>
-  <string name="edit_tag_title">Modifica etichetta</string>
-  <string name="edit_tag_btn_edit">Modifica</string>
-  <string name="edit_tag_btn_done">Fatto</string>
-  <string name="edit_tag_btn_delete">Elimina</string>
-  <string name="confirm_delete_tag_title">Sei sicuro?</string>
+    <string name="edit_tag_btn_edit">Modifica</string>
+    <string name="confirm_delete_tag_title">Sei sicuro?</string>
   <string name="confirm_delete_tag_message">Vuoi davvero eliminare?</string>
-  <string name="filter_drawer_edit_tags">Modifica etichette</string>
-  <string name="filter_drawer_filter_tags">Filtra per etichette</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Fatti invitare da qualcuno con questo codice QR</string>
-  <string name="qr_save_message">Codice QR salvato in</string>
-  <string name="qr_dialogue_title">Il tuo codice QR</string>
-  <string name="download">Scarica</string>
-  <string name="send_new_message">Invia nuovo messaggio</string>
-  <string name="choose_recipient_title">Scegli destinatario messaggio</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Scegli destinatario messaggio</string>
   <string name="action_continue">Continua</string>
-  <string name="scan_qr_code">Rileva codice QR</string>
-  <string name="enter_recipient_uuid">Inserisci ID Utente destinatario</string>
-  <string name="invited_to_party">Hai ricevuto un invito per unirti a una squadra!</string>
+    <string name="invited_to_party">Hai ricevuto un invito per unirti a una squadra!</string>
   <string name="stats_widget_label">Statistiche Habitica</string>
   <string name="add_task">Aggiungi Attività</string>
   <string name="add_habit">Aggiungi Abitudine</string>
@@ -407,15 +311,14 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="widget_habit_button">Habitica esegui Abitudine</string>
   <string name="widget_dailies">Habitica Daily</string>
   <string name="widget_todo_list">Habitica lista To-Do</string>
-  <string name="widget_add_task">Habitica aggiungi attività</string>
-  <string name="google_services_missing">Impossibile trovare Google Play Services.</string>
-  <string name="gem.purchase.toolbartitle">Compra</string>
-  <string name="gem.purchase.title">Comprando gemme supporti gli sviluppatori e tieni in vita Habitica</string>
-  <string name="gem.purchase.subtitle">Le Gemme ti permettono di ottenere simpatici extra per il tuo account, tra cui:</string>
-  <string name="gem.purchase.listitem1">Costumi per il tuo avatar</string>
-  <string name="gem.purchase.listitem2">Magnifici sfondi</string>
-  <string name="gem.purchase.listitem3">Missioni che ti premiano con uova di animali</string>
-  <string name="gem.purchase.listitem4">La possibilità di cambiare classe prima del livello 100</string>
+    <string name="google_services_missing">Impossibile trovare Google Play Services.</string>
+  <string name="gem.purchase_toolbartitle">Compra</string>
+  <string name="gem.purchase_title">Comprando gemme supporti gli sviluppatori e tieni in vita Habitica</string>
+  <string name="gem.purchase_subtitle">Le Gemme ti permettono di ottenere simpatici extra per il tuo account, tra cui:</string>
+  <string name="gem.purchase_listitem1">Costumi per il tuo avatar</string>
+  <string name="gem.purchase_listitem2">Magnifici sfondi</string>
+  <string name="gem.purchase_listitem3">Missioni che ti premiano con uova di animali</string>
+  <string name="gem.purchase_listitem4">La possibilità di cambiare classe prima del livello 100</string>
   <string name="support_habitica">Supporta Habitica</string>
   <string name="skill_transformation_use">usa</string>
   <string name="hatching_market_info">Non trovi i drop giusti? Dai un\'occhiata al Mercato!</string>
@@ -429,32 +332,32 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="belongs_to_challenge">Appartiene alla Sfida</string>
   <string name="has_reminder">Ha promemoria</string>
   <string name="has_tag">Ha etichetta</string>
-  <string name="subscribe.title">Gli abbonamenti aiutano a supportare gli sviluppatori e a tenere Habitica in vita </string>
+  <string name="subscribe_title">Gli abbonamenti aiutano a supportare gli sviluppatori e a tenere Habitica in vita </string>
   <string name="subscribe_prompt">Abbonati per ottenere questi utili benefici:</string>
-  <string name="subscribe.listitem1">Compra gemme con l\'oro</string>
-  <string name="subscribe.listitem2">Oggetti mensili esclusivi</string>
-  <string name="subscribe.listitem3">Più elementi nella cronologia attività</string>
-  <string name="subscribe.listitem4">Limite di drop giornaliero raddoppiato</string>
+  <string name="subscribe_listitem1">Compra gemme con l\'oro</string>
+  <string name="subscribe_listitem2">Oggetti mensili esclusivi</string>
+  <string name="subscribe_listitem3">Più elementi nella cronologia attività</string>
+  <string name="subscribe_listitem4">Limite di drop giornaliero raddoppiato</string>
   <string name="subscriptions">Abbonamenti</string>
   <string name="subscription_duration">Ricorrente ogni %s</string>
   <string name="subscription_duration_norenew">Per %s</string>
   <string name="subscribe">Abbonati</string>
-  <string name="subscribe.listitem1.description">Ora Alexander il Mercante ti venderà Gemme al prezzo di 20 Oro l\'una!\n\nLe sue consegne mensili sono inizialmente limitate a 25 Gemme al mese, ma possono aumentare a seconda della durata del tuo abbonamento.\n\nIl limite aumenta di 5 Gemme ogni tre mesi di abbonamento consecutivi, fino ad un massimo di 50 Gemme al mese!</string>
-  <string name="subscribe.listitem2.description">Ogni mese riceverai un oggetto davvero unico per il tuo avatar!\n\nIn più, ogni tre mesi di abbonamento consecutivi, i misteriosi Viaggiatori del Tempo ti permetteranno di ottenere oggetti antichi (e futuri!).</string>
-  <string name="subscribe.listitem3.description">Rende le To-Do completate e la cronologia dei progressi delle attività disponibili più a lungo.</string>
-  <string name="subscribe.listitem4.description">Raddoppiare il numero massimo di drop giornalieri ti farà ricevere più oggetti dalle attività completate ogni giorno, aiutandoti a completare la tua scuderia più velocemente!</string>
-  <string name="subscribe1month.gemcap">Limite di 25 Gemme</string>
-  <string name="subscribe3month.gemcap">Limite di 30 Gemme</string>
-  <string name="subscribe6month.gemcap">Limite di 35 Gemme</string>
-  <string name="subscribe12month.gemcap">Limite di 45 Gemme</string>
+  <string name="subscribe.listitem1_description">Ora Alexander il Mercante ti venderà Gemme al prezzo di 20 Oro l\'una!\n\nLe sue consegne mensili sono inizialmente limitate a 25 Gemme al mese, ma possono aumentare a seconda della durata del tuo abbonamento.\n\nIl limite aumenta di 5 Gemme ogni tre mesi di abbonamento consecutivi, fino ad un massimo di 50 Gemme al mese!</string>
+  <string name="subscribe.listitem2_description">Ogni mese riceverai un oggetto davvero unico per il tuo avatar!\n\nIn più, ogni tre mesi di abbonamento consecutivi, i misteriosi Viaggiatori del Tempo ti permetteranno di ottenere oggetti antichi (e futuri!).</string>
+  <string name="subscribe.listitem3_description">Rende le To-Do completate e la cronologia dei progressi delle attività disponibili più a lungo.</string>
+  <string name="subscribe.listitem4_description">Raddoppiare il numero massimo di drop giornalieri ti farà ricevere più oggetti dalle attività completate ogni giorno, aiutandoti a completare la tua scuderia più velocemente!</string>
+  <string name="subscribe1month_gemcap">Limite di 25 Gemme</string>
+  <string name="subscribe3month_gemcap">Limite di 30 Gemme</string>
+  <string name="subscribe6month_gemcap">Limite di 35 Gemme</string>
+  <string name="subscribe12month_gemcap">Limite di 45 Gemme</string>
   <string name="subscription_hourglasses">+%d Clessidra Mistica</string>
   <string name="payment_method">Metodo di pagamento</string>
   <string name="subscription">Abbonamento</string>
   <string name="active">Attivo</string>
   <string name="due">Oggi</string>
   <string name="cancel_subscription">Annulla abbonamento</string>
-  <string name="cancel_subscription_google.description">Vuoi interrompere il tuo abbonamento? Puoi trovare l\'opzione per annullare l\'abbonamento nella sezione \"Le mie app\" nel Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Vuoi interrompere il tuo abbonamento? A causa del tuo metodo di pagamento, puoi completare questa operazione solo attraverso il sito web. Clicca sul bottone qui sotto per aprire il sito nel tuo browser!</string>
+  <string name="cancel_subscription_google_description">Vuoi interrompere il tuo abbonamento? Puoi trovare l\'opzione per annullare l\'abbonamento nella sezione \"Le mie app\" nel Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">Vuoi interrompere il tuo abbonamento? A causa del tuo metodo di pagamento, puoi completare questa operazione solo attraverso il sito web. Clicca sul bottone qui sotto per aprire il sito nel tuo browser!</string>
   <string name="visit_habitica_website">Visita il sito web di Habitica</string>
   <string name="current_bonuses">Bonus attivi</string>
   <string name="months_subscribed">Mesi come abbonato</string>
@@ -469,56 +372,40 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="twelve_months">12 mesi</string>
   <string name="subscribe_prompt_thanks">Come abbonato hai questi utili benefici:</string>
   <string name="subscription_status">Stato abbonamento</string>
-  <string name="byLeader">di %s</string>
-  <string name="challenge_details">Dettagli sfida</string>
-  <string name="challenge_leave_title">Abbandona sfida</string>
+    <string name="challenge_leave_title">Abbandona sfida</string>
   <string name="challenge_leave_text">Vuoi davvero abbandonare la sfida \"%s\"?</string>
   <string name="challenge_remove_tasks_title">Rimuovi attività</string>
   <string name="challenge_remove_tasks_text">Vuoi rimuovere le attività?</string>
   <string name="remove_tasks">Rimuovi</string>
   <string name="keep_tasks">Tieni</string>
   <string name="my_challenges">Le mie sfide</string>
-  <string name="public_challenges">Pubbliche</string>
-  <string name="challenges">Sfide</string>
-  <string name="daily">Daily</string>
+    <string name="daily">Daily</string>
   <string name="habit">Abitudine</string>
   <string name="reward">Ricompensa</string>
   <string name="todo">To-Do</string>
   <string name="official">Ufficiale</string>
-  <string name="participating">Sto partecipando</string>
-  <string name="challenge">Sfida</string>
-  <string name="go_to_challenge">Vai alla Sfida</string>
-  <string name="not_part_of_a_challenge">Al momento non stai partecipando a nessuna sfida!</string>
+    <string name="challenge">Sfida</string>
+    <string name="not_part_of_a_challenge">Al momento non stai partecipando a nessuna sfida!</string>
   <string name="join_a_challenge">Partecipa ad una sfida per aggiungere delle attività specifiche alla tua lista, poi competi contro altri utenti di Habitica per vincere Medaglie o addirittura delle Gemme!</string>
   <string name="check_the_public_challenge_tab">Vai nella sezione “Pubbliche” per trovare le sfide create dagli utenti più adatte a te!</string>
-  <string name="add_reminder">Aggiungi promemoria</string>
-  <string name="warning">Attenzione</string>
-  <string name="open_settings">Apri impostazioni</string>
-  <string name="dont_keep_activities_warning">Pare che tu abbia l\'opzione sviluppatore \\"Non conservare attività\\" abilitata. Al momento questa opzione causa dei problemi all\'app di Habitica, quindi consigliamo di disabilitarla.</string>
-  <string name="inbox">Messaggi</string>
-  <string name="FAQ">Domande frequenti</string>
-  <string name="special">Speciale</string>
+    <string name="inbox">Messaggi</string>
+    <string name="special">Speciale</string>
   <string name="gem_for_gold_description">Grazie al tuo abbonamento ad Habitica, ogni mese puoi comprare delle Gemme usando il tuo Oro.</string>
-  <string name="limited_count">%d rimaste</string>
-  <string name="gem_shop">Gemma</string>
+    <string name="gem_shop">Gemma</string>
   <string name="mystery_item">Oggetto Misterioso</string>
   <string name="myster_item_notes">Ogni mese, gli abbonati ricevono un oggetto misterioso. Questo oggetto in genere viene rilasciato circa una settimana prima della fine del mese.</string>
   <string name="open">Apri</string>
-  <string name="notification_mystery_item">Apri il pacco e trovi %s!</string>
-  <string name="checkInRewardEarned">Hai meritato %1$s come premio per la tua costanza nel migliorare la tua vita.</string>
+    <string name="checkInRewardEarned">Hai meritato %1$s come premio per la tua costanza nel migliorare la tua vita.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Il prossimo premio verrà sbloccato a %1$d accessi</string>
   <string name="pending_approval">in attesa di approvazione</string>
   <string name="filters">Filtri</string>
   <string name="done">Fatto</string>
-  <string name="group_tasks_edit_description">Le attività di gruppo non possono essere modificate.</string>
-  <string name="group_tasks_edit_title">Non puoi modificare questa attività</string>
-  <string name="groups">Gruppi</string>
+    <string name="groups">Gruppi</string>
   <string name="all">Tutto</string>
   <string name="none">Nessuno</string>
   <string name="owned">Posseduto</string>
   <string name="not_owned">Non posseduto</string>
-  <string name="new_game">Nuovo\nGioco</string>
-  <string name="login_btn_fb">Accedi con Facebook</string>
+    <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 qui. Sono Justin, sarò la tua guida in Habitica.\n\nInnanzi tutto, come vorresti chiamarti? Non esitare a cambiare quello che ho selezionato per te. Quando sei pronto, crea il tuo avatar!</string>
@@ -550,7 +437,6 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="reload_content">Ricarica contenuti</string>
   <string name="dailyDueDefaultView">Visualizza lista Daily incomplete di default</string>
   <string name="dailyDueDefaultViewDescription">Con questa opzione selezionata, le Daily mostrate saranno quelle della lista \'incomplete\' invece che \'tutte\'.</string>
-  <string name="repeat_summary">Ripeti %1$s ogni %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Il tuo dispositivo non dispone di alcuno dei metodi di pagamento supportati. Per favore usa il sito web di Habitica se vuoi acquistare delle Gemme.</string>
   <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>
@@ -558,8 +444,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <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</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_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 un nome breve</string>
   <string name="challenge_create_error_tag">Hai bisogno di un nome breve per creare questa Sfida.</string>
@@ -569,42 +454,36 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="new_challenge_title">Titolo della nuova sfida</string>
   <string name="ownership">Proprietà</string>
   <string name="inn">Locanda</string>
-  <string name="system">Sistema</string>
-  <string name="start_quest">Comincia una nuova Missione</string>
+    <string name="start_quest">Comincia una nuova Missione</string>
   <string name="leave_party">Abbandona squadra</string>
   <string name="party_description">Descrizione squadra</string>
-  <string name="abort_confirmation">Vuoi davvero annullare questa missione? Verrà annullata per tutti i membri della tua squadra e tutti i progressi nella missione saranno persi. La Pergamena tornerà al proprietario della missione.</string>
-  <string name="leave_quest_confirmation">Vuoi davvero abbandonare la missione corrente? Tutti i tuoi progressi nella missione saranno persi.</string>
-  <string name="number_participants">%1$d Partecipanti</string>
+    <string name="number_participants">%1$d Partecipanti</string>
   <string name="welcome_back">Bentornato</string>
   <string name="yesterdaililes_prompt">Hai completato qualcuna di queste Daily ieri?</string>
   <string name="start_day">Inizia la mia giornata</string>
   <string name="leave_party_confirmation">Vuoi davvero lasciare la Squadra?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Prossimo premio tra %d accessi</string>
-  <string name="pending">In attesa</string>
+    <string name="pending">In attesa</string>
   <string name="accepted">Accettato</string>
   <string name="declined">Rifiutato</string>
   <string name="participants">Partecipanti</string>
   <string name="invitations">Inviti</string>
-  <string name="quest_leader_header" formatted="false">Avviata da %s</string>
+  <string name="quest_leader_header">Avviata da %s</string>
   <string name="quest_abort_message">Vuoi davvero annullare questa missione? Verrà annullata per tutti i membri della tua squadra e tutti i progressi nella missione saranno persi. La Pergamena tornerà al proprietario della missione.</string>
-  <string name="loading">Caricamento...</string>
-  <string name="reloading_content">Ricaricamento contenuti</string>
+    <string name="reloading_content">Ricaricamento contenuti</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">mln</string>
   <string name="billion_abbrev">mld</string>
-  <string name="your_balance">Il tuo bilancio:</string>
-  <string name="available_until" formatted="false">Disponibile fino al %s</string>
-  <string name="gems_left_max" formatted="false">Gemme mensili: %1$d/%2$d rimanenti</string>
-  <string name="gems_left_nomax" formatted="false">Gemme mensili: %d rimanenti</string>
+    <string name="available_until">Disponibile fino al %s</string>
+  <string name="gems_left_max">Gemme mensili: %1$d/%2$d rimanenti</string>
+  <string name="gems_left_nomax">Gemme mensili: %d rimanenti</string>
   <string name="health">Salute</string>
   <string name="collect">Raccogli</string>
   <string name="rage_meter">Indicatore Furia</string>
   <string name="boss_quest">Missione Boss</string>
   <string name="collection_quest">Missione Raccolta</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Punti esperienza</string>
-  <string name="gold_reward" formatted="false">%d Oro</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Punti esperienza</string>
+  <string name="gold_reward">%d Oro</string>
   <string name="quest_owner_rewards">Premi proprietario missione</string>
   <string name="str_abbrv">FOR</string>
   <string name="per_abbrv">PER</string>
@@ -617,8 +496,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="reset_account_confirmation">resetta il mio account</string>
   <string name="delete_account_confirmation">elimina il mio account</string>
   <string name="danger_zone">Zona pericolosa</string>
-  <string name="nevermind">Ho cambiato idea</string>
-  <string name="resetting_account">Resettando l\'account</string>
+    <string name="resetting_account">Resettando l\'account</string>
   <string name="deleting_account">Cancellazione account</string>
   <string name="insufficientGold">Hai bisogno di completare più attività per comprare questo oggetto!</string>
   <string name="insufficientGems">Ti servono più Gemme per comprare questo oggetto!</string>
@@ -651,8 +529,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <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_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>
@@ -673,7 +550,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="distribute_class">Distribuzione basata sulla Classe</string>
   <string name="distribute_task">Distribuzione basata sulle attività</string>
   <string name="no_points_to_allocate">Nessun punto da allocare</string>
-  <string name="points_to_allocate" formatted="false">%d punti da allocare</string>
+  <string name="points_to_allocate">%d punti da allocare</string>
   <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>
@@ -683,9 +560,7 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <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="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>
@@ -699,19 +574,13 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <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="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_description">Questo colpo furioso non è ancora successo!\nIl Boss Globale si scaglierà contro uno dei negozianti appena la sua barra della Furia traboccherà. Concentrati sulle tue Daily per cercare di impedirgli di attaccare!</string>
-  <string name="pending_strike_title">Serie in attesa</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_description_description">Questo indicatore si riempie mano a mano che gli abitanti di Habitica non completano le loro Daily. Se trabocca, il DysHeartener attaccherà uno dei negozianti di Habitica, quindi stai attento e completa le tue attività!</string>
-  <string name="pending_strike_subtitle">Questo colpo furioso non è ancora successo!</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="strike_active_title">%s è stato attaccato!</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>
@@ -721,29 +590,21 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <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_description">Dai a un membro squadra il nome utente che troverai sotto e potranno mandarti un invito.</string>
-  <string name="join_party_description_id">Dagli il tuo ID Utente o fagli scannerizzare il tuo QR code durante l\'invito.</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="join_party_title">Vuoi unirti ad una squadra?</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="world_boss_description_title">Cos\'è un Boss Mondiale?</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="world_boss_action_prompt">Sconfiggi il Boss per ottenere delle ricompense speciali e salvare Habitica dal terrore di %s!</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="reply">Rispondi</string>
   <string name="challenge_prize">Premio Sfida</string>
   <string name="challenge_categories">Categorie Sfida</string>
   <string name="created_challenge">Sfida creata</string>
@@ -777,17 +638,15 @@ Le Dailies mancate e le cattive Abitudini non li danneggiano molto, e hanno semp
   <string name="two_handed">Due mani</string>
   <string name="usernamePromptTitle">È giunta l\'ora di scegliere il tuo nome utente!</string>
   <string name="usernamePromptBody">I login sono nuovi, unici nomi utente, che appariranno accanto al tuo nome pubblico e che verranno usati per gli inviti, i @richiami nel chat, e i messaggi.</string>
-  <string name="usernamePromptWiki">Per più ampie informazioni su questo cambiamento, <a href="https://habitica.wikia.com/wiki/Player_Names">visita il wiki.</a></string>
-  <string name="confirmUsername">Conferma nome utente</string>
-  <string name="usernamePromptDisclaimer">I nomi utente devono rispettare i nostri <a href="https://habitica.com/static/terms">Termini di servizio</a> e le <a href="https://habitica.com/static/community-guidelines">Linee guida Comunitarie</a>. Se non hai ancora fissato il tuo login, il tuo nome utente è stato generato automaticamente.</string>
+  <string name="usernamePromptWiki">Per più ampie informazioni su questo cambiamento, <a href="https://habitica.wikia_com/wiki/Player_Names">visita il wiki.</a></string>
+    <string name="usernamePromptDisclaimer">I nomi utente devono rispettare i nostri <a href="https://habitica.com/static/terms">Termini di servizio</a> e le <a href="https://habitica_com/static/community-guidelines">Linee guida Comunitarie</a>. Se non hai ancora fissato il tuo login, il tuo nome utente è stato generato automaticamente.</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_level">\@%s ・Lvl %d</string>
-  <string name="enter_recipient_username">Inserisci @username del Destinatario</string>
+    <string name="enter_recipient_username">Inserisci @username del Destinatario</string>
   <string name="username_copied">Nome Utente copiato negli appunti</string>
   <string name="verification_pet">Uno di questi Animali Veterani ti aspetterà dopo che avrai confermato!</string>
   <string name="welcomeNameTitle">Come dovremmo chiamarti?</string>
diff --git a/Habitica/res/values-iw/strings.sidebar.xml b/Habitica/res/values-iw/strings.sidebar.xml
index badfe20f3..0ba5d3caf 100644
--- a/Habitica/res/values-iw/strings.sidebar.xml
+++ b/Habitica/res/values-iw/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">משימות</string>
-  <string name="sidebar.skills">מיומניויות</string>
-  <string name="sidebar.section.social">חברתי</string>
-  <string name="sidebar.tavern">פונדק</string>
-  <string name="sidebar.party">חבורה</string>
-  <string name="sidebar.purchaseGems">קנה אבני חן</string>
-  <string name="sidebar.guilds">גילדות</string>
-  <string name="sidebar.challenges">אתגרים</string>
-  <string name="sidebar.section.inventory">מלאי ציוד</string>
-  <string name="sidebar.avatar">דמות</string>
-  <string name="sidebar.equipment">ציוד</string>
-  <string name="sidebar.stable">אורווה</string>
-  <string name="sidebar.news">חדשות</string>
-  <string name="sidebar.settings">הגדרות</string>
-  <string name="sidebar.about">אודות</string>
+  <string name="sidebar_tasks">משימות</string>
+  <string name="sidebar_skills">מיומניויות</string>
+  <string name="sidebar.section_social">חברתי</string>
+  <string name="sidebar_tavern">פונדק</string>
+  <string name="sidebar_party">חבורה</string>
+  <string name="sidebar_purchaseGems">קנה אבני חן</string>
+  <string name="sidebar_guilds">גילדות</string>
+  <string name="sidebar_challenges">אתגרים</string>
+  <string name="sidebar.section_inventory">מלאי ציוד</string>
+  <string name="sidebar_avatar">דמות</string>
+  <string name="sidebar_equipment">ציוד</string>
+  <string name="sidebar_stable">אורווה</string>
+  <string name="sidebar_news">חדשות</string>
+    <string name="sidebar_about">אודות</string>
   <string name="sidebar_shops">חנויות</string>
-<string name="sidebar.inbox">הודעות</string>
+<string name="sidebar_inbox">הודעות</string>
     <string name="sidebar_stats">נתונים סטטיסטיים</string>
 </resources>
diff --git a/Habitica/res/values-iw/strings.tutorial.xml b/Habitica/res/values-iw/strings.tutorial.xml
index 2b2403403..2c2c1c5d7 100644
--- a/Habitica/res/values-iw/strings.tutorial.xml
+++ b/Habitica/res/values-iw/strings.tutorial.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_equipment">כאשר אתם קונים ציוד הוא מופיע כאן. ציוד הקרב שלכם משפיע על תכונות, והתחפושת שלכם (אם מאופשרת) משפיעה על הלבוש של הדמות שלכם.</string>
-  <string name="tutorial_items">הרוויחו חפצים על-ידי השלמת משימות ועלייה בדרגות. לחצו על חפץ כדי להשתמש בו!</string>
-  <string name="tutorial_pets">בזמן שאתם משלימים משימות בעולם האמיתי, יש לכם סיכוי למצוא ביצים ושיקויים. שלבו אותם כדי להבקיע חיות מחמד</string>
-  <string name="tutorial_skills">מיומנויות הן יכולות מיוחדות בעלות השפעה עוצמתית! לחצו על מיומנות כדי להשתמש בה. היא תעלה לכם מאנה (המד הכחול), שתרוויחו על ידי סימון משימות מידי יום ועל ידי השלמת משימות בחיים האמיתיים. בידקו את השאלות הנפוצות בתפריט למידע נוסף!</string>
+    <string name="tutorial_skills">מיומנויות הן יכולות מיוחדות בעלות השפעה עוצמתית! לחצו על מיומנות כדי להשתמש בה. היא תעלה לכם מאנה (המד הכחול), שתרוויחו על ידי סימון משימות מידי יום ועל ידי השלמת משימות בחיים האמיתיים. בידקו את השאלות הנפוצות בתפריט למידע נוסף!</string>
   <string name="tutorial_party">זה המקום בו אתם וחבריכם יכולים לישמור על עצמכם מחוייבים למטרות ולהלחם במפלצות עם המשימות שלכם!</string>
   <string name="tutorial_tavern">ברוכים הבאים לפונדק, צ׳אט פומבי לכל הגילאים! כאן תוכלו לדבר על פרודוקטיביות ולשאול שאלות. תהנו!</string>
-  <string name="tutorial_classes">ביחרו להיות לוחמים, מכשפים, מרפאים או נוכלים! לכל מקצוע ציוד ומיומנויות משלו. לחצו על ה (?) כדי ללמוד עוד!</string>
 </resources>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index 608cb211b..27ee41930 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -4,17 +4,14 @@
   <string name="XP_default">ניסיון</string>
   <string name="HP_default">בריאות</string>
   <string name="MP_default">מאנה</string>
-  <string name="ERR_pb_barcode">העדפות לא הצליחו להטען מהבר-קוד</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">הגדרות</string>
-  <string name="SP_address_hint">שרת מותאם אישית אליכם</string>
-  <string name="SP_userID_title">מזהה משתמש</string>
+    <string name="SP_userID_title">מזהה משתמש</string>
   <string name="SP_userID_summary">מזהה המשתמש שלכם</string>
   <string name="SP_APIToken_title">מפתח API</string>
   <string name="SP_APIToken_summary">מפתח ה API שלכם</string>
   <string name="Language_title">שפה</string>
-  <string name="SP_user_qr_code">קוד ה QR שלכם</string>
-  <string name="PS_contact_title">צרו איתי קשר</string>
+    <string name="PS_contact_title">צרו איתי קשר</string>
   <string name="pref_account_header">חשבון</string>
   <string name="pref_first_day_of_the_week_title">היום הראשון בשבוע</string>
   <string name="pref_reminder_header">תזכורת יומית</string>
@@ -30,10 +27,8 @@
   <string name="preference_push_your_quest_has_begun">ההרפתקה שלכם החלה</string>
   <string name="preference_push_invited_to_quest">הוזמנו להרפתקה</string>
   <!--Adding tasks-->
-  <string name="task_value">ערך</string>
-  <string name="action_edit">עריכה</string>
-  <string name="action_delete">מחיקה</string>
-  <string name="action_cancel">ביטול</string>
+    <string name="action_edit">עריכה</string>
+    <string name="action_cancel">ביטול</string>
   <string name="login_btn">התחברות</string>
   <string name="register_btn">הרשמו</string>
   <string name="username">שם משתמש</string>
@@ -43,31 +38,23 @@
   <string name="confirmpassword">אמתו סיסמה</string>
   <string name="logout">התנתקות</string>
   <string name="logout_description">התנתקו מהחשבון שלכם</string>
-  <string name="account_details">פרטי חשבון</string>
-  <string name="LoginActivityName">ברוכים הבאים</string>
-  <string name="string_revive">קומו לתחייה</string>
-  <string name="please_connect">אנא התחברו דרך האפליקציה לפני שאתם משתמשים בוויג׳ט</string>
-  <string name="about.title">אודות</string>
-  <string name="about.libraries">ספריות</string>
-  <string name="about.versionhistory">היסטוריית גרסאות</string>
-  <string name="about.habitica_open_source">האביטיקה זמינה כתוכנה במקור פתוח בגיטהאב</string>
-  <string name="about.rate_our_app">דרגו את האפליקציה שלנו</string>
-  <string name="about.give_us_feedback">שלחו לנו משוב!</string>
-  <string name="about.bugreport">דווחו על תקלה</string>
-  <string name="about.source_code">קוד מקור</string>
+    <string name="LoginActivityName">ברוכים הבאים</string>
+    <string name="about_title">אודות</string>
+  <string name="about_libraries">ספריות</string>
+    <string name="about_habitica_open_source">האביטיקה זמינה כתוכנה במקור פתוח בגיטהאב</string>
+  <string name="about_rate_our_app">דרגו את האפליקציה שלנו</string>
+  <string name="about_give_us_feedback">שלחו לנו משוב!</string>
+  <string name="about_bugreport">דווחו על תקלה</string>
+  <string name="about_source_code">קוד מקור</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="internal_error_api">נראה שיש בעיה עם השרת. אנא נסו מאוחר יותר.</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_title">שגיאת אימות</string>
   <string name="login_validation_error_fieldsmissing">עליכם למלא את כל השדות.</string>
   <string name="save_changes">שמור</string>
   <string name="copy">העתק</string>
   <string name="notes">הערות</string>
-  <string name="text">טקסט</string>
-  <string name="difficulty">רמת קושי</string>
+    <string name="difficulty">רמת קושי</string>
   <string name="tags">תגיות</string>
   <string name="trivial">טריוויאלי</string>
   <string name="easy">קל</string>
@@ -78,12 +65,8 @@
   <string name="negative_habit_form">שלילי ( - )</string>
   <string name="checklist">רשימה</string>
   <string name="reminders">תזכורות</string>
-  <string name="actions">פעולות</string>
-  <string name="attributes">תכונות</string>
-  <string name="frequency">תדירות</string>
-  <string name="frequency_weekly">בימים מסויימים בשבוע</string>
-  <string name="frequency_daily">כל X ימים</string>
-  <string name="monday">שני</string>
+    <string name="attributes">תכונות</string>
+    <string name="monday">שני</string>
   <string name="tuesday">שלישי</string>
   <string name="wednesday">רביעי</string>
   <string name="thursday">חמישי</string>
@@ -95,22 +78,13 @@
   <string name="faint_header">נגמרה לכם הבריאות!</string>
   <string name="faint_button">מלאו בריאות ונסו מחדש</string>
   <string name="filter">מסנן</string>
-  <string name="profile_image">תמונת פרופיל</string>
-  <string name="mana_price_button">%d מאנה</string>
-  <string name="used_skill">השתמשתם ב %1$s בעבור %2$d מאנה.</string>
-  <string name="new_checklist_item">שורה חדשה לרשימה</string>
-  <string name="add_checklist_item">הוסף</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="unlock_lvl_11">משתחרר בדרגה 11</string>
-  <string name="no_party_message">אתם לא בחבורה. כדי להצטרף לחבורה, בקרו באתר.</string>
-  <string name="forgot_pw_btn">שכחתי סיסמה</string>
-  <string name="tavern.inn.checkOut">הפעילו מחדש את המטלות היומיות שלכם</string>
-  <string name="tavern.inn.rest">עצרו את המטלות היומיות שלכם</string>
-  <string name="reward.dialog.buy">קנייה</string>
-  <string name="reward.dialog.dismiss">בטל</string>
+    <string name="new_checklist_item">שורה חדשה לרשימה</string>
+    <string name="unlock_lvl_11">משתחרר בדרגה 11</string>
+    <string name="forgot_pw_btn">שכחתי סיסמה</string>
+  <string name="tavern.inn_checkOut">הפעילו מחדש את המטלות היומיות שלכם</string>
+  <string name="tavern.inn_rest">עצרו את המטלות היומיות שלכם</string>
+  <string name="reward.dialog_buy">קנייה</string>
+  <string name="reward.dialog_dismiss">בטל</string>
   <string name="party">חבורה</string>
   <string name="chat">צ׳אט</string>
   <string name="members">חברים</string>
@@ -118,24 +92,20 @@
   <string name="dailies">מטלות יומיות</string>
   <string name="todos">מטרות</string>
   <string name="rewards">פרסים</string>
-  <string name="taskform.delete.title">האם אתם בטוחים?</string>
-  <string name="taskform.delete.message">האם אתם באמת רוצים למחוק?</string>
-  <string name="yes">כן</string>
+    <string name="yes">כן</string>
   <string name="no">לא</string>
   <string name="quest">הרפתקאה</string>
   <string name="avatar_body">גוף</string>
   <string name="avatar_hair">שיער</string>
   <string name="avatar_shirt">חולצה</string>
   <string name="avatar_skin">עור</string>
-  <string name="avatar_ears">אוזני חיות</string>
-  <string name="avatar_base">בסיס</string>
+    <string name="avatar_base">בסיס</string>
   <string name="avatar_color">צבע</string>
   <string name="avatar_beard">זקן</string>
   <string name="avatar_mustache">שפם</string>
   <string name="avatar_flower">פרח</string>
   <string name="avatar_bangs">טלטלים</string>
-  <string name="avatar_nothing">לא קבוע</string>
-  <string name="avatar_size">גודל</string>
+    <string name="avatar_size">גודל</string>
   <string name="avatar_size_slim">רזה</string>
   <string name="avatar_size_broad">רחב</string>
   <string name="avatar_background">רקע</string>
@@ -144,26 +114,18 @@
   <string name="purchase_button">קנייה</string>
   <string name="purchase_set_title">קנו סט %s</string>
   <string name="due_date">תאריך יעד</string>
-  <string name="quest.accept">קבלו</string>
-  <string name="quest.reject">דחו</string>
-  <string name="quest.begin">התחילו הרפתקאה</string>
-  <string name="quest.cancel">בטלו הזמנה</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>
-  <string name="quest.participants">משתתפים</string>
-  <string name="sidebar_help">עזרה ושאלות נפוצות</string>
+  <string name="quest_accept">קבלו</string>
+  <string name="quest_reject">דחו</string>
+  <string name="quest_begin">התחילו הרפתקאה</string>
+  <string name="quest_cancel">בטלו הזמנה</string>
+  <string name="quest_abort">הפסיקו את ההרפתקאה</string>
+    <string name="sidebar_help">עזרה ושאלות נפוצות</string>
   <string name="complete_tutorial">הבנתי!</string>
   <string name="dismiss_tutorial">הזכר לי שוב</string>
   <string name="intro_3_description">שימרו על קצב התקדמות עם עזרה מחבריכם. תימכו אחד בשני בחיים ובקרב ככל שאתם משתפרים ביחד!</string>
-  <string name="previous_button">קודם</string>
-  <string name="next_button">הבא</string>
+    <string name="next_button">הבא</string>
   <string name="skip_button">דלגו</string>
-  <string name="setup_welcome_description">ברוכים הבאים להאביטיקה, המקום בו התקדמות במשחק תשפר אתכם בחיים האמיתיים! ככל שאתם משיגים יעדים בעולם האמיתי, תשחררו ציוד, חיות מחמד, הרפתקאות, ועוד.</string>
-  <string name="setup_welcome_title">ברוכים הבאים</string>
-  <string name="setup_group_work">עבודה</string>
+    <string name="setup_group_work">עבודה</string>
   <string name="setup_group_exercise">התעמלות</string>
   <string name="setup_group_school">בית-ספר</string>
   <string name="setup_group_teams">קבוצות</string>
@@ -190,27 +152,19 @@
   <string name="setup_task_creativity_1">לימדו אשף של המלאכה</string>
   <string name="setup_task_creativity_2">עבוד על פרוייקט יצירתי</string>
   <string name="setup_task_creativity_3">סיים פרוייקט יצירתי</string>
-  <string name="gem.purchase.support">רוצים לסייע לנו לשמור על האביטיקה באוויר? אתם יכולים לתמוך במפתחים על ידי רכישה של אבני חן!\n\nאבני חן מאפשרות לכם לרכוש תוספות מהנות לחשבון שלכם, כולל: \n\n - תחפושות מגניבות לדמות שלכם\n - רקעים מדהימים\n - הרפתקאות כיפיות שיתגמלו אתכם עם ביצי חיות מחמד\n - היכולת לשנות את מקצוע הדמות שלכם לפני דרגה 100\n\nתודה רבה על העזרה שלכם להפוך את האביטיקה להכי טובה שהיא יכולה להיות. התמיכה שלכם היא מאוד משמעותית מבחינתנו!</string>
-  <string name="my_guilds">הגילדות שלי</string>
+    <string name="my_guilds">הגילדות שלי</string>
   <string name="public_guilds">גילדות פומביות</string>
   <string name="guild">גילדה</string>
   <string name="leave">עיזבו</string>
   <string name="join">הצטרפו</string>
-  <string name="leader">מנהיג</string>
-  <string name="gems">אבני חן</string>
-  <string name="send_pm">שילחו הודעה פרטית</string>
-  <string name="flag">דיווח</string>
-  <string name="delete">מחיקה</string>
+    <string name="gems">אבני חן</string>
+    <string name="delete">מחיקה</string>
   <string name="name">שם</string>
   <string name="description">תיאור</string>
   <string name="privacy">פרטיות</string>
   <string name="write_message">כיתבו הודעה</string>
-  <string name="post">שליחה</string>
-  <string name="guild_search_hint">חיפוש אחר גילדות</string>
-  <string name="todo_due">חל: %s</string>
-  <string name="daily_streak">רצף נוכחי: %d</string>
-  <string name="todo_has_duedate">למשימה יש תאריך יעד</string>
-  <string name="battle_gear">ציוד קרב</string>
+    <string name="guild_search_hint">חיפוש אחר גילדות</string>
+    <string name="battle_gear">ציוד קרב</string>
   <string name="costume">תחפושת</string>
   <string name="outfit_head">ראש</string>
   <string name="outfit_headAccessory">אביזר ראש</string>
@@ -223,9 +177,7 @@
   <string name="wear_costume">ליבשו תחפושת</string>
   <string name="equipped">מצוייד</string>
   <string name="quest_cancel_message">האם אתם בטוחים שאתם מעוניינים להפסיק את ההרפתקאה הזו? כל אישורי ההזמנות יאבדו. הבעלים של ההרפתקאה ימשיכו להחזיק במגילת ההרפתקאה.</string>
-  <string name="quest.invitation">הזמנה להרפתקאה</string>
-  <string name="quest.invitation.text">הוזמנתם להשתתף בהרפתקאה!</string>
-  <string name="today">היום</string>
+    <string name="today">היום</string>
   <string name="sidebar_items">חפצים</string>
   <string name="eggs">ביצים</string>
   <string name="hatching_potions">שיקויי הבקעה</string>
@@ -236,13 +188,9 @@
   <string name="armoireEquipment">מצאתם חתיכת ציוד נדיר בארמואר: %s! מגניב!</string>
   <string name="armoireFood">אתם נוברים בארמואר ומוצאים %1$s %2$s. מה זה עושה פה?</string>
   <string name="armoireExp">אתם נאבקים בארמואר וצוברים ניסיון. קבלו!</string>
-  <string name="armoireNotesFull">פתחו את הארמואר כדי לקבל ציוד מיוחד אקראי, ניסיון, או אוכל! חתיכות ציוד שנותרו: %d</string>
-  <string name="armoireLastItem">מצאתם את חתיכת הציוד הנדיר האחרונה בארמואר הקסום.</string>
-  <string name="armoireNotesEmpty">הארמואר יכיל ציוד חדש בשבוע הראשון של כל חודש. עד אז, המשיכו ללחוץ כדי לקבל ניסיון ואוכל!</string>
-  <string name="sell">מיכרו (%d זהב)</string>
+    <string name="sell">מיכרו (%d זהב)</string>
   <string name="hatch_with_potion">הבקיעו עם שיקוי</string>
-  <string name="feed_to_pet">האכילו חיית מחמד</string>
-  <string name="hatch_egg">הבקיעו עם ביצה</string>
+    <string name="hatch_egg">הבקיעו עם ביצה</string>
   <string name="invite_party">הזמינו חבורה</string>
   <string name="dialog_feeding">האכלתם %s עם:</string>
   <string name="use_animal">השתמשו</string>
@@ -265,8 +213,7 @@
   <string name="healer_description">מרפאים הם עמידים בפני פגיעות, וחולקים את היכולת הזו עם אחרים. מטלות יומיות מפוספסות והרגלים רעים לא מבלבלים אותם כל כך, ויש להם יכולת להתאושש מכשלונות. שחקו במקצוע המרפא אם אתם נהנים לסייע לעמיתיכם לחבורה, או אם הרעיון של התחמקות ממוות דרך עבודה קשה מעורר בכם השראה!</string>
   <string name="select_class">בחרו מקצוע</string>
   <string name="opt_out_class">וותרו</string>
-  <string name="opt_out_description">לא מעניינים אתכם מקצועות? רוצים לבחור מאוחר יותר? וותרו - תהיו לוחמים ללא תכונות מיוחדות. תוכלו לקראו על מערכת המקצועות מאוחר יותר בוויקי ולאפשר מקצועות בכל שעה.</string>
-  <string name="class_confirmation">האם אתם בטוחים שברצונכם להיות %s?</string>
+    <string name="class_confirmation">האם אתם בטוחים שברצונכם להיות %s?</string>
   <string name="choose_class">בחרו מקצוע</string>
   <string name="dialog_go_back">חזרה</string>
   <string name="opt_out_confirmation">האם אתם בטוחים שאתם מעוניינים לוותר?</string>
@@ -277,76 +224,38 @@
   <string name="invite_existing_users">הזמינו משתמשים קיימים</string>
   <string name="send">שילחו</string>
   <string name="invite">הזמינו חברים</string>
-  <string name="invite_id_description">אם יש לכם חברים שכבר משתמשים בהאביטיקה, הזמינו אותם באמצעות מזהה המשתמש כאן.</string>
-  <string name="invite_email_description">אם חברים מצטרפים להאביטיקה באמצעות מייל שלכם, הם אוטומטית יוזמנו לחבורה שלכם!</string>
+    <string name="invite_email_description">אם חברים מצטרפים להאביטיקה באמצעות מייל שלכם, הם אוטומטית יוזמנו לחבורה שלכם!</string>
   <string name="add_invites">הוסיפו מוזמנים</string>
-  <string name="user_id">מזהה משתמש</string>
-  <string name="email">מייל</string>
-  <string name="invite_users">הזמינו לחבורה</string>
-  <string name="share_using">שתפו באמצעות</string>
+    <string name="email">מייל</string>
+    <string name="share_using">שתפו באמצעות</string>
   <string name="share_hatched">הרגע הבקעתי ביצת חיית מחמד של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
-  <string name="share_raised">הרגע הרווחתי חיית רכיבה של %1$s %2$s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
+  <string name="share_raised">הרגע הרווחתי חיית רכיבה של %s בהאביטיקה על ידי השלמת משימות בחיים האמיתיים!</string>
   <string name="open_in_store">פתיחה בפליי סטור</string>
   <string name="change_class_confirmation">האם אתם בטוחים שאתם מעוניינים להחליף מקצוע? זה יעלה לכם 3 אבני חן.</string>
-  <string name="leaderMessage">הודעה מאת %1$s</string>
-  <string name="confirm">אישור</string>
+    <string name="confirm">אישור</string>
   <string name="market">שוק</string>
   <string name="timeTravelers">נוסעים בזמן</string>
   <string name="seasonalShop">חנות עונתית</string>
   <string name="party_invite">שחררו על-ידי הזמנת חברים</string>
-  <string name="no_gold">אין די זהב</string>
-  <string name="no_potion">אינכם צריכים לקנות שיקוי בריאות</string>
-  <string name="purchase_confirmation_title">אשרו רכישה</string>
-  <string name="confirm_purchase_text">קנו %1$s בעבור %2$s %3$s</string>
-  <string name="gem">אבן חן</string>
-  <string name="hourglass">שעון חול</string>
-  <string name="hourglasses">שעוני חול</string>
-  <string name="gold_singular">זהב</string>
-  <string name="gold_plural">זהב</string>
+    <string name="gold_plural">זהב</string>
   <string name="chat_message_copied">הודעה הועתקה ללוח</string>
-  <string name="copy_chat_message">העתקה ללוח</string>
-  <string name="edit_tag_title">עריכת תג</string>
-  <string name="edit_tag_btn_edit">עריכה</string>
-  <string name="edit_tag_btn_done">בוצע</string>
-  <string name="edit_tag_btn_delete">מחיקה</string>
-  <string name="confirm_delete_tag_title">האם אתם בטוחים?</string>
+    <string name="edit_tag_btn_edit">עריכה</string>
+    <string name="confirm_delete_tag_title">האם אתם בטוחים?</string>
   <string name="confirm_delete_tag_message">האם אתם באמת רוצים למחוק?</string>
-  <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>
-  <string name="send_new_message">שליחת הודעה חדשה</string>
-  <string name="choose_recipient_title">בחרו נמען להודעה</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">בחרו נמען להודעה</string>
   <string name="action_continue">המשך</string>
-  <string name="scan_qr_code">סריקת קוד QR</string>
-  <!--Login Incentives-->
+    <!--Login Incentives-->
   <string name="subscriptions">הרשמות</string>
   <string name="subscribe">הרשמה</string>
 <string name="Language_summary">שנה את השפה של האביטיקה</string>
-    <string name="unknown_error">שגיאה התרחשה…</string>
     <string name="pref_first_day_of_the_week_summary">היום הראשון בשבוע בכל לוחות השנה</string>
     <string name="pref_cds_header">התחלה ביום בבחירה אישית</string>
-    <string name="pref_cds_picker">בחר יום להתחלה בעצמך</string>
 
     <string name="push_notifications_sum">וסט את הגדרות התראות הדחיפה</string>
     <string name="preference_push_invited_to_guild">הוזמנת לגילדה</string>
-    <string name="new_todo">פרויקט חדש</string>
-    <string name="new_reward">תגמול חדש</string>
-    <string name="new_daily">משימה יומית חדשה</string>
-    <string name="new_habit">הרגל חדש</string>
-    <string name="repeatEvery">חזור כל</string>
 
 
-    <string name="physical">כוח</string>
-    <string name="mental">אינטיליגנציה</string>
-    <string name="social">עקביות</string>
-    <string name="other">תפיסה</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>
@@ -363,5 +272,4 @@
     <string name="version_info">גרסא %1$s (%2$d)</string>
 
     <string name="intro_1_subtitle">ברוכים הבאים ל</string>
-    <string name="intro_1_title">האביטיקה</string>
-    </resources>
+</resources>
diff --git a/Habitica/res/values-ja/strings.profile.xml b/Habitica/res/values-ja/strings.profile.xml
index 766c825f0..21f451774 100644
--- a/Habitica/res/values-ja/strings.profile.xml
+++ b/Habitica/res/values-ja/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">閉じる</string>
 
 </resources>
diff --git a/Habitica/res/values-ja/strings.sidebar.xml b/Habitica/res/values-ja/strings.sidebar.xml
index 6176ab897..99de599fb 100644
--- a/Habitica/res/values-ja/strings.sidebar.xml
+++ b/Habitica/res/values-ja/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">タスク</string>
-  <string name="sidebar.skills">スキル</string>
-  <string name="sidebar.section.social">コミュニティー</string>
-  <string name="sidebar.inbox">メッセージ</string>
-  <string name="sidebar.tavern">キャンプ場</string>
-  <string name="sidebar.party">パーティー</string>
-  <string name="sidebar.purchaseGems">ジェムの購入</string>
-  <string name="sidebar.guilds">ギルド</string>
-  <string name="sidebar.challenges">チャレンジ</string>
-  <string name="sidebar.section.inventory">所持品</string>
-  <string name="sidebar.avatar">アバター</string>
-  <string name="sidebar.equipment">装備</string>
-  <string name="sidebar.stable">動物小屋</string>
-  <string name="sidebar.news">お知らせ</string>
-  <string name="sidebar.settings">設定</string>
-  <string name="sidebar.about">Habitica について</string>
+  <string name="sidebar_tasks">タスク</string>
+  <string name="sidebar_skills">スキル</string>
+  <string name="sidebar.section_social">コミュニティー</string>
+  <string name="sidebar_inbox">メッセージ</string>
+  <string name="sidebar_tavern">キャンプ場</string>
+  <string name="sidebar_party">パーティー</string>
+  <string name="sidebar_purchaseGems">ジェムの購入</string>
+  <string name="sidebar_guilds">ギルド</string>
+  <string name="sidebar_challenges">チャレンジ</string>
+  <string name="sidebar.section_inventory">所持品</string>
+  <string name="sidebar_avatar">アバター</string>
+  <string name="sidebar_equipment">装備</string>
+  <string name="sidebar_stable">動物小屋</string>
+  <string name="sidebar_news">お知らせ</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 4919b000d..4a65497a9 100644
--- a/Habitica/res/values-ja/strings.tutorial.xml
+++ b/Habitica/res/values-ja/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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_skills">スキルは、強力な効果を持つ特殊能力です！ スキルをタップして使いましょう。スキルを使うとマナ (青いバー) が減ります。マナは、毎日チェックして実生活のタスクを達成することで獲得できます。詳しくは、メニューのFAQをチェックしましょう！</string>
   <string name="tutorial_party">ここは、あなたと仲間たちが目標達成のために互いに責任感を持ち続けられる場です。タスクをこなしてモンスターと戦うことができます！</string>
   <string name="tutorial_tavern">キャンプ場へようこそ!　ここは年齢なんか気にしないオープンなチャットルームです。ここでタスクの進め方について話したり、質問したりできます。楽しんでね!</string>
-  <string name="tutorial_classes">戦士、魔道士、治療師、それとも盗賊…どれになるか決めよう!　クラスにはそれぞれ専用の装備とスキルがある。詳しくは (?) をタップしてね!</string>
-  <string name="tutorial_stats">一度にステータスを割り当てるには灰色のボタンを、1つずつ割り振るには矢印をタップして下さい。</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 5d91aa75e..e272474ea 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">経験値</string>
   <string name="HP_default">体力</string>
   <string name="MP_default">マナ</string>
-  <string name="ERR_pb_barcode">設定をバーコードから読み込むことができませんでした</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">設定</string>
-  <string name="SP_address_hint">カスタムサーバー</string>
-  <string name="SP_userID_title">ユーザーID</string>
+    <string name="SP_userID_title">ユーザーID</string>
   <string name="SP_userID_summary">あなたのユーザーID</string>
   <string name="SP_APIToken_title">API トークン</string>
   <string name="SP_APIToken_summary">あなたの API トークン</string>
   <string name="Language_title">言語</string>
   <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="PS_contact_title">開発者に連絡する</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_reminder_header">毎日の通知</string>
   <string name="pref_reminder_checkbox">通知を有効にする</string>
   <string name="pref_reminder_picker">通知時間を設定</string>
   <string name="pref_cds_header">日付更新の設定</string>
-  <string name="pref_cds_picker">日付更新の時間を設定する</string>
-  <string name="pref_push_notifications_checkbox">ユーザーへのプッシュ通知</string>
+    <string name="pref_push_notifications_checkbox">ユーザーへのプッシュ通知</string>
   <string name="push_notifications">プッシュ通知</string>
   <string name="push_notifications_sum">プッシュ通知を設定してください</string>
   <string name="preference_push_you_won_challenge">チャレンジで勝ちました!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">クエストが始まりました</string>
   <string name="preference_push_invited_to_quest">クエストに招待されました</string>
   <!--Adding tasks-->
-  <string name="task_value">値</string>
-  <string name="new_todo">To-Do を追加</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>
+    <string name="action_edit">編集</string>
+    <string name="action_cancel">戻る</string>
   <string name="login_btn">ログイン</string>
   <string name="register_btn">登録する</string>
   <string name="username">ユーザー名</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">パスワード ( 確認 )</string>
   <string name="logout">ログアウト</string>
   <string name="logout_description">ログアウトする</string>
-  <string name="account_details">アカウントの詳細</string>
-  <string name="LoginActivityName">ようこそ</string>
-  <string name="string_revive">復活</string>
-  <string name="please_connect">Widget を使う前に、アプリから接続してください</string>
-  <string name="about.title">Habitica について</string>
-  <string name="about.libraries">ライブラリー</string>
-  <string name="about.versionhistory">バージョン履歴</string>
-  <string name="about.habitica_open_source">Habitica は Github にてオープンソース・ソフトウェアとして開かれています</string>
-  <string name="about.rate_our_app">このアプリをレビュー</string>
-  <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="LoginActivityName">ようこそ</string>
+    <string name="about_title">Habitica について</string>
+  <string name="about_libraries">ライブラリー</string>
+    <string name="about_habitica_open_source">Habitica は Github にてオープンソース・ソフトウェアとして開かれています</string>
+  <string name="about_rate_our_app">このアプリをレビュー</string>
+  <string name="about_give_us_feedback">フィードバックを送る!</string>
+  <string name="about_bugreport">バグを報告する</string>
+  <string name="about_source_code">ソースコード</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">サーバーに問題があるようです。後ほど再試行してください。</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_title">確認エラー</string>
   <string name="login_validation_error_fieldsmissing">入力欄のすべてに入力してください。</string>
   <string name="save_changes">保存</string>
   <string name="copy">コピー</string>
   <string name="notes">メモ</string>
-  <string name="text">テキスト</string>
-  <string name="difficulty">難易度</string>
+    <string name="difficulty">難易度</string>
   <string name="tags">タグ</string>
   <string name="trivial">ちょろい</string>
   <string name="easy">かんたん</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">悪い ( - )</string>
   <string name="checklist">チェックリスト</string>
   <string name="reminders">通知</string>
-  <string name="actions">行動</string>
-  <string name="attributes">属性</string>
-  <string name="physical">力</string>
-  <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>
-  <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="attributes">属性</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>
@@ -123,24 +92,15 @@
   <string name="faint_header">体力がなくなった!</string>
   <string name="faint_button">体力を全回復してやり直す</string>
   <string name="filter">フィルター</string>
-  <string name="profile_image">プロフィール画像</string>
-  <string name="mana_price_button">%d マナ</string>
-  <string name="used_skill">%2$dマナを消費して%1$sを唱えた。</string>
-  <string name="used_skill_without_mana">%1$s を唱えた。</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="skill_progress_title">使用中のスキル</string>
-  <string name="coming_soon">近日中</string>
-  <string name="chat_flag_confirmation">このメッセージを違反として報告します。いいですか?</string>
-  <string name="flag_confirm">メッセージに印をつける</string>
-  <string name="unlock_lvl_11">レベル11 でアンロック</string>
-  <string name="no_party_message">パーティーに参加してないよ。パーティーに参加する方法を website で確認して。</string>
-  <string name="forgot_pw_btn">パスワードがわからない</string>
-  <string name="tavern.inn.checkOut">日課を再開する</string>
-  <string name="tavern.inn.rest">日課を中断する</string>
-  <string name="reward.dialog.buy">買う</string>
-  <string name="reward.dialog.dismiss">中止</string>
+    <string name="reminder_title">忘れずにタスクをチェックしましょう</string>
+    <string name="unlock_lvl_11">レベル11 でアンロック</string>
+    <string name="forgot_pw_btn">パスワードがわからない</string>
+  <string name="tavern.inn_checkOut">日課を再開する</string>
+  <string name="tavern.inn_rest">日課を中断する</string>
+  <string name="reward.dialog_buy">買う</string>
+  <string name="reward.dialog_dismiss">中止</string>
   <string name="party">パーティー</string>
   <string name="chat">チャット</string>
   <string name="members">メンバー</string>
@@ -148,24 +108,20 @@
   <string name="dailies">日課</string>
   <string name="todos">To-Do</string>
   <string name="rewards">ごほうび</string>
-  <string name="taskform.delete.title">よろしいですか?</string>
-  <string name="taskform.delete.message">削除します。いいですか?</string>
-  <string name="yes">はい</string>
+    <string name="yes">はい</string>
   <string name="no">いいえ</string>
   <string name="quest">クエスト</string>
   <string name="avatar_body">体</string>
   <string name="avatar_hair">髪</string>
   <string name="avatar_shirt">シャツ</string>
   <string name="avatar_skin">肌</string>
-  <string name="avatar_ears">動物の耳</string>
-  <string name="avatar_base">ベース</string>
+    <string name="avatar_base">ベース</string>
   <string name="avatar_color">色</string>
   <string name="avatar_beard">あごひげ</string>
   <string name="avatar_mustache">くちひげ</string>
   <string name="avatar_flower">花</string>
   <string name="avatar_bangs">前髪</string>
-  <string name="avatar_nothing">なし</string>
-  <string name="avatar_size">サイズ</string>
+    <string name="avatar_size">サイズ</string>
   <string name="avatar_size_slim">スリム</string>
   <string name="avatar_size_broad">がっしり</string>
   <string name="avatar_background">背景</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">購入</string>
   <string name="purchase_set_title">%s セットを購入</string>
   <string name="due_date">期限日</string>
-  <string name="quest.accept">承認</string>
-  <string name="quest.reject">拒否</string>
-  <string name="quest.begin">クエストをはじめる</string>
-  <string name="quest.cancel">招待を中止する</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>
-  <string name="quest.participants">参加者</string>
-  <string name="version_info">バージョン : %1$s (%2$d)</string>
+  <string name="quest_accept">承認</string>
+  <string name="quest_reject">拒否</string>
+  <string name="quest_begin">クエストをはじめる</string>
+  <string name="quest_cancel">招待を中止する</string>
+  <string name="quest_abort">クエストを中断する</string>
+    <string name="version_info">バージョン : %1$s (%2$d)</string>
   <string name="sidebar_help">ヘルプとFAQ</string>
   <string name="complete_tutorial">わかった!</string>
   <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_1_description">やるべきことを片付けながら楽しむ時が来ました。 現在%s人以上の方々がタスクをこなしながら人生を楽しんでいます。</string>
   <string name="intro_2_subtitle">ゲームの進行</string>
   <string name="intro_2_title">人生の進行</string>
   <string name="intro_2_description">実生活でタスクをこなし、ゲーム内の機能をアンロックしよう。よろいやペットなどのさまざまなアイテムを、あなた自身の目標に近づいたごほうびとして獲得しよう。</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">友達とつながって</string>
   <string name="intro_3_description">友達の力を借りて目標にしがみつこう。実生活とバトルでお互いに助け合い、いっしょに成長しよう!</string>
   <string name="intro_finish_button">始めましょう!</string>
-  <string name="previous_button">戻る</string>
-  <string name="next_button">次へ</string>
+    <string name="next_button">次へ</string>
   <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="avatar_setup_description">さあ、どんな格好をしたい？　心配しないで、後で変えることもできるから。</string>
   <string name="task_setup_description">すばらしい！　では、この冒険の旅で、自分の生活のどの部分を改善したい？</string>
   <string name="setup_group_work">仕事</string>
   <string name="setup_group_exercise">エクササイズ</string>
@@ -233,30 +180,20 @@
   <string name="setup_task_creativity_1">手芸を習う</string>
   <string name="setup_task_creativity_2">創造的なプロジェクトで働く</string>
   <string name="setup_task_creativity_3">創造的なプロジェクトを完了する</string>
-  <string name="gem.purchase.support">Habitica の運営を手伝ってくれませんか?　ジェムを買うことでアプリの開発者を支援できます!\n\nジェムはあなたのアカウントの楽しいおまけを買うことができます。おまけの例: \n\n - アバターのカッコいい衣装\n
- - すんごい背景\n - ペットのタマゴがごほうびの楽しいクエスト\n - レベル100になるまでにクラスを変更できる\n\nHabiticaが最高のものになる手助けをしてくれるとうれしいです。あなたの支援は私たちにとって多くの意味があることなんです!</string>
-  <string name="my_guilds">所属ギルド</string>
+    <string name="my_guilds">所属ギルド</string>
   <string name="public_guilds">公共ギルド</string>
   <string name="guild">ギルド</string>
   <string name="leave">辞める</string>
   <string name="join">参加する</string>
-  <string name="leader">リーダー</string>
-  <string name="gems">ジェム</string>
-  <string name="copy_as_todo">To-Doとしてコピー</string>
-  <string name="send_pm">PMを送る</string>
-  <string name="flag">フラグ</string>
-  <string name="delete">削除</string>
+    <string name="gems">ジェム</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>
-  <string name="guild_search_hint">ギルドを検索</string>
-  <string name="todo_due">期限 : %s</string>
-  <string name="daily_streak">現在の連続実行 : %d 回</string>
-  <string name="todo_has_duedate">期限ありタスク</string>
-  <string name="battle_gear">武装</string>
+    <string name="guild_search_hint">ギルドを検索</string>
+    <string name="battle_gear">武装</string>
   <string name="costume">衣装</string>
   <string name="outfit_head">頭</string>
   <string name="outfit_headAccessory">頭部のアクセサリー</string>
@@ -269,10 +206,8 @@
   <string name="wear_costume">衣装を着る</string>
   <string name="equipped">装備済み</string>
   <string name="quest_cancel_message">このクエストを中止します。よろしいですか?　招待を受けたすべての参加者を失うことになります。クエストの所有者の元にクエストの巻物が戻ってきます。</string>
-  <string name="quest.invitation">クエストへの招待</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="quest_begin_message">本当によろしいですか？あなたの%2$dパーティメンバーのうち、 %1$d人しかクエストに参加していません！クエストはすべてのプレーヤーが参加すると自動的に始まります。</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>
@@ -289,13 +224,9 @@
   <string name="armoireEquipment">宝箱に貴重なアイテム、 %s を見つけた!　すごい!</string>
   <string name="armoireFood">宝箱をひっかきまわして%1$s%2$sを見つけた。何でこんなとこに?</string>
   <string name="armoireExp">宝箱と格闘して経験値を増やした。どうぞっ!</string>
-  <string name="armoireNotesFull">宝箱を開くと、特別な装備、経験値、えさなどが手に入るよ!　残っているアイテムの数 : %d</string>
-  <string name="armoireLastItem">最後の貴重なアイテムをラッキー宝箱で発見した。</string>
-  <string name="armoireNotesEmpty">宝箱には毎月最初の週に新しいアイテムが入ります。それまでは、クリックして経験値やえさを手に入れよう!</string>
-  <string name="sell">%d ゴールドで売る</string>
+    <string name="sell">%d ゴールドで売る</string>
   <string name="hatch_with_potion">たまごがえしの薬を使う</string>
-  <string name="feed_to_pet">ペットにえさをやる</string>
-  <string name="hatch_egg">たまごをかえす</string>
+    <string name="hatch_egg">たまごをかえす</string>
   <string name="invite_party">パーティーを招待する</string>
   <string name="dialog_feeding">%s にえさをやる :</string>
   <string name="use_animal">連れていく</string>
@@ -306,17 +237,8 @@
   <string name="close">閉じる</string>
   <string name="share">共有する</string>
   <string name="notification_pet_fed">%sにえさをやった!</string>
-  <string name="notification_purchase">%sを購入しました</string>
-  <string name="notification_purchase_reward">報酬をを購入しました</string>
-  <string name="sectiondrop">ふつうの</string>
-  <string name="sectionpremium">魔法の薬</string>
-  <string name="sectionquest">クエスト</string>
-  <string name="sectionspecial">レアな</string>
-  <string name="sectionmounts">ふつうの</string>
-  <string name="sectionpremiumMounts">魔法の薬</string>
-  <string name="sectionquestMounts">クエスト</string>
-  <string name="sectionspecialMounts">レアな</string>
-  <string name="world_quest">世界のクエスト</string>
+    <string name="notification_purchase_reward">報酬をを購入しました</string>
+    <string name="world_quest">世界のクエスト</string>
   <string name="inn_description">休憩が必要？ダニエルの宿屋にチェックインし、Habiticaのややこしいゲームシステムを一時停止しましょう:
 ・日課をこなさなくてもダメージを受けなくなります
 ・タスクの連続実行は変更されなくなり、色も変わらなくなります
@@ -335,8 +257,7 @@
   <string name="healer_description">治療師は痛みに耐え、他人を守るのです。やらなかった日課や悪い習慣にも治療師は動揺せず、失敗から体力を回復させる能力がある。パーティーの他のメンバーを助けることに喜びを感じる、困難な仕事による死をも恐れぬ理想があるのなら、治療師でプレーしよう!</string>
   <string name="select_class">クラスを選ぶ</string>
   <string name="opt_out_class">選ばない</string>
-  <string name="opt_out_description">クラスなんてめんどくさい？ 後で選びたい？ 選ばなくても構いません。スキルのない戦士になります。クラスのしくみについて後でwikiを参照して、いつでもクラスを有効にできます。</string>
-  <string name="class_confirmation">%s になります。いいですか?</string>
+    <string name="class_confirmation">%s になります。いいですか?</string>
   <string name="class_changed">あなたは%s に転職した！</string>
   <string name="class_changed_description">新たな標準の武装を手に入れました。「装備」で取り換えることもできます！</string>
   <string name="choose_class">クラスを選ぶ</string>
@@ -350,23 +271,18 @@
   <string name="invite_existing_users">登録済みのユーザー</string>
   <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_username_description">Habiticaをやってる友達がいたら、ユーザー名を入力してパーティーに招待しよう。</string>
   <string name="invite_email_description">メールを通じて、友達が Habitica に登録したら、自動的にあなたのパーティーに招待するよ！</string>
   <string name="add_invites">招待の追加</string>
-  <string name="user_id">ユーザーID</string>
-  <string name="email">メール</string>
-  <string name="invite_users">パーティーに招待する</string>
-  <string name="share_using">共有 ( シェア ) : </string>
+    <string name="email">メール</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">実生活でのタスクをこなして、%1$s のペットが乗れるほど大きな乗騎まで成長した。</string>
   <string name="open_in_store">Play ストアで開く</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="confirm">確認</string>
   <string name="market">市場</string>
   <string name="timeTravelers">タイムトラベラー</string>
   <string name="seasonalShop">期間限定ショップ</string>
@@ -374,37 +290,16 @@
   <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>
-  <string name="hourglass">砂時計</string>
-  <string name="hourglasses">砂時計</string>
-  <string name="gold_singular">ゴールド</string>
-  <string name="gold_plural">ゴールド</string>
+    <string name="successful_purchase">%1$sを購入しました</string>
+    <string name="gold_plural">ゴールド</string>
   <string name="chat_message_copied">メッセージをクリップボードにコピーしました</string>
-  <string name="copy_chat_message">クリップボードにコピー</string>
-  <string name="edit_tag_title">タグを編集</string>
-  <string name="edit_tag_btn_edit">編集</string>
-  <string name="edit_tag_btn_done">完了</string>
-  <string name="edit_tag_btn_delete">削除</string>
-  <string name="confirm_delete_tag_title">よろしいですか?</string>
+    <string name="edit_tag_btn_edit">編集</string>
+    <string name="confirm_delete_tag_title">よろしいですか?</string>
   <string name="confirm_delete_tag_message">削除します。いいですか?</string>
-  <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>
-  <string name="send_new_message">メッセージを送信</string>
-  <string name="choose_recipient_title">メッセージの送信先を選択</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">メッセージの送信先を選択</string>
   <string name="action_continue">続行</string>
-  <string name="scan_qr_code">QR コードを読み取る</string>
-  <string name="enter_recipient_uuid">送信先の ユーザー ID を入力</string>
-  <string name="invited_to_party">パーティーに招待されました!</string>
+    <string name="invited_to_party">パーティーに招待されました!</string>
   <string name="stats_widget_label">Habitica ステータス</string>
   <string name="add_task">タスクを追加</string>
   <string name="add_habit">習慣を追加</string>
@@ -415,15 +310,14 @@
   <string name="widget_habit_button">Habitica の習慣</string>
   <string name="widget_dailies">Habitica の日課</string>
   <string name="widget_todo_list">Habitica のTo-Do リスト</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="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>
@@ -437,36 +331,36 @@
   <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_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="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">商人・アレクサンダーが、ジェム1個を20ゴールドで売ってくれます！
+  <string name="subscribe.listitem1_description">商人・アレクサンダーが、ジェム1個を20ゴールドで売ってくれます！
 \n
 \nアレクサンダーと1ヵ月の間に取り引きできるジェムの数は、最初は25個に限定されていますが、寄付期間によって増えます。
 \n
 \n寄付の継続3カ月ごとにその数が5個ずつ増えていき、最大で月に50個を買うことができます！</string>
-  <string name="subscribe.listitem2.description">毎月、アバターを個性的に装飾するアイテムが手に入ります！
+  <string name="subscribe.listitem2_description">毎月、アバターを個性的に装飾するアイテムが手に入ります！
 \n
 \nさらに寄付の継続3カ月ごとに、謎のタイムトラベラーによって、歴史的（そして未来的！）な装飾アイテムが入手可能になります。</string>
-  <string name="subscribe.listitem3.description">完了した To-Do やタスクの履歴を、より長期間閲覧可能になります。</string>
-  <string name="subscribe.listitem4.description">落とし物の上限が2倍になり、毎日の完了したタスクから、より多くのアイテムを獲得することができます。動物小屋のコンプリートも早くなります！</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="subscribe.listitem3_description">完了した To-Do やタスクの履歴を、より長期間閲覧可能になります。</string>
+  <string name="subscribe.listitem4_description">落とし物の上限が2倍になり、毎日の完了したタスクから、より多くのアイテムを獲得することができます。動物小屋のコンプリートも早くなります！</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プレイストアのマイアプリの項目から寄付をやめることができます。</string>
-  <string name="cancel_subscription_notgoogle.description">寄付をやめたいですか?あなたの支払い方法では,ウェブサイトからのみ寄付をやめることができます。下のボタンをクリックしてあなたのブラウザでウェブサイトを開きます!</string>
+  <string name="cancel_subscription_google_description">寄付をやめたいですか? Googleプレイストアのマイアプリの項目から寄付をやめることができます。</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>
@@ -481,56 +375,40 @@
   <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_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>
-  <string name="daily">日課</string>
+    <string name="daily">日課</string>
   <string name="habit">習慣</string>
   <string name="reward">ごほうび</string>
   <string name="todo">To-Do</string>
   <string name="official">Habitica公式</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="challenge">チャレンジ</string>
+    <string name="not_part_of_a_challenge">今参加しているチャレンジはありません！</string>
   <string name="join_a_challenge">チャレンジに参加してタスクのセットをあなたのタスクリストに追加し、他のHabiticianと達成度を競いましょう。優勝すれば実績メダルと、副賞としてジェムを手に入れられることもあります！</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\” を有効にしているようです。現在、このオプションはHabiticaのアプリに問題を起こしますので、無効にすることをお勧めします。</string>
-  <string name="inbox">メッセージ</string>
-  <string name="FAQ">よくある質問</string>
-  <string name="special">スペシャル</string>
+    <string name="inbox">メッセージ</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="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="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="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_fb">Facebookでログイン</string>
   <string name="login_btn_google">Googleでログイン</string>
   <string name="action_back">戻る</string>
   <string name="welcome_text">おお、あなたは新しくここに来た方ですね。私の名前はJustin。Habiticaの案内人です。
@@ -564,7 +442,6 @@
   <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>
@@ -572,8 +449,7 @@
   <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_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>
@@ -583,42 +459,36 @@
   <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="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="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="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_leader_header">%sが始めたタスク</string>
   <string name="quest_abort_message">このミッションを中断します。よろしいですか?　パーティの全員が中断になり、すべての進行状況は失われます。クエストの巻物はクエスト所有者の手に戻ります。</string>
-  <string name="loading">ロード中…</string>
-  <string name="reloading_content">再度読み込みます</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="available_until">%sまで利用可能</string>
+  <string name="gems_left_max">今月のジェム: 残り%1$d/%2$d</string>
+  <string name="gems_left_nomax">今月のジェム: 残り%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_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d の経験値</string>
+  <string name="gold_reward">%dゴールド</string>
   <string name="quest_owner_rewards">クエストオーナー報酬</string>
   <string name="str_abbrv">力</string>
   <string name="per_abbrv">知覚</string>
@@ -633,8 +503,7 @@
   <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="resetting_account">アカウントをリセット</string>
   <string name="deleting_account">アカウントを削除</string>
   <string name="insufficientGold">このアイテムを購入するにはもっとタスクをこなす必要があります！</string>
   <string name="insufficientGems">このアイテムを購入するにはもっとジェムが必要です！</string>
@@ -667,8 +536,7 @@
   <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_username">ユーザー名を変更する</string>
   <string name="change">変更する</string>
   <string name="character_level">キャラクターのレベル</string>
   <string name="auto_allocate_points">ポイントの自動割り当て</string>
@@ -689,7 +557,7 @@
   <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="points_to_allocate">%dポイント割り当て可能</string>
   <string name="distribute_evenly_help">各能力に同じ値のポイントを割り当てます。</string>
   <string name="distribute_class_help">クラスにとって重要なポイントを多く割り当てます。</string>
   <string name="distribute_task_help">あなたが完了したタスクに基づいて、力、知能、体質、知覚にポイントを割り当てます。</string>
@@ -700,9 +568,7 @@
   <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="tavern_description">ロッジにようこそ！腰掛けてチャットをし、タスクを休憩しましょう。</string>
   <string name="check_into_inn">宿にチェックインする</string>
   <string name="community_guidelines">コミュニティガイドライン</string>
   <string name="view_community_guidelines">コミュニティガイドラインを見る</string>
@@ -716,20 +582,13 @@
   <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="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="rage_strike_count">怒り攻撃 %d/%d</string>
+    <string name="pending_strike_title">保留中の攻撃</string>
   <string name="strike_description_title">怒り攻撃とは？</string>
-  <string name="strike_description_subtitle">怒り攻撃が３回まで起こる可能性があります</string>
-  <string name="strike_description_description">このゲージはHabiticaの住人たちが日課を逃すとたまっていきます。ゲージが一杯になると、心蝕のディスハートナーはその強烈なハートブレイクを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="strike_active_title">%s が襲撃を受けました！</string>
+    <string name="strike_active_description">愛すべき%sは%sの攻撃で%sが破壊されてしまい途方に暮れています。急いでタスクに取り組んで、あの怪物を倒して再建の手助けをしましょう！</string>
   <string name="questShop">クエスト ショップ</string>
   <string name="market_owner_long">商人のAlex</string>
   <string name="tavern_owner_long">キャンプ場の支配人・Daniel</string>
@@ -739,32 +598,21 @@
   <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">今月購入可能なジェムを買い切りました。来月の月初め1日から3日に購入できるようになります。ご支援に感謝いたします！</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ワールドボスからサボったタスクの分のダメージを食らうことはありませんが、そのかわりに怒りメーターが上昇してゆきます。もしメーターが一杯になると、ボスはHabiticaの店主の誰か一人を攻撃してしまいます！
-\nあなたは通常のクエストボスへもこれまで通り挑戦し続けることができます。ダメージはどちらのボスにも適用されます。キャンプ場でボス戦の進行状況と怒りの攻撃をチェックしましょう</string>
-  <string name="world_boss_description_intro">ワールドボスは、コミュニティ全体がタスクで強力なモンスターを協力して打ち倒す特別イベントです！</string>
+    <string name="join_party_title">パーティーに参加したいですか？</string>
+    <string name="insufficientSubscriberGems">今月購入可能なジェムを買い切りました。来月の月初め1日から3日に購入できるようになります。ご支援に感謝いたします！</string>
+    <string name="world_boss_description_title">ワールドボスとは何ですか？</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の脅威からHabiticaを守り、特別なごほうびを手に入れよう！</string>
-  <string name="world_boss_description_subtitle">%sの攻撃！</string>
-  <string name="questShop_owner_long">クエストガイドのイアン</string>
+  <string name="world_boss_action_prompt">ボスを倒して%sの脅威からHabiticaを守り、特別なごほうびを手に入れよう！</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="reply">返信する</string>
   <string name="challenge_prize">チャレンジの賞品</string>
   <string name="challenge_categories">チャレンジのカテゴリ</string>
   <string name="created_challenge">作成されたチャレンジ</string>
@@ -798,17 +646,15 @@
   <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">wiki</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="usernamePromptWiki">もしこの変更についてより詳しく知りたいときは、<a href="https://habitica.wikia_com/wiki/Player_Names">wiki</a>をご覧ください</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="enter_recipient_username">送信先の @ユーザー名 を入力</string>
   <string name="username_copied">ユーザー名をクリップボードにコピーしました</string>
   <string name="verification_pet">あなたが承認を終えたあとには、百戦練磨のペットのうち１匹があなたを待っていることでしょう！</string>
   <string name="welcomeNameTitle">あなたを何と呼べばいいですか？</string>
diff --git a/Habitica/res/values-ko/strings.profile.xml b/Habitica/res/values-ko/strings.profile.xml
index 367264aa5..a191df910 100644
--- a/Habitica/res/values-ko/strings.profile.xml
+++ b/Habitica/res/values-ko/strings.profile.xml
@@ -8,11 +8,8 @@
     <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>
-    <string name="profile_achievement_ok">확인</string>
-    <string name="profile_qrcode_close">닫기</string>
 
-<string name="profile_loading_data">회원 정보를 불러오는 중입니다...</string>
+    <string name="profile_loading_data">회원 정보를 불러오는 중입니다...</string>
     </resources>
diff --git a/Habitica/res/values-ko/strings.sidebar.xml b/Habitica/res/values-ko/strings.sidebar.xml
index 84ac9a831..9655db590 100644
--- a/Habitica/res/values-ko/strings.sidebar.xml
+++ b/Habitica/res/values-ko/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">과제</string>
-  <string name="sidebar.skills">스킬</string>
-  <string name="sidebar.section.social">소셜</string>
-  <string name="sidebar.tavern">주막</string>
-  <string name="sidebar.party">파티</string>
-  <string name="sidebar.purchaseGems">보석 &amp; 구독</string>
-  <string name="sidebar.guilds">길드</string>
-  <string name="sidebar.challenges">도전</string>
-  <string name="sidebar.section.inventory">인벤토리</string>
-  <string name="sidebar.avatar">아바타</string>
-  <string name="sidebar.equipment">장비</string>
-  <string name="sidebar.stable">마구간</string>
-  <string name="sidebar.news">뉴스</string>
-  <string name="sidebar.settings">설정</string>
-  <string name="sidebar.about">소개</string>
+  <string name="sidebar_tasks">과제</string>
+  <string name="sidebar_skills">스킬</string>
+  <string name="sidebar.section_social">소셜</string>
+  <string name="sidebar_tavern">주막</string>
+  <string name="sidebar_party">파티</string>
+  <string name="sidebar_purchaseGems">보석 &amp; 구독</string>
+  <string name="sidebar_guilds">길드</string>
+  <string name="sidebar_challenges">도전</string>
+  <string name="sidebar.section_inventory">인벤토리</string>
+  <string name="sidebar_avatar">아바타</string>
+  <string name="sidebar_equipment">장비</string>
+  <string name="sidebar_stable">마구간</string>
+  <string name="sidebar_news">뉴스</string>
+    <string name="sidebar_about">소개</string>
   <string name="sidebar_shops">상점</string>
-<string name="sidebar.inbox">메세지</string>
+<string name="sidebar_inbox">메세지</string>
     <string name="sidebar_stats">스탯</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.tutorial.xml b/Habitica/res/values-ko/strings.tutorial.xml
index bc3d63ece..9a82546d6 100644
--- a/Habitica/res/values-ko/strings.tutorial.xml
+++ b/Habitica/res/values-ko/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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_skills">스킬은 강력한 효과를 가진 능력입니다! 사용하고자 하는 스킬은 터치하면 됩니다. 스킬은 마나 (파란색 바)를 사용하는데, 마나는 매일 출석하고 일상생활의 과제들을 달성하면 채워집니다. 궁금한 점은 FAQ를 참고하세요!</string>
   <string name="tutorial_party">여기서 당신과 당신의 친구들은 서로의 목표를 체크해주고 과제를 달성하면서 함께 몬스터를 무찌를꺼에요!</string>
   <string name="tutorial_tavern">주막에 오신 것을 환영합니다! 여기는 누구나 채팅할수있는 채팅방입니다. 묻고싶은 것이 있으면 여기서 물어보세요. 좋은 시간 보내시길 바랍니다!</string>
-  <string name="tutorial_classes">전사, 마법사, 치료사나 도적중에서 직업을 정하세요! 각 직업마다 독특한 장비와 능력들이 있습니다. 더 알고싶으면 (?)을 누르세요!</string>
-<string name="tutorial_stats">많은 스탯을 한꺼번에 배분하려면 회색 버튼을 누르시고, 한 포인트씩 따로 분배하려면 화살표를 누르세요.</string>
+    <string name="tutorial_stats">많은 스탯을 한꺼번에 배분하려면 회색 버튼을 누르시고, 한 포인트씩 따로 분배하려면 화살표를 누르세요.</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 20dba8e98..57dfb3339 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">경험치</string>
   <string name="HP_default">체력</string>
   <string name="MP_default">마나</string>
-  <string name="ERR_pb_barcode">바코드에서 데이터를 가져오지 못했습니다</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">설정</string>
-  <string name="SP_address_hint">사용자 지정 서버</string>
-  <string name="SP_userID_title">유저 ID</string>
+    <string name="SP_userID_title">유저 ID</string>
   <string name="SP_userID_summary">본인의 유저 ID</string>
   <string name="SP_APIToken_title">API 토큰</string>
   <string name="SP_APIToken_summary">본인의 API 토큰</string>
   <string name="Language_title">언어</string>
   <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="PS_contact_title">연락처</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_reminder_header">매일 알림</string>
   <string name="pref_reminder_checkbox">알림 활성화 하기</string>
   <string name="pref_reminder_picker">알림 시간 설정</string>
   <string name="pref_cds_header">하루 시작 시간</string>
-  <string name="pref_cds_picker">하루 시작 시간 설정</string>
-  <string name="pref_push_notifications_checkbox">사용자 알림</string>
+    <string name="pref_push_notifications_checkbox">사용자 알림</string>
   <string name="push_notifications">푸쉬 알림</string>
   <string name="push_notifications_sum">푸쉬 알림 설정</string>
   <string name="preference_push_you_won_challenge">도전 과제에서 우승하였습니다!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">퀘스트가 시작되었음</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>
+    <string name="action_edit">수정</string>
+    <string name="action_cancel">취소</string>
   <string name="login_btn">로그인</string>
   <string name="register_btn">등록</string>
   <string name="username">유저아이디</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">암호 확인</string>
   <string name="logout">로그아웃</string>
   <string name="logout_description">계정 로그아웃</string>
-  <string name="account_details">계정 정보</string>
-  <string name="LoginActivityName">환영합니다</string>
-  <string name="string_revive">되살리기</string>
-  <string name="please_connect">위젯을 사용하기 전 앱을 연결해 주세요</string>
-  <string name="about.title">소개</string>
-  <string name="about.libraries">도서관</string>
-  <string name="about.versionhistory">버젼 내력</string>
-  <string name="about.habitica_open_source">Habitica는 Github를 통해 오픈소스로 공개되어 있습니다</string>
-  <string name="about.rate_our_app">앱 평가</string>
-  <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="LoginActivityName">환영합니다</string>
+    <string name="about_title">소개</string>
+  <string name="about_libraries">도서관</string>
+    <string name="about_habitica_open_source">Habitica는 Github를 통해 오픈소스로 공개되어 있습니다</string>
+  <string name="about_rate_our_app">앱 평가</string>
+  <string name="about_give_us_feedback">피드백을 보내주세요!</string>
+  <string name="about_bugreport">버그 신고</string>
+  <string name="about_source_code">소스코드</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">서버에 문제가 발생한 것 같습니다. 다시 시도해 주세요.</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_title">검증 오류</string>
   <string name="login_validation_error_fieldsmissing">모든 항목을 채워주셔야 합니다.</string>
   <string name="save_changes">저장</string>
   <string name="copy">복사</string>
   <string name="notes">노트</string>
-  <string name="text">내용</string>
-  <string name="difficulty">난이도</string>
+    <string name="difficulty">난이도</string>
   <string name="tags">태그</string>
   <string name="trivial">사소함</string>
   <string name="easy">쉬움</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">부정적 (-)</string>
   <string name="checklist">체크리스트</string>
   <string name="reminders">알림</string>
-  <string name="actions">행동</string>
-  <string name="attributes">속성</string>
-  <string name="physical">근력</string>
-  <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="attributes">속성</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>
@@ -120,23 +89,14 @@
   <string name="faint_header">체력이 모두 떨어졌어요!</string>
   <string name="faint_button">체력을 채우고 다시 도전하세요</string>
   <string name="filter">필터</string>
-  <string name="profile_image">프로필 사진</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">당신은 %1$s을 사용해 %2$d 마나를 얻었습니다.</string>
-  <string name="used_skill_without_mana">%1$s을(를) 사용했습니다.</string>
+    <string name="used_skill_without_mana">%1$s을(를) 사용했습니다.</string>
   <string name="new_checklist_item">새로운 체크리스트 항목</string>
-  <string name="add_checklist_item">더하기</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="unlock_lvl_11">레벨 11에 열림</string>
-  <string name="no_party_message">파티에 소속되어 있지 않습니다. 파티에 가입하려면 저희 홈페이지를 방문해주세요.</string>
-  <string name="forgot_pw_btn">암호 찾기</string>
-  <string name="tavern.inn.checkOut">일일과제 활성화</string>
-  <string name="tavern.inn.rest">일일과제 일시중지</string>
-  <string name="reward.dialog.buy">구매</string>
-  <string name="reward.dialog.dismiss">닫기</string>
+    <string name="unlock_lvl_11">레벨 11에 열림</string>
+    <string name="forgot_pw_btn">암호 찾기</string>
+  <string name="tavern.inn_checkOut">일일과제 활성화</string>
+  <string name="tavern.inn_rest">일일과제 일시중지</string>
+  <string name="reward.dialog_buy">구매</string>
+  <string name="reward.dialog_dismiss">닫기</string>
   <string name="party">파티</string>
   <string name="chat">채팅</string>
   <string name="members">멤버</string>
@@ -144,24 +104,20 @@
   <string name="dailies">일일과제</string>
   <string name="todos">해야 할 일</string>
   <string name="rewards">보상</string>
-  <string name="taskform.delete.title">확실합니까?</string>
-  <string name="taskform.delete.message">삭제하시겠습니까?</string>
-  <string name="yes">예</string>
+    <string name="yes">예</string>
   <string name="no">아니요</string>
   <string name="quest">퀘스트</string>
   <string name="avatar_body">몸</string>
   <string name="avatar_hair">머리</string>
   <string name="avatar_shirt">상의</string>
   <string name="avatar_skin">피부</string>
-  <string name="avatar_ears">동물 귀</string>
-  <string name="avatar_base">기본</string>
+    <string name="avatar_base">기본</string>
   <string name="avatar_color">색</string>
   <string name="avatar_beard">턱수염</string>
   <string name="avatar_mustache">콧수염</string>
   <string name="avatar_flower">꽃</string>
   <string name="avatar_bangs">앞머리</string>
-  <string name="avatar_nothing">세팅되지 않음</string>
-  <string name="avatar_size">체형</string>
+    <string name="avatar_size">체형</string>
   <string name="avatar_size_slim">날씬하게</string>
   <string name="avatar_size_broad">통통하게</string>
   <string name="avatar_background">배경</string>
@@ -170,23 +126,17 @@
   <string name="purchase_button">구매</string>
   <string name="purchase_set_title">%s 세트 구매</string>
   <string name="due_date">만기일</string>
-  <string name="quest.accept">승인</string>
-  <string name="quest.reject">거부</string>
-  <string name="quest.begin">퀘스트 시작</string>
-  <string name="quest.cancel">초대 취소</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>
-  <string name="quest.participants">참가자</string>
-  <string name="version_info">버젼 %1$s (%2$d)</string>
+  <string name="quest_accept">승인</string>
+  <string name="quest_reject">거부</string>
+  <string name="quest_begin">퀘스트 시작</string>
+  <string name="quest_cancel">초대 취소</string>
+  <string name="quest_abort">퀘스트 포기</string>
+    <string name="version_info">버젼 %1$s (%2$d)</string>
   <string name="sidebar_help">도움말 &amp; FAQ</string>
   <string name="complete_tutorial">네, 알겠어요!</string>
   <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_1_description">즐겁게 자기 할 일을 해보세요. 자기 계발중인%s명이 넘는 사람들과 함께 하나씩 일상 생활의 과제들을 해나가세요.</string>
   <string name="intro_2_subtitle">게임의 진전</string>
   <string name="intro_2_title">삶의 진전</string>
   <string name="intro_2_description">실제 삶에서의 일을 처리하는 것으로 게임의 특색들을 잠금해제 하세요. 목표를 달성해 갑옷, 펫, 그리고 더 많은 것들을 얻으세요.</string>
@@ -194,12 +144,9 @@
   <string name="intro_3_title">친목을 다지세요</string>
   <string name="intro_3_description">친구들의 도움으로 당신의 목표를 유지시키세요. 일상 생활과 전투에서 서로를 도와가며 함께 성장하세요!</string>
   <string name="intro_finish_button">시작합시다!</string>
-  <string name="previous_button">이전</string>
-  <string name="next_button">다음</string>
+    <string name="next_button">다음</string>
   <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="avatar_setup_description">자기 아바타가 어떻게 생기길 원하세요? 생김새는 나중에도 바꿀 수 있으니 걱정하지 마세요.</string>
   <string name="task_setup_description">잘했어요! 그럼 이제 이 여정을 통해 삶의 어떤 부분을 개선하고 싶은지 알아볼까요?</string>
   <string name="setup_group_work">일</string>
   <string name="setup_group_exercise">운동</string>
@@ -229,36 +176,20 @@
   <string name="setup_task_creativity_1">공예 배우기</string>
   <string name="setup_task_creativity_2">창의적인 활동 하기</string>
   <string name="setup_task_creativity_3">창의적인 과제 끝내기</string>
-  <string name="gem.purchase.support">Habitica가 계속되었으면 좋겠나요? 보석을 구매하여 개발자들을 지원해주세요. 보석들은 당신의 계정에 다양한 요소를 추가해줍니다. 예를들어:
-
-- 아바타를 위한 멋진 의상
-- 환상적인 배경들
-- 펫 알을 얻을 수 있는 재미있는 퀘스트들
-- 레벨 100 이전에 직업 변경 가능
-
-더 나은 Habitica를 만들 수 있도록 도와주셔서 감사합니다. 당신의 지원은 큰 의미로 다가옵니다!</string>
-  <string name="my_guilds">나의 길드</string>
+    <string name="my_guilds">나의 길드</string>
   <string name="public_guilds">열린 길드</string>
   <string name="guild">길드</string>
   <string name="leave">나가기</string>
   <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="gems">보석</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>
-  <string name="guild_search_hint">길드 검색</string>
-  <string name="todo_due">만기: %s</string>
-  <string name="daily_streak">현재 연속 콤보: %d</string>
-  <string name="todo_has_duedate">과제가 만기일이 있습니다</string>
-  <string name="battle_gear">전투 장비</string>
+    <string name="guild_search_hint">길드 검색</string>
+    <string name="battle_gear">전투 장비</string>
   <string name="costume">의상</string>
   <string name="outfit_head">머리</string>
   <string name="outfit_headAccessory">머리 장식</string>
@@ -271,10 +202,8 @@
   <string name="wear_costume">의상 입기</string>
   <string name="equipped">착용됨</string>
   <string name="quest_cancel_message">정말 이 퀘스트를 취소하시겠습니까? 모든 초대장과 승인들을 잃을 것입니다. 퀘스트 스크롤은 주인에게 돌아갑니다.</string>
-  <string name="quest.invitation">퀘스트 초대장</string>
-  <string name="quest_begin_message">정말 시작하실건가요? 파티원 %2$d명 중 %1$d명만 퀘스트에 참여했어요. 퀘스트는 모든 플레이어가 초대 수락 또는 거절 의사를 밝히면 자동으로 시작됩니다.</string>
-  <string name="quest.invitation.text">퀘스트에 초대받았습니다!</string>
-  <string name="today">오늘</string>
+    <string name="quest_begin_message">정말 시작하실건가요? 파티원 %2$d명 중 %1$d명만 퀘스트에 참여했어요. 퀘스트는 모든 플레이어가 초대 수락 또는 거절 의사를 밝히면 자동으로 시작됩니다.</string>
+    <string name="today">오늘</string>
   <string name="sidebar_items">아이템</string>
   <string name="eggs">알</string>
   <string name="hatching_potions">부화 물약</string>
@@ -285,13 +214,9 @@
   <string name="armoireEquipment">옷장에서 귀한 장비를 찾았습니다: %s! 대단해요!</string>
   <string name="armoireFood">당신은 옷장안에서  %1$s %2$s 를 발견합니다. 왜 이것들이 여기 들어있지?</string>
   <string name="armoireExp">당신은 옷장과 씨름하여 경험치를 얻었습니다. 맛 좀 봐라!</string>
-  <string name="armoireNotesFull">옷장을 열어 무작위로 장비, 경험치, 혹은 음식을 얻으세요! 남은 장비 부품: %d</string>
-  <string name="armoireLastItem">당신은 마지막 귀한 장비를 마법의 옷장에서 찾았습니다.</string>
-  <string name="armoireNotesEmpty">옷장에는 매달 첫째주에 새로운 장비가 들어있을 것입니다. 그때까지는 계속 클릭하여 경험치와 음식을 얻으세요!</string>
-  <string name="sell">팔기 (%d 골드)</string>
+    <string name="sell">팔기 (%d 골드)</string>
   <string name="hatch_with_potion">물약으로 알 부화</string>
-  <string name="feed_to_pet">펫 먹이주기</string>
-  <string name="hatch_egg">알 부화</string>
+    <string name="hatch_egg">알 부화</string>
   <string name="invite_party">파티에 초대</string>
   <string name="dialog_feeding">%s 에게 다음의 먹이 주기:</string>
   <string name="use_animal">사용</string>
@@ -301,17 +226,8 @@
   <string name="close">닫기</string>
   <string name="share">나누기</string>
   <string name="notification_pet_fed">%s 에게 먹이를 줬습니다!</string>
-  <string name="notification_purchase">%s 를 구매했습니다</string>
-  <string name="notification_purchase_reward">보상을 구매했습니다</string>
-  <string name="sectiondrop">기본 펫</string>
-  <string name="sectionpremium">마법물약 펫</string>
-  <string name="sectionquest">퀘스트 펫</string>
-  <string name="sectionspecial">희귀 펫</string>
-  <string name="sectionmounts">기본 탑승펫</string>
-  <string name="sectionpremiumMounts">마법 물약 탑승펫</string>
-  <string name="sectionquestMounts">퀘스트 탑승펫</string>
-  <string name="sectionspecialMounts">희귀 탑승펫</string>
-  <string name="world_quest">세계 퀘스트</string>
+    <string name="notification_purchase_reward">보상을 구매했습니다</string>
+    <string name="world_quest">세계 퀘스트</string>
   <string name="inn_description">쉬고 싶으세요\? 다니엘의 여관에 묵으면 Habitica를 일부 멈추어둘 수 있습니다:
 \n
 \n • 미완료 일일과제로 인한 피해를 입지 않습니다
@@ -330,8 +246,7 @@
   <string name="healer_description">힐러는 공격에 휘둘리지 않고 동료들을 보호해 줍니다. 놓친 일일과제와 나쁜 습관들은 그들에게 큰 피해를 입히지 못하고, 설령 실패를 하더라도 치료가 가능합니다. 파티원들을 도와주길 좋아하고 노력으로 죽음을 이겨내는 것이 매력적이라면 힐러를 추천합니다!</string>
   <string name="select_class">직업 고르기</string>
   <string name="opt_out_class">선택 유예</string>
-  <string name="opt_out_description">직업을 신경쓰고 싶지 않으신가요? 나중에 고르고 싶으시다고요? 선택유예 하세요 - 당신은 아무런 능력이 없는 전사가 되어있을 꺼에요. wiki를 방문하면 직업시스템에 대해서 자세히 알 수 있고, 이후에 언제라도 직업을 선택할 수 있습니다.</string>
-  <string name="class_confirmation">%s 가 되고싶은 것이 확실한가요?</string>
+    <string name="class_confirmation">%s 가 되고싶은 것이 확실한가요?</string>
   <string name="class_changed">%s가 되었습니다!</string>
   <string name="class_changed_description">장비 메뉴에서 교체할 수 있는 새로운 기본 전투 장비를 얻었습니다!</string>
   <string name="choose_class">직업 선택</string>
@@ -345,22 +260,17 @@
   <string name="invite_existing_users">등록된 사용자 초대</string>
   <string name="send">보내기</string>
   <string name="invite">친구 초대</string>
-  <string name="invite_id_description">Habitica를 이용하는 친구가 있다면, 유저 아이디를 입력하여 초대하세요.</string>
-  <string name="invite_email_description">친구가 당신이 보낸 이메일로 Habitica에 가입하면, 자동으로 당신의 파티에 초대됩니다!</string>
+    <string name="invite_email_description">친구가 당신이 보낸 이메일로 Habitica에 가입하면, 자동으로 당신의 파티에 초대됩니다!</string>
   <string name="add_invites">초대 더하기</string>
-  <string name="user_id">유저 ID</string>
-  <string name="email">이메일</string>
-  <string name="invite_users">파티 초대</string>
-  <string name="share_using">올리기</string>
+    <string name="email">이메일</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">일상생활의 과제들을 달성하여 %1$s 탈것을 얻었어요!</string>
   <string name="open_in_store">플레이스토어로 열기</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="confirm">확인</string>
   <string name="market">시장</string>
   <string name="timeTravelers">시간 여행자들</string>
   <string name="seasonalShop">계절 상점</string>
@@ -368,37 +278,16 @@
   <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>
-  <string name="hourglass">모래시계</string>
-  <string name="hourglasses">모래시계</string>
-  <string name="gold_singular">골드</string>
-  <string name="gold_plural">골드</string>
+    <string name="successful_purchase">%1$s을(를) 구매함</string>
+    <string name="gold_plural">골드</string>
   <string name="chat_message_copied">메시지를 클립보드에 복사했음</string>
-  <string name="copy_chat_message">클립보드로 복사함</string>
-  <string name="edit_tag_title">태그 편집</string>
-  <string name="edit_tag_btn_edit">편집</string>
-  <string name="edit_tag_btn_done">완료</string>
-  <string name="edit_tag_btn_delete">삭제</string>
-  <string name="confirm_delete_tag_title">정말이요?</string>
+    <string name="edit_tag_btn_edit">편집</string>
+    <string name="confirm_delete_tag_title">정말이요?</string>
   <string name="confirm_delete_tag_message">정말 삭제할까요?</string>
-  <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>
-  <string name="send_new_message">새 메시지 보내기</string>
-  <string name="choose_recipient_title">메시지 받는 사람 선택</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">메시지 받는 사람 선택</string>
   <string name="action_continue">계속</string>
-  <string name="scan_qr_code">QR 코드 스캔</string>
-  <string name="enter_recipient_uuid">받는 사람의 사용자 ID 입력</string>
-  <string name="invited_to_party">파티에 참가를 초대 받았습니다!</string>
+    <string name="invited_to_party">파티에 참가를 초대 받았습니다!</string>
   <string name="stats_widget_label">Habitica 통계</string>
   <string name="add_task">과제 추가</string>
   <string name="add_habit">습관 추가</string>
@@ -409,15 +298,14 @@
   <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">구글 플레이 서비스를 찾을 수 없습니다.</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="google_services_missing">구글 플레이 서비스를 찾을 수 없습니다.</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>
@@ -431,32 +319,32 @@
   <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_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="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골드에 판매합니다!
+  <string name="subscribe.listitem1_description">이제부터 상인 알렉산더가 보석을 개당 20골드에 판매합니다!
 \n
 \n처음에는 매달 구비량이 한 달에 25개로 제한되어 있지만, 후원 기간에 따라 올라갈 수 있습니다.
 \n
 \n연속 정기후원 3개월마다 보석 제한개수가 5개씩, 최대 월 50개까지 올라갑니다!</string>
-  <string name="subscribe.listitem2.description">매달 당신의 아바타를 위한 독특한 의상 아이템을 드립니다!
+  <string name="subscribe.listitem2_description">매달 당신의 아바타를 위한 독특한 의상 아이템을 드립니다!
 \n
 \n더불어, 정기 후원을 해주시는 매 3달마다, 미스터리 시간 여행자가 전통적인 (그리고 미래지향적인!) 꾸미기 아이템을 소개해 줄 겁니다.</string>
-  <string name="subscribe.listitem3.description">완료한 할 일과 과제 기록이 더 오래 남습니다.</string>
-  <string name="subscribe.listitem4.description">드롭 제한 두 배로 인하여 매일 과제를 수행하며 펫 컬렉션 완성을 도울 더 많은 아이템을 얻을 수 있습니다!</string>
+  <string name="subscribe.listitem3_description">완료한 할 일과 과제 기록이 더 오래 남습니다.</string>
+  <string name="subscribe.listitem4_description">드롭 제한 두 배로 인하여 매일 과제를 수행하며 펫 컬렉션 완성을 도울 더 많은 아이템을 얻을 수 있습니다!</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">구독을 취소하고 싶으신가요\? 구글 플레이 스토어의 \"내 애플리케이션\" 메뉴에 구독취소 옵션이 있습니다.</string>
-  <string name="cancel_subscription_notgoogle.description">더 이상 구독하고 싶지 않으세요\? 결제 수단으로 인해 웹사이트에서만 취소가 가능합니다. 아래 버튼을 클릭하면, 브라우저에서 사이트가 열립니다!</string>
+  <string name="cancel_subscription_google_description">구독을 취소하고 싶으신가요\? 구글 플레이 스토어의 \"내 애플리케이션\" 메뉴에 구독취소 옵션이 있습니다.</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>
@@ -471,50 +359,35 @@
   <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_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>
-  <string name="daily">일일과제</string>
+    <string name="daily">일일과제</string>
   <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="challenge">도전</string>
+    <string name="not_part_of_a_challenge">현재 아무 도전에도 참여하지 않고 있습니다!</string>
   <string name="join_a_challenge">도전에 참여해서 잘 짜여진 과제 목록을 더하고, 다른 해비티칸들과 함께 경쟁해서 업적 달성도 하고 보석도 받을 수 있는 기회를 얻으세요!</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">개발자 옵션 \\"활동을 보관하지 마세요\\"가 활성화 된 것 같습니다. 현재이 옵션을 사용하면 habitica 앱에 문제가 발생하므로 사용하지 않는 것이 좋습니다.</string>
-  <string name="inbox">메세지</string>
-  <string name="FAQ">자주 묻는 질문</string>
-  <string name="special">스페셜</string>
+    <string name="inbox">메세지</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="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="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="groups">그룹</string>
   <string name="all">전체</string>
   <string name="none">None</string>
   <string name="owned">보유중</string>
@@ -554,18 +427,16 @@
     <string name="ago_minutes">%d분 전</string>
     <string name="ago_hours">%d시간 전</string>
     <string name="ago_1hour">1시간 전</string>
-    <string name="evolved_pet_title">%1$s %2$s를 길들였습니다, 타러 가요!</string>
+    <string name="evolved_pet_title">%s를 길들였습니다, 타러 가요!</string>
     <string name="warrior_description">전사는 치명타를 더 많이 세게 적중시켜서 과제 달성시 보너스 골드, 경험치, 그리고 아이템 획득 확률이 올라갑니다. 보스 몬스터에게도 더 강한 피해를 줍니다. 예측하기 힘들지만 대박 보상이나 보스 퀘스트에서 활약하는 것을 좋아하신다면 전사를 추천합니다!</string>
     <string name="opting_out_progress">선택유예 중</string>
     <string name="invite_username_description">Habitica를 이용하는 친구가 있다면, 유저아이디를 입력하여 초대하세요.</string>
     <string name="subscription_duration_norenew">%s 에</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="subscribe1month_gemcap">보석 한도 25개</string>
+    <string name="subscribe3month_gemcap">보석 한도 30개</string>
+    <string name="subscribe6month_gemcap">보석 한도 35개</string>
+    <string name="subscribe12month_gemcap">보석 한도 45개</string>
     <string name="due">아직 안한 일</string>
-    <string name="new_game">새
-\n게임</string>
     <string name="welcome_text">아, 새로운 모험가인가 보군요. 저는 저스틴이에요, 당신을 위해 Habitica 가이드가 되어드리죠.
 \n
 \n먼저, 뭐라고 불러야 할까요\? 제가 일단 정해보긴 했는데 원하는대로 바꿔보세요. 준비가 되었으면, 아바타를 꾸며봅시다!</string>
@@ -577,7 +448,6 @@
     <string name="maintenance">점검</string>
     <string name="dailyDueDefaultView">일일과제를 \'아직 안한 일\'부터 보기</string>
     <string name="dailyDueDefaultViewDescription">이 옵션을 설정하시면, 일일과제를 볼 때 \'전체\' 대신 \'아직 안한 일\'부터 나타납니다</string>
-    <string name="repeat_summary">%2$s %3$s마다 %1$s %4$s에 반복</string>
 
     <string name="no_billing_gems">현 기기에 사용 가능한 결제수단이 없습니다. 보석을 구매하시려면 habitica 웹사이트를 이용하세요.</string>
     <string name="no_billing_subscriptions">현 기기에 사용 가능한 결제수단이 없습니다. 정기후원을 하시려면 habitica 웹사이트를 이용하세요.</string>
@@ -586,7 +456,6 @@
     <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>
@@ -597,40 +466,34 @@
     <string name="new_challenge_title">새로운 도전 제목</string>
     <string name="ownership">소유자</string>
     <string name="inn">여관</string>
-    <string name="system">시스템</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_leader_header">%s 이/가 시작</string>
     <string name="quest_abort_message">정말로 이 퀘스트를 중단하시겠습니까\? 파티 전체가 퀘스트를 중단하게 되고 지금까지 진행했던 것이 다 날아갑니다. 퀘스트 두루마리는 퀘스트 주인에게 돌아갑니다.</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="available_until">%s 까지 유효</string>
+    <string name="gems_left_max">월별 구매 한도: %1$d/%2$d 남음</string>
+    <string name="gems_left_nomax">월별 구매 한도: %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_reward_count">%1$s x%2$d</string>
+    <string name="experience_reward">%d 경험치</string>
+    <string name="gold_reward">%d 골드</string>
     <string name="quest_owner_rewards">퀘스트 주인 보상</string>
     <string name="str_abbrv">Str</string>
     <string name="per_abbrv">Per</string>
@@ -646,7 +509,6 @@
     <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>
@@ -680,7 +542,6 @@
     <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>
@@ -702,7 +563,7 @@
     <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="points_to_allocate">%d 포인트 배분 가능</string>
     <string name="distribute_evenly_help">각 스탯에 동등한 수의 포인트를 분배합니다.</string>
     <string name="distribute_class_help">직업에 중요한 스탯에 더 많은 포인트를 배분합니다.</string>
     <string name="distribute_task_help">완료한 과제와 연관된 근력, 지력, 생명력, 관찰력 부분에 포인트를 더합니다.</string>
@@ -713,8 +574,6 @@
     <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>
@@ -729,19 +588,12 @@
     <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">이 게이지는 Habitica 주민들이 일일과제를 수행하지 못했을 때 채워집니다. 게이지가 다 차면 상심보스가 충격의 비통함으로 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_title">%s 이(가) 공격받았습니다!</string>
     <string name="strike_active_description" formatted="false">우리의 %s는 %s가 %s를 산산조각 내서 엄청난 충격을 받았습니다. 어서 과제를 수행해서 괴물을 물리치고 재건할 수 있게 도와주세요!!</string>
     <string name="questShop">퀘스트 상점</string>
     <string name="market_owner_long">상인 알렉스</string>
@@ -752,7 +604,6 @@
     <string name="join_party_title">파티에 참여하고 싶으신가요\?</string>
     <string name="no_party_title">파티에 참여해서 해비티카를 이용하세요</string>
     <string name="join_party_description">파티 구성원이 당신을 초대할 수 있도록 아래에 있는 당신의 유저아이디를 그들에게 보내주세요</string>
-    <string name="create_party_website">파티를 만들려면 웹사이트에 접속하세요</string>
     <string name="world_boss_description_title">월드 보스가 무엇인가요\?</string>
     <string name="world_boss_description_intro">월드보스는 해비티카 구성원 전체가 참여하여 자신의 할 일들로 강력한 몬스터를 쓰러뜨리는 특별 이벤트입니다!</string>
     <string name="world_boss_description_1">보스 몬스터에게 피해를 주기 위해 할 일들을 완료하세요</string>
@@ -772,14 +623,12 @@
     <string name="total_checkins">전체 접속 수</string>
     <string name="two_handed">양 손</string>
     <string name="usernamePromptTitle">당신의 유저아이디를 설정할 차례입니다!</string>
-    <string name="usernamePromptWiki">이 변경된 사항에 대해 더 알고 싶다면, <a href="https://habitica.wikia.com/wiki/Player_Names">저희 위키백과를 참고해 주세요.</a></string>
-    <string name="confirmUsername">유저아이디 저장</string>
+    <string name="usernamePromptWiki">이 변경된 사항에 대해 더 알고 싶다면, <a href="https://habitica.wikia_com/wiki/Player_Names">저희 위키백과를 참고해 주세요.</a></string>
     <string name="confirm_username_title">정말로 현재 유저아이디를 저장하시겠습니까\?</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="username_copied">유저아이디가 클립보드에 복사되었습니다</string>
     <string name="welcomeNameTitle">당신을 어떻게 불러드릴까요\?</string>
     <string name="display_name_length_error">이름은 1~30글자 사이로 만들어주세요</string>
@@ -789,25 +638,15 @@
     <string name="create_party">파티 만들기</string>
 
 <string name="no_party_description">친구들과 함께 혹은 혼자 퀘스트 수행을 해봐요. 파티를 통해 몬스터와 싸우고, 도전을 시작하고, 책임감을 유지할 수 있게 스스로를 도와주세요.</string>
-    <string name="join_party_description_id">파티에 초대를 할 때 유저 ID를 알려주거나 QR코드를 스캔하게 해주세요</string>
-    <string name="id_copied">ID가 복사되었습니다</string>
     <string name="insufficientSubscriberGems">이번 달에 살 수 있는 보석을 모두 구입했습니다. 매달 첫 3일 안에 더 구입할 수 있도록 재충전이 됩니다. 후원해주셔서 감사해요!</string>
-    <string name="insufficientSubscriberGemsTitle">월별 보석 한도에 도달했습니다</string>
-    <string name="chat_message">채팅 메세지</string>
-    <string name="world_boss_description_description">월드보스는 해비티카 구성원 전체가 참여하여 자신의 할 일들로 강력한 몬스터를 쓰러뜨리는 특별 이벤트입니다!
-\n보스 몬스터에게 피해를 주기 위해 할 일들을 완료하세요.
-\n과제를 거르면 보스가 당신에게 직접 피해를 주지는 않지만, 분노 게이지가 올라갑니다. 게이지가 다 차면, 보스 몬스터가 상점 주인들 중 한명을 공격할 것입니다!
-\n주막에서 보스와 분노 공격 현황을 확인하세요</string>
     <string name="world_boss_description_3">평소의 퀘스트 보스도 함께 피해를 입기 때문에 동시에 진행할 수 있습니다</string>
     <string name="world_boss_description_4">주막에서 보스와 분노 공격 현황을 확인하세요</string>
-    <string name="world_boss_action_prompt" formatted="false">보스를 쓰러뜨려 특별 보상을 받고 %s의 공포로부터 Habitica를 구해주세요!</string>
-    <string name="world_boss_description_subtitle">%s가 공격합니다!</string>
+    <string name="world_boss_action_prompt">보스를 쓰러뜨려 특별 보상을 받고 %s의 공포로부터 Habitica를 구해주세요!</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="public_challenge">공개 도전</string>
@@ -827,7 +666,7 @@
     <string name="week_reminder_title">과제 실행은 잘 되고 있나요\?</string>
     <string name="week_reminder_text">휴식은 당연히 몸에 좋지만, 간단한 활동도 병행하면 포인트를 벌어 레벨업을 하고 멋진 장비를 얻을 수 있습니다!</string>
     <string name="usernamePromptBody">이제 로그인 네임은 본인의 유일한 유저아이디로써 닉네임 옆에 표시되며, 초대할 때나 채팅에서 @로 언급할 때, 그리고 메세지를 보낼 때에 사용됩니다.</string>
-    <string name="usernamePromptDisclaimer">유저아이디는 <a href="https://habitica.com/static/terms">이용 약관</a>과 <a href="https://habitica.com/static/community-guidelines">커뮤니티 방침</a>에 따라야 합니다. 전에 로그인 네임을 따로 설정한 적이 없다면 자동으로 생성됩니다.</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_description">유저아이디를 저장하면 초대, @언급 그리고 메세지를 주고 받을 때 공개적으로 사용하게 됩니다. 언제든디 설정에서 유저아이디를 바꾸실 수 있습니다.</string>
     <string name="enter_recipient_username">받는 사람의 @ 유저아이디를 입력하세요</string>
     <string name="verification_pet">확인 절차를 마치고나면 여기 베테랑 펫 중 하나가 당신을 기다리고 있을 겁니다!</string>
@@ -846,8 +685,8 @@
     <string name="gift_subscription_subtitle">선물하고 싶은 정기구독 서비스를 선택하세요! 이 구매는 자동으로 연장되지 않습니다.</string>
     <string name="send_gift">선물하기</string>
     <string name="server">서버</string>
-    <string name="gift_confirmation_title">선물이 전달되었습니다!</string>
-    <string name="gift_confirmation_text_g1g1">하나 주고 하나 받기 이벤트를 통해 %s에게 %s-개월 Habitica 정기구독을 선물하였고 같은 기간의 구독 혜택이 본인에게도 적용되었습니다!</string>
+    <string name="gift_confirmation_title" formatted="false">선물이 전달되었습니다!</string>
+    <string name="gift_confirmation_text_g1g1" formatted="false">하나 주고 하나 받기 이벤트를 통해 %s에게 %s-개월 Habitica 정기구독을 선물하였고 같은 기간의 구독 혜택이 본인에게도 적용되었습니다!</string>
     <string name="gift_confirmation_text">%s에게 %s-개월 Habitica 구독서비스가 전달되었습니다.</string>
     <string name="discover">찾아보기</string>
     <string name="damage_paused">피해 동결 중</string>
diff --git a/Habitica/res/values-land/bools.xml b/Habitica/res/values-land/bools.xml
index 4ca4f8d62..a6b3daec9 100644
--- a/Habitica/res/values-land/bools.xml
+++ b/Habitica/res/values-land/bools.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="is_portrait_mode">false</bool>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-land/dimens.xml b/Habitica/res/values-land/dimens.xml
index 10d607e5f..a6b3daec9 100644
--- a/Habitica/res/values-land/dimens.xml
+++ b/Habitica/res/values-land/dimens.xml
@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<dimen name="PB_marginBottom">-10dp</dimen>
-	<dimen name="new_task_bar_size">38dp</dimen>
-	<dimen name="new_task_bat_btn_width">50dp</dimen>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-lt/strings.profile.xml b/Habitica/res/values-lt/strings.profile.xml
index 1a324e558..4f2f467b1 100644
--- a/Habitica/res/values-lt/strings.profile.xml
+++ b/Habitica/res/values-lt/strings.profile.xml
@@ -8,11 +8,8 @@
     <string name="profile_level">Lygis:</string>
     <string name="profile_class_bonus">Klasės-Bonusai:</string>
     <string name="profile_allocated">Priskirta:</string>
-    <string name="profile_boosts">Sustiprinimai:</string>
     <string name="profile_private_message">Privati Žinutė</string>
     <string name="profile_loading_data">Įkeliami narių duomenys ...</string>
     <string name="profile_achievements">Pasiekimai</string>
-    <string name="profile_achievement_ok">Gerai</string>
-    <string name="profile_qrcode_close">Uždaryti</string>
 
 </resources>
diff --git a/Habitica/res/values-lt/strings.sidebar.xml b/Habitica/res/values-lt/strings.sidebar.xml
index 1be85aca0..5637382ef 100644
--- a/Habitica/res/values-lt/strings.sidebar.xml
+++ b/Habitica/res/values-lt/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Užduotys</string>
-  <string name="sidebar.skills">Sugebėjimai</string>
-  <string name="sidebar.section.social">Bendruomenė</string>
-  <string name="sidebar.tavern">Smuklė</string>
-  <string name="sidebar.party">Grupė</string>
-  <string name="sidebar.purchaseGems">Pirkti Brangakmenius</string>
-  <string name="sidebar.guilds">Gildijos</string>
-  <string name="sidebar.challenges">Iššūkiai</string>
-  <string name="sidebar.section.inventory">Inventorius</string>
-  <string name="sidebar.avatar">Veikėjas</string>
-  <string name="sidebar.equipment">Apranga</string>
-  <string name="sidebar.stable">Augintiniai</string>
-  <string name="sidebar.news">Naujienos</string>
-  <string name="sidebar.settings">Nustatymai</string>
-  <string name="sidebar.about">Apie</string>
+  <string name="sidebar_tasks">Užduotys</string>
+  <string name="sidebar_skills">Sugebėjimai</string>
+  <string name="sidebar.section_social">Bendruomenė</string>
+  <string name="sidebar_tavern">Smuklė</string>
+  <string name="sidebar_party">Grupė</string>
+  <string name="sidebar_purchaseGems">Pirkti Brangakmenius</string>
+  <string name="sidebar_guilds">Gildijos</string>
+  <string name="sidebar_challenges">Iššūkiai</string>
+  <string name="sidebar.section_inventory">Inventorius</string>
+  <string name="sidebar_avatar">Veikėjas</string>
+  <string name="sidebar_equipment">Apranga</string>
+  <string name="sidebar_stable">Augintiniai</string>
+  <string name="sidebar_news">Naujienos</string>
+    <string name="sidebar_about">Apie</string>
   <string name="sidebar_shops">Parduotuvės</string>
-<string name="sidebar.inbox">Žinutės</string>
+<string name="sidebar_inbox">Žinutės</string>
     <string name="sidebar_stats">Statistika</string>
 </resources>
diff --git a/Habitica/res/values-lt/strings.tutorial.xml b/Habitica/res/values-lt/strings.tutorial.xml
index 1529bf298..982c86dc4 100644
--- a/Habitica/res/values-lt/strings.tutorial.xml
+++ b/Habitica/res/values-lt/strings.tutorial.xml
@@ -1,10 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_equipment">Tavo perkami įrankiai atsiras čia. Tavo Kovinė Apranga keičia tavo statistiką, ir tavo Kostiumas (jei įjungtas) keičia tavo veikėjo išvaizdą.</string>
-  <string name="tutorial_items">Rask lobius atliekant užduotis ir keliant veikėjo lygį. Paspausk ant lobio, kad jį panaudoti!</string>
-  <string name="tutorial_pets">Darant savo gyvenimo užduotis, turi šansą rasti kiaušinius ir eliksyrus. Maišant juos gali išauginti gyvūnėlius.</string>
-  <string name="tutorial_skills">Sugebėjimai turi stiprius efektus! Paspausk ant sugebėjimo ir tavo veikėjas jį panaudos. Tai kainos Magijos taškų (mėlyna juosta), kuriuos užsidirbi prisijungęs kiekvieną dieną ir atliekant savo užduotis. DUK meniu gali rasti daugiau informacijos!</string>
+    <string name="tutorial_skills">Sugebėjimai turi stiprius efektus! Paspausk ant sugebėjimo ir tavo veikėjas jį panaudos. Tai kainos Magijos taškų (mėlyna juosta), kuriuos užsidirbi prisijungęs kiekvieną dieną ir atliekant savo užduotis. DUK meniu gali rasti daugiau informacijos!</string>
   <string name="tutorial_party">Tai yra vieta, kur tu ir tavo draugai galite vienas kitą palaikyti ir taip atsakingai siekti savo tikslų kovodami su pabaisomis ir savo užduotimis!</string>
   <string name="tutorial_tavern">Sveiki atvykę į Smuklę, viešą, visiem amžiams tinkantį pokalbių kambarį! Čia galite šnekėti apie produktyvumą ir užduoti klausimus vieni kitiems. Sėkmės!</string>
-  <string name="tutorial_classes">Pasirink ar nori tapti Kariu, Magu, Gydytoju ar Sukčiumi! Kiekviena klasė turi savo aprangą ir sugebėjimus. Paspausk (?), kad sužinoti daugiau!</string>
 </resources>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index 5f502b844..1577368b6 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -4,18 +4,15 @@
   <string name="XP_default">Partirtis</string>
   <string name="HP_default">Gyvybingumas</string>
   <string name="MP_default">Magijos Taškai</string>
-  <string name="ERR_pb_barcode">Nepavyko nuskaityti nustatymų iš brūkšninio kodo</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Nustatymai</string>
-  <string name="SP_address_hint">Tavo nuosavas serveris</string>
-  <string name="SP_userID_title">Vartotojo ID</string>
+    <string name="SP_userID_title">Vartotojo ID</string>
   <string name="SP_userID_summary">Tavo Vartotojo Identifikacijos Kodas</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Tavo API Token</string>
   <string name="Language_title">Kalba</string>
   <string name="Language_summary">Pakeisti Habitica kalbą</string>
-  <string name="SP_user_qr_code">Tavo QR Kodas</string>
-  <string name="PS_contact_title">Susisiekti</string>
+    <string name="PS_contact_title">Susisiekti</string>
   <string name="pref_account_header">Paskyra</string>
   <string name="pref_first_day_of_the_week_title">Pirma Savaitės Diena</string>
   <string name="pref_first_day_of_the_week_summary">Pirma savaitės diena visuose kalendoriuose</string>
@@ -23,8 +20,7 @@
   <string name="pref_reminder_checkbox">Įjungti Priminimą</string>
   <string name="pref_reminder_picker">Nustatyti Priminimo Laiką</string>
   <string name="pref_cds_header">Tinkinta dienos pradžia</string>
-  <string name="pref_cds_picker">Nustatyti tinkintą dienos pradžios laiką</string>
-  <string name="pref_push_notifications_checkbox">Aktyvūs Vartotojo Pranešimai</string>
+    <string name="pref_push_notifications_checkbox">Aktyvūs Vartotojo Pranešimai</string>
   <string name="push_notifications">Aktyvūs Pranšimai</string>
   <string name="push_notifications_sum">Iškylančių pranešimų nustatymai</string>
   <string name="preference_push_you_won_challenge">Laimėjai Iššūkį!</string>
@@ -36,10 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Tavo Misija Prasidėjo</string>
   <string name="preference_push_invited_to_quest">Pakvietimas į Misiją</string>
   <!--Adding tasks-->
-  <string name="task_value">Reikšmė</string>
-  <string name="action_edit">Keisti</string>
-  <string name="action_delete">Ištrinti</string>
-  <string name="action_cancel">Atšaukti</string>
+    <string name="action_edit">Keisti</string>
+    <string name="action_cancel">Atšaukti</string>
   <string name="login_btn">Prisijungti</string>
   <string name="register_btn">Registruotis</string>
   <string name="username">Vartotojo Vardas</string>
@@ -49,31 +43,23 @@
   <string name="confirmpassword">Patvirtinti slaptažodį</string>
   <string name="logout">Atsijungti</string>
   <string name="logout_description">Atsijungti nuo paskyros</string>
-  <string name="account_details">Paskyros Duomenys</string>
-  <string name="LoginActivityName">Sveiki</string>
-  <string name="string_revive">Prisikelti</string>
-  <string name="please_connect">Prašome prisijungti su programa prieš naudojant valdiklį</string>
-  <string name="about.title">Apie</string>
-  <string name="about.libraries">Bibliotekos</string>
-  <string name="about.versionhistory">Versijos istorija</string>
-  <string name="about.habitica_open_source">Habitica pasiekiam kaip atviro kodo programa Github\'e</string>
-  <string name="about.rate_our_app">Įvertink Programėlę</string>
-  <string name="about.give_us_feedback">Siųsk Atsiliepimus!</string>
-  <string name="about.bugreport">Pranešk apie Klaidą</string>
-  <string name="about.source_code">Pirminis Kodas</string>
+    <string name="LoginActivityName">Sveiki</string>
+    <string name="about_title">Apie</string>
+  <string name="about_libraries">Bibliotekos</string>
+    <string name="about_habitica_open_source">Habitica pasiekiam kaip atviro kodo programa Github\'e</string>
+  <string name="about_rate_our_app">Įvertink Programėlę</string>
+  <string name="about_give_us_feedback">Siųsk Atsiliepimus!</string>
+  <string name="about_bugreport">Pranešk apie Klaidą</string>
+  <string name="about_source_code">Pirminis Kodas</string>
   <!--Network Errors-->
-  <string name="network_error_title">Prisijungimo Klaida</string>
-  <string name="network_error_no_network_body">Tu nesi prisijungęs(us) prie interneto.</string>
-  <string name="internal_error_api">Kažkas negerai su serveriu. Bandykite vėliau.</string>
+    <string name="internal_error_api">Kažkas negerai su serveriu. Bandykite vėliau.</string>
   <string name="authentication_error_title">Prisijungimo Klaida</string>
-  <string name="authentication_error_body">Tavo Vartotojo Vardas ir/ar Slaptažodis neteisingas(i).</string>
-  <string name="login_validation_error_title">Patvirtinimo Klaida</string>
+    <string name="login_validation_error_title">Patvirtinimo Klaida</string>
   <string name="login_validation_error_fieldsmissing">Turi užpildyti visus laukelius.</string>
   <string name="save_changes">Išsaugoti</string>
   <string name="copy">Kopijuoti</string>
   <string name="notes">Užrašai</string>
-  <string name="text">Tekstas</string>
-  <string name="difficulty">Sunkumas</string>
+    <string name="difficulty">Sunkumas</string>
   <string name="tags">Žymės</string>
   <string name="trivial">Labai Lengva</string>
   <string name="easy">Lengva</string>
@@ -84,12 +70,8 @@
   <string name="negative_habit_form">Neigiamas ( - )</string>
   <string name="checklist">Sąrašas</string>
   <string name="reminders">Priminimai</string>
-  <string name="actions">Veiksmai</string>
-  <string name="attributes">Savybės</string>
-  <string name="frequency">Dažnumas</string>
-  <string name="frequency_weekly">Specifinėmis Savaitės Dienomis</string>
-  <string name="frequency_daily">Kas X Dienų</string>
-  <string name="monday">Pirmadienis</string>
+    <string name="attributes">Savybės</string>
+    <string name="monday">Pirmadienis</string>
   <string name="tuesday">Antradienis</string>
   <string name="wednesday">Trečiadienis</string>
   <string name="thursday">Ketvirtadienis</string>
@@ -101,47 +83,34 @@
   <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>
-  <string name="profile_image">Profilis Paveikslėlis</string>
-  <string name="mana_price_button">%d Magijos Taškai</string>
-  <string name="used_skill">Panaudojai [%1$s] už %2$d magijos taškus.</string>
-  <string name="used_skill_without_mana">Panaudojai %1$s.</string>
+    <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="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>
-  <string name="flag_confirm">Žymėti Žinutę</string>
-  <string name="unlock_lvl_11">Atsidengia pasiekus 11 lygį</string>
-  <string name="no_party_message">Tu nesi grupėje. Norėdama(s) prisidėti prie grupės, apsilankyk svetainėje.</string>
-  <string name="forgot_pw_btn">Pamiršau Slaptažodį</string>
-  <string name="tavern.inn.checkOut">Atnaujinti Kasdienes Užduotis</string>
-  <string name="tavern.inn.rest">Sustabdyti Kasdienes Užduotis</string>
-  <string name="reward.dialog.buy">Pirkti</string>
-  <string name="reward.dialog.dismiss">Atšaukti</string>
+    <string name="unlock_lvl_11">Atsidengia pasiekus 11 lygį</string>
+    <string name="forgot_pw_btn">Pamiršau Slaptažodį</string>
+  <string name="tavern.inn_checkOut">Atnaujinti Kasdienes Užduotis</string>
+  <string name="tavern.inn_rest">Sustabdyti Kasdienes Užduotis</string>
+  <string name="reward.dialog_buy">Pirkti</string>
+  <string name="reward.dialog_dismiss">Atšaukti</string>
   <string name="party">Grupė</string>
   <string name="chat">Pokalbiai</string>
   <string name="members">Nariai</string>
   <string name="habits">Įpročiai</string>
   <string name="dailies">Kasdienės</string>
   <string name="rewards">Atlygiai</string>
-  <string name="taskform.delete.title">Ar esi įsitikinęs(us)?</string>
-  <string name="taskform.delete.message">Ar tikrai nori ištrinti?</string>
-  <string name="yes">Taip</string>
+    <string name="yes">Taip</string>
   <string name="no">Ne</string>
   <string name="quest">Misija</string>
   <string name="avatar_body">Kūnas</string>
   <string name="avatar_hair">Plaukai</string>
   <string name="avatar_shirt">Marškinėliai</string>
   <string name="avatar_skin">Oda</string>
-  <string name="avatar_ears">Gyvūnų Ausys</string>
-  <string name="avatar_base">Pagrindas</string>
+    <string name="avatar_base">Pagrindas</string>
   <string name="avatar_color">Spalva</string>
   <string name="avatar_beard">Barzda</string>
   <string name="avatar_mustache">Ūsai</string>
   <string name="avatar_flower">Gėlytė</string>
   <string name="avatar_bangs">Kirpčiukai</string>
-  <string name="avatar_nothing">Nenustatyta</string>
-  <string name="avatar_size">Dydis</string>
+    <string name="avatar_size">Dydis</string>
   <string name="avatar_size_slim">Plonas</string>
   <string name="avatar_size_broad">Stambus</string>
   <string name="avatar_background">Fonas</string>
@@ -150,27 +119,19 @@
   <string name="purchase_button">Pirkti</string>
   <string name="purchase_set_title">Pirkti rinkinį %s</string>
   <string name="due_date">Baigimo Terminas</string>
-  <string name="quest.accept">Sutikti</string>
-  <string name="quest.reject">Atmesti</string>
-  <string name="quest.begin">Pradėti Misiją</string>
-  <string name="quest.cancel">Atšaukti Pakvietimą</string>
-  <string name="quest.abort">Atšaukti Misiją</string>
-  <string name="quest.leave">Palikti Misiją</string>
-  <string name="quest.pending">Laukiama</string>
-  <string name="quest.accepted">Sutiko</string>
-  <string name="quest.rejected">Atsisakė</string>
-  <string name="quest.participants">Dalyviai</string>
-  <string name="version_info">Versija: %1$s (%2$d)</string>
+  <string name="quest_accept">Sutikti</string>
+  <string name="quest_reject">Atmesti</string>
+  <string name="quest_begin">Pradėti Misiją</string>
+  <string name="quest_cancel">Atšaukti Pakvietimą</string>
+  <string name="quest_abort">Atšaukti Misiją</string>
+    <string name="version_info">Versija: %1$s (%2$d)</string>
   <string name="sidebar_help">Pagalba &amp; DUK</string>
   <string name="complete_tutorial">Supratau!</string>
   <string name="dismiss_tutorial">Priminti man vėliau</string>
   <string name="intro_3_description">Sek savo tikslus pasitelkęs draugų pagalbą. Padėkit vienas kitam gyvenime kartu kovodami su pabaisomis!</string>
-  <string name="previous_button">Praeitas</string>
-  <string name="next_button">Kitas</string>
+    <string name="next_button">Kitas</string>
   <string name="skip_button">Praleisti</string>
-  <string name="setup_welcome_description">Sveiki užsukę į Habitica, kur tobulėjimas žaidime padės jums tobulėti gyvenime! Kai siekiate gyvenimo tikslų, gausite aprangos, įrankių, augintinių, misijų ir daugiau.</string>
-  <string name="setup_welcome_title">Sveiki</string>
-  <string name="setup_group_work">Darbas</string>
+    <string name="setup_group_work">Darbas</string>
   <string name="setup_group_exercise">Sportas</string>
   <string name="setup_group_school">Mokslai</string>
   <string name="setup_group_teams">Komandos</string>
@@ -197,27 +158,19 @@
   <string name="setup_task_creativity_1">Mokytis amato</string>
   <string name="setup_task_creativity_2">Dirbti prie kūrybinio projekto</string>
   <string name="setup_task_creativity_3">Baigti kūrybinį projektą</string>
-  <string name="gem.purchase.support">Nori padėti Habitica gyvuoti? Gali paremti programuotojus perkant brangakmenius!\n\nBrangakmeniai leidžia pirkti smagius priedus savo paskyrai, pvz: \n\n - Smagūs kostiumai tavo veikėjui\n - Nepakartojami fonai\n - Smagios misijos, kuriose galima rasti kiaušinių\n - Galimybė pasikeisti klasę nepasiekus 100 lygio\n\nDėkojame, kad padedate Habitica klestėti. Jūsų parama mums tikrai daug reiškia!</string>
-  <string name="my_guilds">Mano Gildijos</string>
+    <string name="my_guilds">Mano Gildijos</string>
   <string name="public_guilds">Viešos Gildijos</string>
   <string name="guild">Gildija</string>
   <string name="leave">Palikti</string>
   <string name="join">Prisijungti</string>
-  <string name="leader">Vadas</string>
-  <string name="gems">Brangakmeniai</string>
-  <string name="send_pm">Siųsti Žinutę</string>
-  <string name="flag">Žymėti</string>
-  <string name="delete">Trinti</string>
+    <string name="gems">Brangakmeniai</string>
+    <string name="delete">Trinti</string>
   <string name="name">Pavadinimas</string>
   <string name="description">Aprašymas</string>
   <string name="privacy">Privatumas</string>
   <string name="write_message">Rašyti Žinutę</string>
-  <string name="post">Siųsti</string>
-  <string name="guild_search_hint">Ieškoti gildijų</string>
-  <string name="todo_due">Terminas: %s</string>
-  <string name="daily_streak">dabartinė serija: %d</string>
-  <string name="todo_has_duedate">Užduotis turi Terminą</string>
-  <string name="battle_gear">Kovinė Apranga</string>
+    <string name="guild_search_hint">Ieškoti gildijų</string>
+    <string name="battle_gear">Kovinė Apranga</string>
   <string name="costume">Kostiumas</string>
   <string name="outfit_head">Galva</string>
   <string name="outfit_headAccessory">Galvos Aksesuaras</string>
@@ -230,9 +183,7 @@
   <string name="wear_costume">Užsidėti Kostiumą</string>
   <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="today">Šiandien</string>
+    <string name="today">Šiandien</string>
   <string name="sidebar_items">Daiktai</string>
   <string name="eggs">Kiaušiniai</string>
   <string name="hatching_potions">Perėjimosi Eliksyrai</string>
@@ -243,13 +194,9 @@
   <string name="armoireEquipment">Radai retos aprangos dalį Drabužinėje: %s! Nuostabu!</string>
   <string name="armoireFood">Betyrinėjant Drabužinę randi %1$s %2$s. Ką tai čia veikia?</string>
   <string name="armoireExp">Besigrumiant su Drabužine, gauni patirties!</string>
-  <string name="armoireNotesFull">Atidaryk Drabužinę ir gauk retos Aprangos dalį, Patirties ar maisto! Nerasto aprangos dalys: %d</string>
-  <string name="armoireLastItem">Radai paskutinę retos aprangos dalį Užburtoje Drabužinėje.</string>
-  <string name="armoireNotesEmpty">Drabužinėje atsiranda naujų daiktų pirmą kiekvieno mėnesio savaitę. Iki tol, gali toliau joje ieškoti Patirties ir Maisto!</string>
-  <string name="sell">Parduoti (%d Augso)</string>
+    <string name="sell">Parduoti (%d Augso)</string>
   <string name="hatch_with_potion">Užauginti su eliksyru</string>
-  <string name="feed_to_pet">Maitinti gyvūnui</string>
-  <string name="hatch_egg">Išperėti kiaušinį</string>
+    <string name="hatch_egg">Išperėti kiaušinį</string>
   <string name="invite_party">Pakviesti grupę</string>
   <string name="dialog_feeding">Pašerti %s su:</string>
   <string name="use_animal">Naudoti</string>
@@ -270,8 +217,7 @@
   <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>
   <string name="select_class">Pasirinkti Klasę</string>
   <string name="opt_out_class">Atsisakyti</string>
-  <string name="opt_out_description">Tingi gilintis į klases? Nori pasirinkti vėliau? Atsisakyk. Liksi kariu be specialių sugebėjimų. Galėsi vėliau lengvai ją įjungti, kai pasiskaitysi daugiau apie klases wiki puslapyje.</string>
-  <string name="class_confirmation">Ar tikrai nori būti %s?</string>
+    <string name="class_confirmation">Ar tikrai nori būti %s?</string>
   <string name="choose_class">Pasirink Klasę</string>
   <string name="dialog_go_back">Grįžti</string>
   <string name="opt_out_confirmation">Ar tikrai nori atsisakyti?</string>
@@ -282,53 +228,28 @@
   <string name="invite_existing_users">Pakviesti Esamus Vartotojus</string>
   <string name="send">Siųsti</string>
   <string name="invite">Pakviesk Draugus</string>
-  <string name="invite_id_description">Jei tavo draugai jau naudojasi Habitica, pakviesk juos įrašant jų Vartotojo ID čia.</string>
-  <string name="invite_email_description">Jei tavo draugai prisijungs prie Habitica per tavo el. pašto nuorodą, jie bus iš karto pakviesti į tavo grupę!</string>
+    <string name="invite_email_description">Jei tavo draugai prisijungs prie Habitica per tavo el. pašto nuorodą, jie bus iš karto pakviesti į tavo grupę!</string>
   <string name="add_invites">Pridėti Pakvietimų</string>
-  <string name="user_id">Vartotojo ID</string>
-  <string name="email">El. paštas</string>
-  <string name="invite_users">Pakviesk į Grupę</string>
-  <string name="share_using">Pasidalinti su</string>
+    <string name="email">El. paštas</string>
+    <string name="share_using">Pasidalinti su</string>
   <string name="share_hatched">Kątik gavau %1$s %2$s Habitica augintinį atliekant kasdienes užduotis!</string>
   <string name="share_raised">Kątik užauginau %1$s Habitica augintinį atliekant kasdienes užduotis!</string>
   <string name="open_in_store">Atidaryti play parduotuvėje</string>
   <string name="change_class_confirmation">Ar tikrai nori pasikeisti savo klasę? Tai kainuos 3 brangakmenius.</string>
-  <string name="leaderMessage">Žinutė nuo %1$s</string>
-  <string name="confirm">Patvirtinti</string>
+    <string name="confirm">Patvirtinti</string>
   <string name="market">Turgus</string>
   <string name="timeTravelers">Keliautojai Laiku</string>
   <string name="seasonalShop">Sezoninė Parduotuvė</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>
-  <string name="purchase_confirmation_title">Patvirtinti pirkinį</string>
-  <string name="confirm_purchase_text">Pirkti %1$s už %2$s %3$s</string>
-  <string name="gem">brangakmenis</string>
-  <string name="hourglass">smėlio laikrodis</string>
-  <string name="hourglasses">smėlio laikrodžiai</string>
-  <string name="gold_singular">aukso</string>
-  <string name="gold_plural">aukso</string>
+    <string name="gold_plural">aukso</string>
   <string name="chat_message_copied">Žinutė nukopijuota į Iškarpinę</string>
-  <string name="copy_chat_message">Kopijuoti į Iškarpinę</string>
-  <string name="edit_tag_title">Keisti Žymę</string>
-  <string name="edit_tag_btn_edit">Keisti</string>
-  <string name="edit_tag_btn_done">Atlikta</string>
-  <string name="edit_tag_btn_delete">Trinti</string>
-  <string name="confirm_delete_tag_title">Ar esi įsitikinęs(us)?</string>
+    <string name="edit_tag_btn_edit">Keisti</string>
+    <string name="confirm_delete_tag_title">Ar esi įsitikinęs(us)?</string>
   <string name="confirm_delete_tag_message">Ar tikrai nori ištrinti?</string>
-  <string name="filter_drawer_edit_tags">Keisti Žymes</string>
-  <string name="filter_drawer_filter_tags">Filtruoti pagal Žymes</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Leisk kitus tave pakviesti su šiuo QR Kodu</string>
-  <string name="qr_save_message">QR kodas išsaugotas</string>
-  <string name="qr_dialogue_title">Tavo QR Kodas</string>
-  <string name="download">Atsisiųsti</string>
-  <string name="send_new_message">Siųsti žinutę</string>
-  <string name="choose_recipient_title">PasirinkŽinutės Gavėją</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">PasirinkŽinutės Gavėją</string>
   <string name="action_continue">Tęsti</string>
-  <string name="scan_qr_code">Nuskanuok QR Kodą</string>
-  <string name="enter_recipient_uuid">Įvesti adresato Vartotojo ID</string>
-  <string name="invited_to_party">Tave pakvietė į grupę!</string>
+    <string name="invited_to_party">Tave pakvietė į grupę!</string>
   <string name="stats_widget_label">Habitica Statistika</string>
   <string name="add_task">Pridėti Užduotį</string>
   <string name="add_habit">Pridėti Įprotį</string>
@@ -338,15 +259,14 @@
   <string name="all_dailies_completed">Atlikai visas savo dienos užduotis. Puiku!</string>
   <string name="widget_habit_button">Habitica Pažymėti Įprotį</string>
   <string name="widget_dailies">Habitica Kasdienės Užduotys</string>
-  <string name="widget_add_task">Habitica Prodėti Užduotį</string>
-  <string name="google_services_missing">Nepavyko rasti Google play paslaugos.</string>
-  <string name="gem.purchase.toolbartitle">Pirkti</string>
-  <string name="gem.purchase.title">Brangakmenių pirkimas remia kūrėjus ir padeda išlaikiti Habitica</string>
-  <string name="gem.purchase.subtitle">Brangakmeniai tau leidžia pirkti įdomus paskyros priedus, įskaitant:</string>
-  <string name="gem.purchase.listitem1">Gražūs veikėjo kostiumai</string>
-  <string name="gem.purchase.listitem2">Nuostabūs fonai</string>
-  <string name="gem.purchase.listitem3">Misijos kuriose gali rasti augintinių kiaušinių</string>
-  <string name="gem.purchase.listitem4">Galimybė pakeisti savo klasę nepasiekus 100 lygio</string>
+    <string name="google_services_missing">Nepavyko rasti Google play paslaugos.</string>
+  <string name="gem.purchase_toolbartitle">Pirkti</string>
+  <string name="gem.purchase_title">Brangakmenių pirkimas remia kūrėjus ir padeda išlaikiti Habitica</string>
+  <string name="gem.purchase_subtitle">Brangakmeniai tau leidžia pirkti įdomus paskyros priedus, įskaitant:</string>
+  <string name="gem.purchase_listitem1">Gražūs veikėjo kostiumai</string>
+  <string name="gem.purchase_listitem2">Nuostabūs fonai</string>
+  <string name="gem.purchase_listitem3">Misijos kuriose gali rasti augintinių kiaušinių</string>
+  <string name="gem.purchase_listitem4">Galimybė pakeisti savo klasę nepasiekus 100 lygio</string>
   <string name="support_habitica">Paremti Habitica</string>
   <string name="skill_transformation_use">naudoti</string>
   <string name="hatching_market_info">Negaunate reikiamų lašiukų? Patikrinkite turguje!</string>
@@ -357,22 +277,8 @@
   <string name="AudioTheme_summary">Pakeiskite Habitica garsinę temą</string>
   <!--Login Incentives-->
   <string name="see_you_tomorrow">Pasimatysime rytoj!</string>
-<string name="unknown_error">Įvyko klaida…</string>
-    <string name="new_todo">Naujas darbas</string>
-    <string name="new_reward">Naujas apdovanojimas</string>
-    <string name="new_daily">Naujas „Daily“</string>
-    <string name="new_habit">Naujas prigimtis</string>
-    <string name="repeatEvery">Pakartokite kiekvieną</string>
 
 
-    <string name="physical">Jėga</string>
-    <string name="mental">Žvalgyba</string>
-    <string name="social">Konstitucija</string>
-    <string name="other">Įžvalga</string>
-
-    <string name="repeatables_summary_title">Santrauka</string>
-    <string name="repeatables_title">Pakartojama</string>
-    <string name="repeatables_on_title">Kartojasi</string>
     <string name="repeatables_frequency_daily">Kasdien</string>
     <string name="repeatables_frequency_weekly">Savaitės</string>
     <string name="repeatables_frequency_monthly">Mėnesio</string>
@@ -387,8 +293,7 @@
     <string name="reminder_title">Nepamirškite patikrinti savo užduočių</string>
     <string name="todos">Daryti</string>
     <string name="intro_1_subtitle">Sveiki atvykę į</string>
-    <string name="intro_1_title">Habitica</string>
-    <string name="intro_1_description">Atėjo laikas pasilinksminti, kol gausite dalykų. Prisijunkite prie % s kitų, gerindami savo gyvenimą vienu metu.</string>
+    <string name="intro_1_description">Atėjo laikas pasilinksminti, kol gausite dalykų. Prisijunkite prie %s kitų, gerindami savo gyvenimą vienu metu.</string>
     <string name="intro_2_subtitle">Pažanga žaidime</string>
     <string name="intro_2_title">Pažanga gyvenime</string>
     <string name="intro_2_description">Atrakinkite žaidimo funkcijas, patikrindami savo realaus gyvenimo užduotis. Uždirbkite šarvus, augintinius ir daugiau, kaip atlygį už savo tikslų pasiekimą.</string>
@@ -398,26 +303,16 @@
     <string name="avatar_setup_description">Taigi, kaip norėtumėte ieškoti\? Nesijaudinkite, vėliau galite tai pakeisti.</string>
     <string name="task_setup_description">Puikus! Dabar, ką domitės dirbti visą šią kelionę\?</string>
     <string name="setup_group_health">Sveikata</string>
-    <string name="copy_as_todo">Kopijuoti kaip darbus</string>
     <string name="add_tag">Pridėti naują žymę</string>
-    <string name="quest_begin_message">Ar tu tuo tikras\? Tik% 1 $ d jūsų% 2 $ d partijos narių prisijungė prie šio Quest! Užklausos prasideda automatiškai, kai visi žaidėjai prisijungė arba atmetė kvietimą.</string>
+    <string name="quest_begin_message">Ar tu tuo tikras\? Tik% 1 $d jūsų% 2 $d partijos narių prisijungė prie šio Quest! Užklausos prasideda automatiškai, kai visi žaidėjai prisijungė arba atmetė kvietimą.</string>
     <string name="ago_1day">Prieš 1 dieną</string>
     <string name="ago_days">prieš %d dienas</string>
     <string name="ago_1Minute">Prieš 1 minutę</string>
     <string name="ago_minutes">Prieš %d minutes</string>
     <string name="ago_hours">prieš %d valandas</string>
     <string name="ago_1hour">Prieš 1 valandą</string>
-    <string name="evolved_pet_title">Prakeikėte %1$s %2$s, eikime į kelionę!</string>
-    <string name="notification_purchase">Įsigijote %s</string>
+    <string name="evolved_pet_title">Prakeikėte %s, eikime į kelionę!</string>
     <string name="notification_purchase_reward">Jūs įsigijote atlygį</string>
-    <string name="sectionpets">Standartinis</string>
-    <string name="sectionpremiumPets">magija potion</string>
-    <string name="sectionquestPets">ieškojimas</string>
-    <string name="sectionspecialPets">Reti</string>
-    <string name="sectionmounts">Standartinis</string>
-    <string name="sectionpremiumMounts">magija potion</string>
-    <string name="sectionquestMounts">ieškojimas</string>
-    <string name="sectionspecialMounts">Reti</string>
     <string name="inn_description">Reikia pertraukos\? Patikrinkite „Daniel\'s Inn“, kad pristabdytumėte sudėtingesnius „Habitica“ žaidimų mechanikus:
 \n
 \n • Praleisti dienraščiai jums nepažeis
@@ -434,7 +329,6 @@
     <string name="invite_username_description">Jei turite draugų, kurie jau naudojasi Habitica, pakvieskite juos pagal vartotojo vardą.</string>
     <string name="share_levelup">Habiticoje pasiekiau %d lygį, gerindamas savo tikrojo gyvenimo įpročius!</string>
     <string name="change_class_equipment_warning">Įspėjimas: nebegalėsite pirkti įrangos iš %s klasės.</string>
-    <string name="leaderName">Lyderis: %1$s</string>
     <string name="empty_inbox">Jūs neturite jokių pranešimų. Galite siųsti vartotojui naują pranešimą iš savo viešųjų pokalbių pranešimų!</string>
     <string name="login_incentive">Atrakinkite reguliariai prisijungdami prie Habitica</string>
     <string name="create_account">Atrakinkite paskyrą</string>
@@ -443,38 +337,38 @@
     <string name="belongs_to_challenge">Priklauso iššūkiui</string>
     <string name="has_reminder">Turi priminimą</string>
     <string name="has_tag">Turi žymę</string>
-    <string name="subscribe.title">Prenumerata palaiko kūrėjus ir padeda išlaikyti Habitica veikimą</string>
+    <string name="subscribe_title">Prenumerata palaiko kūrėjus ir padeda išlaikyti Habitica veikimą</string>
     <string name="subscribe_prompt">Tapkite abonentu ir gausite šiuos naudingus privalumus:</string>
-    <string name="subscribe.listitem1">Pirkti brangakmenius su auksu</string>
-    <string name="subscribe.listitem2">Išskirtiniai mėnesiniai straipsniai</string>
-    <string name="subscribe.listitem3">Išsaugokite papildomus istorijos įrašus</string>
-    <string name="subscribe.listitem4">Dvigubai padidėjo kasdienių lašų</string>
+    <string name="subscribe_listitem1">Pirkti brangakmenius su auksu</string>
+    <string name="subscribe_listitem2">Išskirtiniai mėnesiniai straipsniai</string>
+    <string name="subscribe_listitem3">Išsaugokite papildomus istorijos įrašus</string>
+    <string name="subscribe_listitem4">Dvigubai padidėjo kasdienių lašų</string>
     <string name="subscriptions">Prenumeratos</string>
     <string name="subscription_duration">Pasikartojantis kiekvienas %s</string>
     <string name="subscription_duration_norenew">Dėl %s</string>
     <string name="subscribe">Prenumeruoti</string>
-    <string name="subscribe.listitem1.description">Aleksandras Prekybininkas dabar parduos jums brangakmenius po 20 aukso!
+    <string name="subscribe.listitem1_description">Aleksandras Prekybininkas dabar parduos jums brangakmenius po 20 aukso!
 \n
 \nJo mėnesinės siuntos iš pradžių yra ribojamos per 25 brangakmenius per mėnesį, tačiau jos gali padidėti pagal jūsų prenumeratos ilgį.
 \n
 \nViršutinė prenumerata kas tris mėnesius iš eilės padidėja 5 brangakmeniais, ne daugiau kaip 50 brangakmenių per mėnesį!</string>
-    <string name="subscribe.listitem2.description">Kiekvieną mėnesį gausite unikalų kosmetikos elementą savo avatarui!
+    <string name="subscribe.listitem2_description">Kiekvieną mėnesį gausite unikalų kosmetikos elementą savo avatarui!
 \n
 \nBe to, kas tris mėnesius iš eilės prenumeratos, paslaptingas laikas keliautojai suteiks jums prieigą prie istorinių (ir futuristinių!) Kosmetikos gaminių.</string>
-    <string name="subscribe.listitem3.description">Padaro užbaigtą darbų atlikimą ir užduočių istoriją ilgiau.</string>
-    <string name="subscribe.listitem4.description">Dukart lašų dangteliai leis jums kiekvieną dieną gauti daugiau elementų iš jūsų atliktų užduočių, o tai padės greičiau atlikti savo stabilumą!</string>
-    <string name="subscribe1month.gemcap">25 perlas riba</string>
-    <string name="subscribe3month.gemcap">30 perlas riba</string>
-    <string name="subscribe6month.gemcap">35 perlas riba</string>
-    <string name="subscribe12month.gemcap">45 perlas riba</string>
+    <string name="subscribe.listitem3_description">Padaro užbaigtą darbų atlikimą ir užduočių istoriją ilgiau.</string>
+    <string name="subscribe.listitem4_description">Dukart lašų dangteliai leis jums kiekvieną dieną gauti daugiau elementų iš jūsų atliktų užduočių, o tai padės greičiau atlikti savo stabilumą!</string>
+    <string name="subscribe1month_gemcap">25 perlas riba</string>
+    <string name="subscribe3month_gemcap">30 perlas riba</string>
+    <string name="subscribe6month_gemcap">35 perlas riba</string>
+    <string name="subscribe12month_gemcap">45 perlas riba</string>
     <string name="subscription_hourglasses">+%d mistikas smėlio laikrodis</string>
     <string name="payment_method">Mokėjimo būdas</string>
     <string name="subscription">Prenumerata</string>
     <string name="active">Aktyvus</string>
     <string name="due">Mokėti</string>
     <string name="cancel_subscription">Atšaukti prenumeratą</string>
-    <string name="cancel_subscription_google.description">Nenorite prenumeruoti\? Galite atsisakyti prenumeratos „Google Play“ parduotuvės skyriuje „Mano programos“.</string>
-    <string name="cancel_subscription_notgoogle.description">Nenorite prenumeruoti\? Dėl mokėjimo būdo galite atsisakyti tik per svetainę. Spustelėkite žemiau esantį mygtuką, kad atidarytumėte svetainę naršyklėje!</string>
+    <string name="cancel_subscription_google_description">Nenorite prenumeruoti\? Galite atsisakyti prenumeratos „Google Play“ parduotuvės skyriuje „Mano programos“.</string>
+    <string name="cancel_subscription_notgoogle_description">Nenorite prenumeruoti\? Dėl mokėjimo būdo galite atsisakyti tik per svetainę. Spustelėkite žemiau esantį mygtuką, kad atidarytumėte svetainę naršyklėje!</string>
     <string name="visit_habitica_website">Aplankykite „Habitica“ svetainę</string>
     <string name="current_bonuses">Dabartinės premijos</string>
     <string name="months_subscribed">Užregistruoti mėnesiai</string>
@@ -490,8 +384,6 @@
     <string name="subscribe_prompt_thanks">Užsisakydami gaunate šias naudingas išmokas:</string>
     <string name="subscription_status">Prenumeratos būsena</string>
 
-    <string name="byLeader">iki %s</string>
-    <string name="challenge_details">Išsami informacija apie iššūkius</string>
     <string name="challenge_leave_title">Palikite iššūkį</string>
     <string name="challenge_leave_text">Ar tikrai norite palikti iššūkį „%s“\?</string>
     <string name="challenge_remove_tasks_title">Pašalinkite užduotis</string>
diff --git a/Habitica/res/values-nl/strings.profile.xml b/Habitica/res/values-nl/strings.profile.xml
index c84e4e103..1ed354dd6 100644
--- a/Habitica/res/values-nl/strings.profile.xml
+++ b/Habitica/res/values-nl/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Niveau:</string>
     <string name="profile_class_bonus">Klassebonus:</string>
     <string name="profile_allocated">Toegewezen:</string>
-    <string name="profile_boosts">Versterkingen:</string>
     <string name="profile_private_message">Privébericht</string>
     <string name="profile_achievements">Prestaties</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Sluiten</string>
 
 </resources>
diff --git a/Habitica/res/values-nl/strings.sidebar.xml b/Habitica/res/values-nl/strings.sidebar.xml
index cd8d81764..d0991fdea 100644
--- a/Habitica/res/values-nl/strings.sidebar.xml
+++ b/Habitica/res/values-nl/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Taken</string>
-  <string name="sidebar.skills">Vaardigheden</string>
-  <string name="sidebar.section.social">Sociaal</string>
-  <string name="sidebar.inbox">Berichten</string>
-  <string name="sidebar.tavern">Herberg</string>
-  <string name="sidebar.party">Groep</string>
-  <string name="sidebar.purchaseGems">Edelstenen &amp; abonnement</string>
-  <string name="sidebar.guilds">Gilden</string>
-  <string name="sidebar.challenges">Uitdagingen</string>
-  <string name="sidebar.section.inventory">Boedel</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Uitrusting</string>
-  <string name="sidebar.stable">Stal</string>
-  <string name="sidebar.news">Nieuws</string>
-  <string name="sidebar.settings">Instellingen</string>
-  <string name="sidebar.about">Over</string>
+  <string name="sidebar_tasks">Taken</string>
+  <string name="sidebar_skills">Vaardigheden</string>
+  <string name="sidebar.section_social">Sociaal</string>
+  <string name="sidebar_inbox">Berichten</string>
+  <string name="sidebar_tavern">Herberg</string>
+  <string name="sidebar_party">Groep</string>
+  <string name="sidebar_purchaseGems">Edelstenen &amp; abonnement</string>
+  <string name="sidebar_guilds">Gilden</string>
+  <string name="sidebar_challenges">Uitdagingen</string>
+  <string name="sidebar.section_inventory">Boedel</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Uitrusting</string>
+  <string name="sidebar_stable">Stal</string>
+  <string name="sidebar_news">Nieuws</string>
+    <string name="sidebar_about">Over</string>
   <string name="sidebar_shops">Winkels</string>
   <string name="sidebar_stats">Statistieken</string>
 </resources>
diff --git a/Habitica/res/values-nl/strings.tutorial.xml b/Habitica/res/values-nl/strings.tutorial.xml
index 471c09d1c..00166cd28 100644
--- a/Habitica/res/values-nl/strings.tutorial.xml
+++ b/Habitica/res/values-nl/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Koop een uitrusting voor je avatar met het goud dat je verdient!</string>
   <string name="tutorial_rewards_2">Je kan ook zelf beloningen maken voor in de echte wereld, gebaseerd op wat je motiveert.</string>
   <string name="tutorial_tasks_complete">Dat was het voorlopig. Als je iets vergeet, kijk dan in de FAQ sectie.</string>
-  <string name="tutorial_equipment">Als je uitrustingsstukken koopt verschijnen die hier. Jouw gevechtsuitrusting beïnvloedt je statistieken en je kostuum (als het aan staat) beïnvloedt wat je avatar aan heeft.</string>
-  <string name="tutorial_items">Verdien voorwerpen door taken te voltooien en niveaus omhoog te gaan. Tik op een voorwerp om het te gebruiken!</string>
-  <string name="tutorial_pets">Terwijl je taken uit de echte wereld voltooit, heb je een kans om eieren en drankjes te vinden. Combineer ze om je huisdier te laten uitkomen.</string>
-  <string name="tutorial_skills">Vaardigheiden zijn speciale talenten die krachtige effecten hebben! Tik op een vaardigheid om ze te gebruiken. Het kost je Mana (de blauwe balk), dat je kan verdienen door elke dag in te checken en je taken in de echte wereld te voltooien. Kijk in de FAQ in het menu voor meer informatie!</string>
+    <string name="tutorial_skills">Vaardigheiden zijn speciale talenten die krachtige effecten hebben! Tik op een vaardigheid om ze te gebruiken. Het kost je Mana (de blauwe balk), dat je kan verdienen door elke dag in te checken en je taken in de echte wereld te voltooien. Kijk in de FAQ in het menu voor meer informatie!</string>
   <string name="tutorial_party">Dit is waar jij en je vrienden elkaar verantwoordelijk kunnen houden voor het bereiken van je doelen en je samen monsters kan bevechten met je taken!</string>
   <string name="tutorial_tavern">Welkom in de Herberg, een openbare chatroom voor alle leeftijden! Hier kan je praten over productiviteit en vragen stellen. Veel plezier!</string>
-  <string name="tutorial_classes">Kies hier of je Krijger, Magiër, Heler of Dief wilt worden! Elke klasse heeft unieke uitrustingen en vaardigheden. Tik op de (?) om meer te weten te komen!</string>
-  <string name="tutorial_stats">Tik de grijze knop aan om meerdere punten ineens aan te wijzen, of tik op de pijlen om ze één punt per keer toe  te voegen.</string>
+    <string name="tutorial_stats">Tik de grijze knop aan om meerdere punten ineens aan te wijzen, of tik op de pijlen om ze één punt per keer toe  te voegen.</string>
 </resources>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 0028aab4a..e334d4b5c 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Ervaring</string>
   <string name="HP_default">Gezondheid</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Voorkeuren konden niet uit de barcode worden geladen</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Instellingen</string>
-  <string name="SP_address_hint">Jouw persoonlijke server</string>
-  <string name="SP_userID_title">Gebruikers-ID</string>
+    <string name="SP_userID_title">Gebruikers-ID</string>
   <string name="SP_userID_summary">Jouw gebruikers-ID</string>
   <string name="SP_APIToken_title">API-token</string>
   <string name="SP_APIToken_summary">Jouw API-token</string>
   <string name="Language_title">Taal</string>
   <string name="Language_summary">Verander Habitica\'s taal</string>
-  <string name="SP_user_qr_code">Je QR code</string>
-  <string name="PS_contact_title">Contact</string>
-  <string name="unknown_error">Er is een fout opgetreden...</string>
-  <string name="pref_account_header">Account</string>
+    <string name="PS_contact_title">Contact</string>
+    <string name="pref_account_header">Account</string>
   <string name="pref_first_day_of_the_week_title">Eerste dag van de week</string>
   <string name="pref_first_day_of_the_week_summary">Eerste dag van de week op alle kalenders</string>
   <string name="pref_reminder_header">Dagelijkse herinnering</string>
   <string name="pref_reminder_checkbox">Activeer herinnering</string>
   <string name="pref_reminder_picker">Stel tijd van herinnering in</string>
   <string name="pref_cds_header">Aangepast begin van de dag</string>
-  <string name="pref_cds_picker">Begin van de dag instellen</string>
-  <string name="pref_push_notifications_checkbox">Gebruiker-pushnotificaties</string>
+    <string name="pref_push_notifications_checkbox">Gebruiker-pushnotificaties</string>
   <string name="push_notifications">Pushnotificaties</string>
   <string name="push_notifications_sum">Stel je pushnotificaties in</string>
   <string name="preference_push_you_won_challenge">Je hebt een uitdaging gewonnen!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Je queeste is begonnen</string>
   <string name="preference_push_invited_to_quest">Uitgenodigd voor queeste</string>
   <!--Adding tasks-->
-  <string name="task_value">Waarde</string>
-  <string name="new_todo">Nieuwe to-do</string>
-  <string name="new_reward">Nieuwe beloning</string>
-  <string name="new_daily">Nieuwe dagelijkse taak</string>
-  <string name="new_habit">Nieuwe gewoonte</string>
-  <string name="action_edit">Aanpassen</string>
-  <string name="action_delete">Verwijderen</string>
-  <string name="action_cancel">Annuleren</string>
+    <string name="action_edit">Aanpassen</string>
+    <string name="action_cancel">Annuleren</string>
   <string name="login_btn">Inloggen</string>
   <string name="register_btn">Registreren</string>
   <string name="username">Gebruikersnaam</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Bevestig wachtwoord</string>
   <string name="logout">Uitloggen</string>
   <string name="logout_description">Uitloggen</string>
-  <string name="account_details">Accountgegevens</string>
-  <string name="LoginActivityName">Welkom</string>
-  <string name="string_revive">Herleven</string>
-  <string name="please_connect">Maak verbinding via de app voor het gebruik van een widget</string>
-  <string name="about.title">Over</string>
-  <string name="about.libraries">Bibliotheken</string>
-  <string name="about.versionhistory">Versiegeschiedenis</string>
-  <string name="about.habitica_open_source">Habitica is beschikbaar als open source software op Github</string>
-  <string name="about.rate_our_app">Beoordeel onze App</string>
-  <string name="about.give_us_feedback">Stuur ons feedback!</string>
-  <string name="about.bugreport">Fout melden</string>
-  <string name="about.source_code">Broncode</string>
-  <string name="repeatEvery">Herhaal elke</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Verbindingsfout</string>
-  <string name="network_error_no_network_body">Je bent niet verbonden met het internet.</string>
-  <string name="internal_error_api">Het lijkt erop dat er een probleem is met de server. Probeer het later opnieuw.</string>
+    <string name="LoginActivityName">Welkom</string>
+    <string name="about_title">Over</string>
+  <string name="about_libraries">Bibliotheken</string>
+    <string name="about_habitica_open_source">Habitica is beschikbaar als open source software op Github</string>
+  <string name="about_rate_our_app">Beoordeel onze App</string>
+  <string name="about_give_us_feedback">Stuur ons feedback!</string>
+  <string name="about_bugreport">Fout melden</string>
+  <string name="about_source_code">Broncode</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Het lijkt erop dat er een probleem is met de server. Probeer het later opnieuw.</string>
   <string name="authentication_error_title">Authenticatiefout</string>
-  <string name="authentication_error_body">Je Gebruikersnaam en/of Wachtwoord is onjuist.</string>
-  <string name="login_validation_error_title">Validatiefout</string>
+    <string name="login_validation_error_title">Validatiefout</string>
   <string name="login_validation_error_fieldsmissing">Je moet alle velden invullen.</string>
   <string name="save_changes">Opslaan</string>
   <string name="copy">Kopie</string>
   <string name="notes">Notities</string>
-  <string name="text">Tekst</string>
-  <string name="difficulty">Moeilijkheidsgraad</string>
+    <string name="difficulty">Moeilijkheidsgraad</string>
   <string name="tags">Labels</string>
   <string name="trivial">Triviaal</string>
   <string name="easy">Gemakkelijk</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negatief ( - )</string>
   <string name="checklist">Checklijst</string>
   <string name="reminders">Herinneringen</string>
-  <string name="actions">Acties</string>
-  <string name="attributes">Eigenschappen</string>
-  <string name="physical">Kracht</string>
-  <string name="mental">Intelligentie</string>
-  <string name="social">Lichaam</string>
-  <string name="other">Perceptie</string>
-  <string name="frequency">Frequentie</string>
-  <string name="frequency_weekly">Op Bepaalde Dagen van de Week</string>
-  <string name="frequency_daily">Iedere X Dagen</string>
-  <string name="repeatables_summary_title">Samenvatting</string>
-  <string name="repeatables_title">Herhaalt</string>
-  <string name="repeatables_on_title">Herhaalt op</string>
-  <string name="repeatables_frequency_daily">Dagelijks</string>
+    <string name="attributes">Eigenschappen</string>
+    <string name="repeatables_frequency_daily">Dagelijks</string>
   <string name="repeatables_frequency_weekly">Wekelijks</string>
   <string name="repeatables_frequency_monthly">Maandelijks</string>
   <string name="repeatables_frequency_yearly">Jaarlijks</string>
@@ -123,24 +92,15 @@
   <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>
-  <string name="profile_image">Profielfoto</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Je hebt %1$s voor %2$d mana gebruikt.</string>
-  <string name="used_skill_without_mana">Je hebt %1$s gebruikt.</string>
+    <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 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>
-  <string name="flag_confirm">Markeer bericht</string>
-  <string name="unlock_lvl_11">Beschikbaar vanaf niveau 11</string>
-  <string name="no_party_message">Je zit niet in een groep. Bezoek de website als je je bij een groep wilt aansluiten.</string>
-  <string name="forgot_pw_btn">Wachtwoord vergeten</string>
-  <string name="tavern.inn.checkOut">Heractiveer je Dagelijkse taken</string>
-  <string name="tavern.inn.rest">Pauzeer je Dagelijkse Taken</string>
-  <string name="reward.dialog.buy">Kopen</string>
-  <string name="reward.dialog.dismiss">Verwijderen</string>
+    <string name="reminder_title">Vergeet je taken niet af te vinken</string>
+    <string name="unlock_lvl_11">Beschikbaar vanaf niveau 11</string>
+    <string name="forgot_pw_btn">Wachtwoord vergeten</string>
+  <string name="tavern.inn_checkOut">Heractiveer je Dagelijkse taken</string>
+  <string name="tavern.inn_rest">Pauzeer je Dagelijkse Taken</string>
+  <string name="reward.dialog_buy">Kopen</string>
+  <string name="reward.dialog_dismiss">Verwijderen</string>
   <string name="party">Groep</string>
   <string name="chat">Chat</string>
   <string name="members">Leden</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Dagelijkse taken</string>
   <string name="todos">To-do\'s</string>
   <string name="rewards">Beloningen</string>
-  <string name="taskform.delete.title">Weet je het zeker?</string>
-  <string name="taskform.delete.message">Wil je het echt verwijderen?</string>
-  <string name="yes">Ja</string>
+    <string name="yes">Ja</string>
   <string name="no">Nee</string>
   <string name="quest">Queeste</string>
   <string name="avatar_body">Lichaam</string>
   <string name="avatar_hair">Haar</string>
   <string name="avatar_shirt">T-Shirt</string>
   <string name="avatar_skin">Huid</string>
-  <string name="avatar_ears">Dierenoren</string>
-  <string name="avatar_base">Basis</string>
+    <string name="avatar_base">Basis</string>
   <string name="avatar_color">Kleur</string>
   <string name="avatar_beard">Baard</string>
   <string name="avatar_mustache">Snor</string>
   <string name="avatar_flower">Bloem</string>
   <string name="avatar_bangs">Pony</string>
-  <string name="avatar_nothing">Niets ingesteld</string>
-  <string name="avatar_size">Grootte</string>
+    <string name="avatar_size">Grootte</string>
   <string name="avatar_size_slim">Slank</string>
   <string name="avatar_size_broad">Breed</string>
   <string name="avatar_background">Achtergrond</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Koop</string>
   <string name="purchase_set_title">Koop set %s</string>
   <string name="due_date">Einddatum</string>
-  <string name="quest.accept">Accepteren</string>
-  <string name="quest.reject">Afwijzen</string>
-  <string name="quest.begin">Begin Queeste</string>
-  <string name="quest.cancel">Annuleer Uitnodiging</string>
-  <string name="quest.abort">Queeste afbreken</string>
-  <string name="quest.leave">Verlaat Queeste</string>
-  <string name="quest.pending">in afwachting van</string>
-  <string name="quest.accepted">Aanvaard</string>
-  <string name="quest.rejected">Afgewezen</string>
-  <string name="quest.participants">Deelnemers</string>
-  <string name="version_info">Versie %1$s (%2$d)</string>
+  <string name="quest_accept">Accepteren</string>
+  <string name="quest_reject">Afwijzen</string>
+  <string name="quest_begin">Begin Queeste</string>
+  <string name="quest_cancel">Annuleer Uitnodiging</string>
+  <string name="quest_abort">Queeste afbreken</string>
+    <string name="version_info">Versie %1$s (%2$d)</string>
   <string name="sidebar_help">Help &amp; FAQ</string>
   <string name="complete_tutorial">Begrepen!</string>
   <string name="dismiss_tutorial">Herinner me opnieuw</string>
   <string name="intro_1_subtitle">Welkom bij</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">Het is tijd om plezier te maken terwijl je dingen gedaan krijgt. Doe mee met %s andere mensen die hun leven met iedere taak beteren.</string>
+    <string name="intro_1_description">Het is tijd om plezier te maken terwijl je dingen gedaan krijgt. Doe mee met %s andere mensen die hun leven met iedere taak beteren.</string>
   <string name="intro_2_subtitle">Vooruitgang in het spel</string>
   <string name="intro_2_title">Vooruitgang in je leven</string>
   <string name="intro_2_description">Ontgrendel functies in het spel door taken in je echte leven af te vinken. Verdien uitrustingsstukken, huisdieren en meer als beloning voor het bereiken van je doelen.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Wordt sociaal</string>
   <string name="intro_3_description">Houd je doelen op peil met hulp van je vrienden. Ondersteun elkaar in het leven en vecht samen terwijl je steeds beter wordt.</string>
   <string name="intro_finish_button">Laten we beginnen!</string>
-  <string name="previous_button">Vorige</string>
-  <string name="next_button">Volgende</string>
+    <string name="next_button">Volgende</string>
   <string name="skip_button">Sla over</string>
-  <string name="setup_welcome_description">Welkom in Habitica, waar vooruitgang in het spel je leven zal verbeteren! Terwijl je echte doelen bereikt, verdien je uitrusting, huisdieren, queestes en meer.</string>
-  <string name="setup_welcome_title">Welkom</string>
-  <string name="avatar_setup_description">Dus, hoe wil jij er uitzien? Geen zorgen, je kan dit later veranderen.</string>
+    <string name="avatar_setup_description">Dus, hoe wil jij er uitzien? Geen zorgen, je kan dit later veranderen.</string>
   <string name="task_setup_description">Geweldig! Nu, waar zou je graag aan willen werken door deze reis heen?</string>
   <string name="setup_group_work">Werk</string>
   <string name="setup_group_exercise">Sport</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Studeer een meester van het ambacht</string>
   <string name="setup_task_creativity_2">Aan een creatief project werken</string>
   <string name="setup_task_creativity_3">Een creatief project afronden</string>
-  <string name="gem.purchase.support">Wil je helpen om Habitica draaiende te houden? Je kan de ontwikkelaars ondersteunen door edelstenen te kopen!\n\nMet edelstenen kun je leuke extra\'s voor je account kopen, zoals: \n\n - Geweldige kostuums voor je avatar\n - Adembenemende achtergronden\n - Leuke queestes met huisdiereieren als beloning\n - De mogelijkheid om je klasse te veranderen voor je niveau 100 bent\n\nOntzettend bedankt voor je hulp om Habitica het beste te maken wat het kan zijn. Jouw steun betekent heel veel voor ons!</string>
-  <string name="my_guilds">Mijn Gilden</string>
+    <string name="my_guilds">Mijn Gilden</string>
   <string name="public_guilds">Publieke Gilden</string>
   <string name="guild">Gilde</string>
   <string name="leave">Verlaten</string>
   <string name="join">Toetreden</string>
-  <string name="leader">Leider</string>
-  <string name="gems">Edelstenen</string>
-  <string name="copy_as_todo">Kopiëren als to-do</string>
-  <string name="send_pm">PB verzenden</string>
-  <string name="flag">Aanduiden</string>
-  <string name="delete">Verwijderen</string>
+    <string name="gems">Edelstenen</string>
+    <string name="delete">Verwijderen</string>
   <string name="name">Naam</string>
   <string name="description">Beschrijving</string>
   <string name="add_tag">Nieuwe label toevoegen</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Bericht schrijven</string>
-  <string name="post">Post</string>
-  <string name="guild_search_hint">Zoek naar gilden</string>
-  <string name="todo_due">Tegen: %s</string>
-  <string name="daily_streak">huidige serie: %d</string>
-  <string name="todo_has_duedate">Taak heeft een einddatum</string>
-  <string name="battle_gear">Gevechtsuitrusting</string>
+    <string name="guild_search_hint">Zoek naar gilden</string>
+    <string name="battle_gear">Gevechtsuitrusting</string>
   <string name="costume">Kostuum</string>
   <string name="outfit_head">Hoofd</string>
   <string name="outfit_headAccessory">Hoofdaccessoire</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Kostuum Aantrekken</string>
   <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_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="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="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>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">Je hebt een zeldzaam stuk van een uitrusting gevonden in het Kabinet: %s! Geweldig!</string>
   <string name="armoireFood">Je rommelt wat rond in het Kabinet en vindt %1$s %2$s. Wat doet dat hier?</string>
   <string name="armoireExp">Je worstelt met het Kabinet en verdient Ervaring. Pak aan!</string>
-  <string name="armoireNotesFull">Open het Kabinet om willekeurig speciale uitrustingen, ervaring of voedsel te vinden! Stukken uitrusting die nog over zijn: %d</string>
-  <string name="armoireLastItem">Je hebt het laatste stuk zeldzame uitrusting gevonden in het Betoverde Kabinet.</string>
-  <string name="armoireNotesEmpty">Het Kabinet zal nieuwe stukken uitrusting hebben tijdens de eerste week van elke maand. Blijf tot die tijd klikken voor ervaring en voedsel!</string>
-  <string name="sell">Verkoop (%d Goud)</string>
+    <string name="sell">Verkoop (%d Goud)</string>
   <string name="hatch_with_potion">Broed uit met toverdrank</string>
-  <string name="feed_to_pet">Aan huisdier voederen</string>
-  <string name="hatch_egg">Laten uitkomen met ei</string>
+    <string name="hatch_egg">Laten uitkomen met ei</string>
   <string name="invite_party">Nodig groep uit</string>
   <string name="dialog_feeding">Voeder %s met:</string>
   <string name="use_animal">Gebruik</string>
@@ -305,17 +237,8 @@
   <string name="close">Sluiten</string>
   <string name="share">Delen</string>
   <string name="notification_pet_fed">Je hebt je %s gevoederd!</string>
-  <string name="notification_purchase">Je hebt %s gekocht</string>
-  <string name="notification_purchase_reward">Je hebt een beloning gekocht</string>
-  <string name="sectiondrop">Standaard</string>
-  <string name="sectionpremium">Toverdrankje</string>
-  <string name="sectionquest">Queeste</string>
-  <string name="sectionspecial">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="notification_purchase_reward">Je hebt een beloning gekocht</string>
+    <string name="world_quest">Wereldqueeste</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
@@ -334,8 +257,7 @@
   <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>
   <string name="select_class">Selecteer Klasse</string>
   <string name="opt_out_class">Afmelden</string>
-  <string name="opt_out_description">Vind je het klassesysteem te ingewikkeld voor nu? Wil je later pas kiezen? Trek je terug - je zal een krijger zijn zonder speciale talenten. Je kan later nog over het klassesysteem lezen op de wiki en op eender welk moment klassen inschakelen.</string>
-  <string name="class_confirmation">Weet je zeker dat je een %s wilt zijn?</string>
+    <string name="class_confirmation">Weet je zeker dat je een %s wilt zijn?</string>
   <string name="class_changed">Je bent nu een %s!</string>
   <string name="class_changed_description">Je hebt een nieuwe standaard gevechtsuitrusting die je kan veranderen onder Uitrusting!</string>
   <string name="choose_class">Kies een Klasse</string>
@@ -349,23 +271,18 @@
   <string name="invite_existing_users">Bestaande Gebruikers Uitnodigen</string>
   <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_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>
-  <string name="email">Email</string>
-  <string name="invite_users">Nodig uit voor groep</string>
-  <string name="share_using">Deel door</string>
+    <string name="email">Email</string>
+    <string name="share_using">Deel door</string>
   <string name="share_levelup">Ik ben in Habitica tot niveau %d gekomen door mijn gewoontes in het echte leven te verbeteren!</string>
   <string name="share_hatched">Ik heb net een %1$s %2$s huisdier in Habitica laten uitkomen door mijn echte taken uit te voeren!</string>
   <string name="share_raised">Ik heb net een %1$s rijdier gekregen in Habitica door mijn echte taken uit te voeren!</string>
   <string name="open_in_store">Open in de play store</string>
   <string name="change_class_confirmation">Weet je zeker dat je van klasse wilt veranderen? Dit kost 3 edelstenen.</string>
   <string name="change_class_equipment_warning">Waarschuwing: Je zult niet langer in staat zijn om uitrusting te kopen van de %s klasse.</string>
-  <string name="leaderMessage">Bericht van %1$s</string>
-  <string name="leaderName">Leider: %1$s</string>
-  <string name="confirm">Bevestig</string>
+    <string name="confirm">Bevestig</string>
   <string name="market">Markt</string>
   <string name="timeTravelers">Tijdreizigers</string>
   <string name="seasonalShop">Seizoenswinkel</string>
@@ -373,37 +290,16 @@
   <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>
-  <string name="purchase_confirmation_title">Bevestig aankoop</string>
-  <string name="confirm_purchase_text">Koop %1$s voor %2$s %3$s</string>
-  <string name="gem">edelsteen</string>
-  <string name="hourglass">zandloper</string>
-  <string name="hourglasses">zandlopers</string>
-  <string name="gold_singular">goud</string>
-  <string name="gold_plural">goud</string>
+    <string name="successful_purchase">%1$s gekocht</string>
+    <string name="gold_plural">goud</string>
   <string name="chat_message_copied">Bericht gekopieerd naar klembord</string>
-  <string name="copy_chat_message">Kopieer naar klembord</string>
-  <string name="edit_tag_title">Bewerk label</string>
-  <string name="edit_tag_btn_edit">Bewerk</string>
-  <string name="edit_tag_btn_done">Klaar</string>
-  <string name="edit_tag_btn_delete">Verwijder</string>
-  <string name="confirm_delete_tag_title">Weet je het zeker?</string>
+    <string name="edit_tag_btn_edit">Bewerk</string>
+    <string name="confirm_delete_tag_title">Weet je het zeker?</string>
   <string name="confirm_delete_tag_message">Wil je het echt verwijderen?</string>
-  <string name="filter_drawer_edit_tags">Bewerk labels</string>
-  <string name="filter_drawer_filter_tags">Filter op labels</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Laat iemand je uitnodigen met deze QR code</string>
-  <string name="qr_save_message">QR-code opgeslagen in</string>
-  <string name="qr_dialogue_title">Je QR-code</string>
-  <string name="download">Installeer</string>
-  <string name="send_new_message">Stuur nieuw bericht</string>
-  <string name="choose_recipient_title">Kies een ontvanger voor het bericht</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Kies een ontvanger voor het bericht</string>
   <string name="action_continue">Ga verder</string>
-  <string name="scan_qr_code">Scan QR code</string>
-  <string name="enter_recipient_uuid">Voer Gebruikers-ID van ontvanger in</string>
-  <string name="invited_to_party">Je bent uitgenodigd voor een groep!</string>
+    <string name="invited_to_party">Je bent uitgenodigd voor een groep!</string>
   <string name="stats_widget_label">Habitica-statistieken</string>
   <string name="add_task">Voeg taak toe</string>
   <string name="add_habit">Voeg Gewoonte toe</string>
@@ -414,15 +310,14 @@
   <string name="widget_habit_button">Habitica Doe Gewoonte</string>
   <string name="widget_dailies">Habitica Dagelijkse taken</string>
   <string name="widget_todo_list">Habitica to-do lijst</string>
-  <string name="widget_add_task">Habitica Voeg taak toe</string>
-  <string name="google_services_missing">Google play diensten niet gevonden.</string>
-  <string name="gem.purchase.toolbartitle">Kopen</string>
-  <string name="gem.purchase.title">Door het kopen van edelstenen steun je de ontwikkelaars en help je Habitica online te houden</string>
-  <string name="gem.purchase.subtitle">Met edelstenen kun je leuke extra\'s voor je account kopen, inclusief:</string>
-  <string name="gem.purchase.listitem1">Gave kostuums voor je avatar</string>
-  <string name="gem.purchase.listitem2">Gave achtergronden</string>
-  <string name="gem.purchase.listitem3">Queesten die je belonen met huisdiereieren</string>
-  <string name="gem.purchase.listitem4">De mogelijkheid om je klasse te veranderen voor niveau 100</string>
+    <string name="google_services_missing">Google play diensten niet gevonden.</string>
+  <string name="gem.purchase_toolbartitle">Kopen</string>
+  <string name="gem.purchase_title">Door het kopen van edelstenen steun je de ontwikkelaars en help je Habitica online te houden</string>
+  <string name="gem.purchase_subtitle">Met edelstenen kun je leuke extra\'s voor je account kopen, inclusief:</string>
+  <string name="gem.purchase_listitem1">Gave kostuums voor je avatar</string>
+  <string name="gem.purchase_listitem2">Gave achtergronden</string>
+  <string name="gem.purchase_listitem3">Queesten die je belonen met huisdiereieren</string>
+  <string name="gem.purchase_listitem4">De mogelijkheid om je klasse te veranderen voor niveau 100</string>
   <string name="support_habitica">Steun Habitica</string>
   <string name="skill_transformation_use">gebruik</string>
   <string name="hatching_market_info">Krijg je niet de goede drops? Neem een kijkje op de Markt!</string>
@@ -436,32 +331,32 @@
   <string name="belongs_to_challenge">Hoort bij een Uitdaging</string>
   <string name="has_reminder">Heeft herinnering</string>
   <string name="has_tag">Heeft label</string>
-  <string name="subscribe.title">Met het nemen van een abonnement steun je de ontwikkelaars en help je Habitica online te houden</string>
+  <string name="subscribe_title">Met het nemen van een abonnement steun je de ontwikkelaars en help je Habitica online te houden</string>
   <string name="subscribe_prompt">Word een abonnee en ontvang deze nuttige voordelen:</string>
-  <string name="subscribe.listitem1">Koop edelstenen met goud</string>
-  <string name="subscribe.listitem2">Exclusieve maandelijkse voorwerpen</string>
-  <string name="subscribe.listitem3">Achterhaal extra geschiedenis</string>
-  <string name="subscribe.listitem4">Dagelijkse vondstlimiet verdubbeld</string>
+  <string name="subscribe_listitem1">Koop edelstenen met goud</string>
+  <string name="subscribe_listitem2">Exclusieve maandelijkse voorwerpen</string>
+  <string name="subscribe_listitem3">Achterhaal extra geschiedenis</string>
+  <string name="subscribe_listitem4">Dagelijkse vondstlimiet verdubbeld</string>
   <string name="subscriptions">Abonnementen</string>
   <string name="subscription_duration">Keert iedere %s terug</string>
   <string name="subscription_duration_norenew">Voor %s</string>
   <string name="subscribe">Abonneer</string>
-  <string name="subscribe.listitem1.description">Alexander de Koopman zal nu edelstenen aan je verkopen voor 20 goud per edelsteen!\n\nZijn maandelijkse levering is initieel beperkt tot 25 edelstenen per maand, maar stijgt afhankelijk van de duur van je abonnement.\n\nDit limiet verhoogt met 5 edelstenen voor elke 3 maanden van opeenvolgende abonnement periodes, tot een maximum van 50 edelstenen per maand!</string>
-  <string name="subscribe.listitem2.description">Iedere maand ontvang je een uniek cosmetisch voorwerp voor je avatar!\n\nEn voor iedere 3 maanden van opeenvolgende abonnementsperiodes, geven de mysterieuze tijdreizigers je toegang tot historische (en futuristische!) cosmetische voorwerpen.</string>
-  <string name="subscribe.listitem3.description">Maakt voltooide To-do\'s en taakgeschiedenis langer beschikbaar.</string>
-  <string name="subscribe.listitem4.description">Dubbele vondstlimieten laten je dagelijks meer voorwerpen verdienen van je voltooide taken, waardoor je je stal sneller kan voltooien!</string>
-  <string name="subscribe1month.gemcap">25 Edelsteen drempel</string>
-  <string name="subscribe3month.gemcap">30 Edelsteen drempel</string>
-  <string name="subscribe6month.gemcap">35 Edelsteen drempel</string>
-  <string name="subscribe12month.gemcap">45 Edelsteen drempel</string>
+  <string name="subscribe.listitem1_description">Alexander de Koopman zal nu edelstenen aan je verkopen voor 20 goud per edelsteen!\n\nZijn maandelijkse levering is initieel beperkt tot 25 edelstenen per maand, maar stijgt afhankelijk van de duur van je abonnement.\n\nDit limiet verhoogt met 5 edelstenen voor elke 3 maanden van opeenvolgende abonnement periodes, tot een maximum van 50 edelstenen per maand!</string>
+  <string name="subscribe.listitem2_description">Iedere maand ontvang je een uniek cosmetisch voorwerp voor je avatar!\n\nEn voor iedere 3 maanden van opeenvolgende abonnementsperiodes, geven de mysterieuze tijdreizigers je toegang tot historische (en futuristische!) cosmetische voorwerpen.</string>
+  <string name="subscribe.listitem3_description">Maakt voltooide To-do\'s en taakgeschiedenis langer beschikbaar.</string>
+  <string name="subscribe.listitem4_description">Dubbele vondstlimieten laten je dagelijks meer voorwerpen verdienen van je voltooide taken, waardoor je je stal sneller kan voltooien!</string>
+  <string name="subscribe1month_gemcap">25 Edelsteen drempel</string>
+  <string name="subscribe3month_gemcap">30 Edelsteen drempel</string>
+  <string name="subscribe6month_gemcap">35 Edelsteen drempel</string>
+  <string name="subscribe12month_gemcap">45 Edelsteen drempel</string>
   <string name="subscription_hourglasses">+%d Mystieke Zandloper</string>
   <string name="payment_method">Betaalmethode</string>
   <string name="subscription">Abonnement</string>
   <string name="active">Actief</string>
   <string name="due">Tegen</string>
   <string name="cancel_subscription">Annuleer abonnement</string>
-  <string name="cancel_subscription_google.description">Wil je niet langer abonneren? Je kan de optie om je abonnement stop te zetten vinden in de \"Mijn apps\" sectie van de Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Wil je niet langer abonneren? Vanwege je betaalmethode kan je enkel via de website je abonnement stopzetten. Klik op de knop hieronder om de site in je browser te openen!</string>
+  <string name="cancel_subscription_google_description">Wil je niet langer abonneren? Je kan de optie om je abonnement stop te zetten vinden in de \"Mijn apps\" sectie van de Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">Wil je niet langer abonneren? Vanwege je betaalmethode kan je enkel via de website je abonnement stopzetten. Klik op de knop hieronder om de site in je browser te openen!</string>
   <string name="visit_habitica_website">Bezoek Habitica Website</string>
   <string name="current_bonuses">Huidige bonussen</string>
   <string name="months_subscribed">Maanden geabonneerd</string>
@@ -476,56 +371,40 @@
   <string name="twelve_months">12 maanden</string>
   <string name="subscribe_prompt_thanks">Voor het abonneren ontvang je deze nuttige voordelen:</string>
   <string name="subscription_status">Abonnementstatus</string>
-  <string name="byLeader">door %s</string>
-  <string name="challenge_details">Uitdagingsdetails</string>
-  <string name="challenge_leave_title">Verlaat uitdaging</string>
+    <string name="challenge_leave_title">Verlaat uitdaging</string>
   <string name="challenge_leave_text">Weet je zeker dat je de uitdaging \"%s\" wilt verlaten?</string>
   <string name="challenge_remove_tasks_title">Verwijder taken</string>
   <string name="challenge_remove_tasks_text">Wil je de taken verwijderen?</string>
   <string name="remove_tasks">Verwijderen</string>
   <string name="keep_tasks">Houden</string>
   <string name="my_challenges">Mijn uitdagingen</string>
-  <string name="public_challenges">Openbaar</string>
-  <string name="challenges">Uitdagingen</string>
-  <string name="daily">Dagelijkse taak</string>
+    <string name="daily">Dagelijkse taak</string>
   <string name="habit">Gewoonte</string>
   <string name="reward">Beloning</string>
   <string name="todo">To-do</string>
   <string name="official">Officieel</string>
-  <string name="participating">Deelnemende</string>
-  <string name="challenge">Uitdaging</string>
-  <string name="go_to_challenge">Ga naar uitdaging</string>
-  <string name="not_part_of_a_challenge">Je maakt geen deel uit van uitdagingen op dit moment!</string>
+    <string name="challenge">Uitdaging</string>
+    <string name="not_part_of_a_challenge">Je maakt geen deel uit van uitdagingen op dit moment!</string>
   <string name="join_a_challenge">Doe mee aan een uitdaging om een samengestelde set van taken aan je list toe te voegen en neem het op tegen andere Habiticanen om prestaties en zelfs edelstenen te winnen!</string>
   <string name="check_the_public_challenge_tab">Tik op de \"Publiek\" tab om speler-gemaakte uitdagingen te vinden die het best bij jou passen!</string>
-  <string name="add_reminder">Voeg herinnering toe</string>
-  <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">Berichten</string>
-  <string name="FAQ">Veel gestelde vragen</string>
-  <string name="special">Speciaal</string>
+    <string name="inbox">Berichten</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>
-  <string name="limited_count">%d over</string>
-  <string name="gem_shop">Edelsteen</string>
+    <string name="gem_shop">Edelsteen</string>
   <string name="mystery_item">Mysterieus voorwerp</string>
   <string name="myster_item_notes">Iedere maand ontvangen abonnees een mysterieus voorwerp. Dit wordt meestal een week voor het einde van de maand uitgebracht.</string>
   <string name="open">Open</string>
-  <string name="notification_mystery_item">Je opent de doos en vindt %s!</string>
-  <string name="checkInRewardEarned">Je ontvangt een %1$s als beloning voor je toewijding bij het beteren van je leven.</string>
+    <string name="checkInRewardEarned">Je ontvangt een %1$s als beloning voor je toewijding bij het beteren van je leven.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Je volgende prijs wordt vrijgespeeld na %1$d check-ins.</string>
   <string name="pending_approval">wachten op goedkeuring</string>
   <string name="filters">Filters</string>
   <string name="done">Klaar</string>
-  <string name="group_tasks_edit_description">Groepstaken kunnen niet bewerkt worden.</string>
-  <string name="group_tasks_edit_title">Kan deze taak niet bewerken</string>
-  <string name="groups">Groepen</string>
+    <string name="groups">Groepen</string>
   <string name="all">Alle</string>
   <string name="none">Geen</string>
   <string name="owned">Van jou</string>
   <string name="not_owned">Niet van jou</string>
-  <string name="new_game">Nieuw\nSpel</string>
-  <string name="login_btn_fb">Aanmelden met Facebook</string>
+    <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="randomize">Willekeurig</string>
@@ -556,7 +435,6 @@
   <string name="reload_content">Inhoud herladen</string>
   <string name="dailyDueDefaultView">Standaard de \'Onvoltooid\' tab laten zien in Dagelijkse Taken</string>
   <string name="dailyDueDefaultViewDescription">Als deze optie aan staat, wordt standaard de \'onvoltooid\' tab getoond in plaats van \'alle\'</string>
-  <string name="repeat_summary">Herhaalt %1$s elke %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Je apparaat heeft geen van de ondersteunde betaalmethodes. Gebruik alsjeblieft de Habitica-website als je edelstenen wilt kopen.</string>
   <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>
@@ -564,8 +442,7 @@
   <string name="gem_reward">Edelsteen beloning</string>
   <string name="tasks">Taken</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_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 korte naam</string>
   <string name="challenge_create_error_tag">Je hebt een korte naam nodig om deze uitdaging te maken.</string>
@@ -575,42 +452,36 @@
   <string name="new_challenge_title">Nieuwe titel voor uitdaging</string>
   <string name="ownership">Eigenaarschap</string>
   <string name="inn">Herberg</string>
-  <string name="system">Systeem</string>
-  <string name="start_quest">Begin aan een nieuwe Queeste</string>
+    <string name="start_quest">Begin aan een nieuwe Queeste</string>
   <string name="leave_party">Verlaat Groep</string>
   <string name="party_description">Groepsbeschrijving</string>
-  <string name="abort_confirmation">Weet je zeker dat je deze queeste wilt annuleren? Hij zal voor iedereen in je groep worden geannuleerd en alle voortgang zal verloren gaan. De queeste-perkamentrol zal teruggegeven worden aan de eigenaar van de queeste.</string>
-  <string name="leave_quest_confirmation">Weet je zeker dat je de actieve queeste wilt verlaten? Al je voortgang in de queeste zal verloren gaan.</string>
-  <string name="number_participants">%1$d Deelnemers</string>
+    <string name="number_participants">%1$d Deelnemers</string>
   <string name="welcome_back">Welkom terug</string>
   <string name="yesterdaililes_prompt">Heb je gisteren één van deze Dagelijkse taken voltooid?</string>
   <string name="start_day">Begin mijn dag</string>
   <string name="leave_party_confirmation">Weet je zeker dat je de groep wilt verlaten?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Volgende prijs in %d check-ins</string>
-  <string name="pending">In afwachting</string>
+    <string name="pending">In afwachting</string>
   <string name="accepted">Geaccepteerd</string>
   <string name="declined">Afgewezen</string>
   <string name="participants">Deelnemers</string>
   <string name="invitations">Uitnodigingen</string>
-  <string name="quest_leader_header" formatted="false">Begonnen door %s</string>
+  <string name="quest_leader_header">Begonnen door %s</string>
   <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="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>
-  <string name="gems_left_nomax" formatted="false">Maandelijkse edelstenen: %d Resterend</string>
+    <string name="available_until">Verkrijgbaar tot %s</string>
+  <string name="gems_left_max">Maandelijkse edelstenen: %1$d/%2$d Resterend</string>
+  <string name="gems_left_nomax">Maandelijkse edelstenen: %d Resterend</string>
   <string name="health">Gezondheid</string>
   <string name="collect">Verzamel</string>
   <string name="rage_meter">Furie meter</string>
   <string name="boss_quest">Baas Queeste</string>
   <string name="collection_quest">Verzamel Queeste</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%dErvaringspunten</string>
-  <string name="gold_reward" formatted="false">%d Goud</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%dErvaringspunten</string>
+  <string name="gold_reward">%d Goud</string>
   <string name="quest_owner_rewards">Queeste Eigenaar Beloningen</string>
   <string name="str_abbrv">KRA</string>
   <string name="per_abbrv">PER</string>
@@ -623,8 +494,7 @@
   <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="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>
@@ -657,8 +527,7 @@
   <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_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>
@@ -679,7 +548,7 @@
   <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="points_to_allocate">%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>
@@ -689,9 +558,7 @@
   <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="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>
@@ -705,19 +572,13 @@
   <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="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="rage_strike_count">Woede Aanvallen: %d/%d</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="strike_active_title">De %s werd aangevallen!</string>
+    <string name="strike_active_description">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>
@@ -727,29 +588,21 @@
   <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="join_party_title">Wil je deelnemen aan een gezelschap?</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="world_boss_description_title">Wat is een Wereldbaas?</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="world_boss_action_prompt">Versla de Baas om speciale beloningen te ontvangen en red Habitica van %s\'s terreur!</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="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>
@@ -780,15 +633,13 @@
   <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="usernamePromptWiki">Als je meer te weten wil komen over deze verandering, <a href="https://habitica.wikia.com/wiki/Player_Names">bezoek onze wiki.</a></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="usernamePromptWiki">Als je meer te weten wil komen over deze verandering, <a href="https://habitica.wikia_com/wiki/Player_Names">bezoek onze wiki.</a></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>
   <string name="username_confirmed">gebruikersnaam bevestigt</string>
-  <string name="username_level">\@%s ・niv %d</string>
-  <string name="enter_recipient_username">Voer een ontvanger in @gebruikersnaam</string>
+    <string name="enter_recipient_username">Voer een ontvanger in @gebruikersnaam</string>
   <string name="username_copied">Gebruikersnaam gekopieerd naar het prikbord</string>
   <string name="display_name_length_error">Gebruikersnamen moeten tussen 1 en 30 karakters lang zijn</string>
   <string name="setup_task_join_habitica">Sluit je aan bij Habitica (Aanvinken)</string>
diff --git a/Habitica/res/values-pl/strings.profile.xml b/Habitica/res/values-pl/strings.profile.xml
index fed0ad7f7..2e545c82b 100644
--- a/Habitica/res/values-pl/strings.profile.xml
+++ b/Habitica/res/values-pl/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Poziom:</string>
     <string name="profile_class_bonus">Premia klasowa:</string>
     <string name="profile_allocated">Umieszczone:</string>
-    <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 199edca2f..bda4f8ff6 100644
--- a/Habitica/res/values-pl/strings.sidebar.xml
+++ b/Habitica/res/values-pl/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <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">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">Ekwipunek</string>
-  <string name="sidebar.avatar">Awatar</string>
-  <string name="sidebar.equipment">Ekwipunek</string>
-  <string name="sidebar.stable">Stajnia</string>
-  <string name="sidebar.news">Aktualności</string>
-  <string name="sidebar.settings">Ustawienia</string>
-  <string name="sidebar.about">O programie</string>
+  <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">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">Ekwipunek</string>
+  <string name="sidebar_avatar">Awatar</string>
+  <string name="sidebar_equipment">Ekwipunek</string>
+  <string name="sidebar_stable">Stajnia</string>
+  <string name="sidebar_news">Aktualności</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 37c26ed23..334c1dbee 100644
--- a/Habitica/res/values-pl/strings.tutorial.xml
+++ b/Habitica/res/values-pl/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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>
-  <string name="tutorial_equipment">Tu pojawia się zakupiony ekwipunek. Wyposażenie Bojowe wpływa na Twoje statystyki, a Kostium (o ile włączony) na wygląd Twojego awatara.</string>
-  <string name="tutorial_items">Zbieraj przedmioty kończąc zadania i zdobywając poziomy. Stuknij przedmiot, żeby go użyć!</string>
-  <string name="tutorial_pets">Kończąc zadania w prawdziwym świecie, masz szansę znalezienia losowych jaj i eliksirów. Połącz je, aby wykluć chowańce</string>
-  <string name="tutorial_skills">Umiejętności to specjalne zdolności, które mają potężne efekty! Stuknij umiejętność, aby jej użyć. To kosztuje Mana (niebieski pasek), którą zyskujesz zaglądając tu codziennie i kończąc zadania w prawdziwym świecie. Aby dowiedzieć się więcej, zaglądnij do FAQ w menu!</string>
+    <string name="tutorial_skills">Umiejętności to specjalne zdolności, które mają potężne efekty! Stuknij umiejętność, aby jej użyć. To kosztuje Mana (niebieski pasek), którą zyskujesz zaglądając tu codziennie i kończąc zadania w prawdziwym świecie. Aby dowiedzieć się więcej, zaglądnij do FAQ w menu!</string>
   <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>
+    <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 4b81fb06b..b1f7e0111 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -4,19 +4,15 @@
   <string name="XP_default">Doświadczenie</string>
   <string name="HP_default">Zdrowie</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Preferencje nie mogą być wczytane z kodu kreskowego</string>
   <!--Prefs-->
   <string name="PS_settings_title">Ustawienia</string>
-  <string name="SP_address_hint">Domyślny serwer</string>
   <string name="SP_userID_title">Identyfikator użytkownika</string>
   <string name="SP_userID_summary">Twój identyfikator</string>
   <string name="SP_APIToken_title">Token API</string>
   <string name="SP_APIToken_summary">Twój Token API</string>
   <string name="Language_title">Język</string>
   <string name="Language_summary">Zmień język Habitici</string>
-  <string name="SP_user_qr_code">Twój kod QR</string>
   <string name="PS_contact_title">Skontaktuj się ze mną</string>
-  <string name="unknown_error">Wystąpił błąd…</string>
   <string name="pref_account_header">Konto</string>
   <string name="pref_first_day_of_the_week_title">Pierwszy Dzień Tygodnia</string>
   <string name="pref_first_day_of_the_week_summary">Pierwszy dzień tygodnia we wszystkich kalendarzach</string>
@@ -24,7 +20,6 @@
   <string name="pref_reminder_checkbox">Aktywuj przypomnienie</string>
   <string name="pref_reminder_picker">Ustaw czas przypomnienia</string>
   <string name="pref_cds_header">Własny początek dnia</string>
-  <string name="pref_cds_picker">Ustaw czas własnego początku dnia</string>
   <string name="pref_push_notifications_checkbox">Powiadomienia użytkownika</string>
   <string name="push_notifications">Powiadomienia</string>
   <string name="push_notifications_sum">Ustaw swoje ustawienia powiadomień push</string>
@@ -37,13 +32,7 @@
   <string name="preference_push_your_quest_has_begun">Twoja misja się rozpoczęła</string>
   <string name="preference_push_invited_to_quest">Zaproszono Cię na misję</string>
   <!--Adding tasks-->
-  <string name="task_value">Wartość</string>
-  <string name="new_todo">Nowe Do-Zrobienia</string>
-  <string name="new_reward">Nowa nagroda</string>
-  <string name="new_daily">Nowe codzienne</string>
-  <string name="new_habit">Nowy nawyk</string>
   <string name="action_edit">Edytuj</string>
-  <string name="action_delete">Usuń</string>
   <string name="action_cancel">Anuluj</string>
   <string name="login_btn">Logowanie</string>
   <string name="register_btn">Rejestracja</string>
@@ -54,31 +43,22 @@
   <string name="confirmpassword">Potwierdź hasło</string>
   <string name="logout">Wyloguj</string>
   <string name="logout_description">Wyloguj się</string>
-  <string name="account_details">Szczegóły konta</string>
   <string name="LoginActivityName">Witaj</string>
-  <string name="string_revive">Odrodzenie</string>
-  <string name="please_connect">Proszę zaloguj się przez aplikację przed użyciem widgetu</string>
-  <string name="about.title">O programie</string>
-  <string name="about.libraries">Biblioteki</string>
-  <string name="about.versionhistory">Historia wersji</string>
-  <string name="about.habitica_open_source">Habitica jest dostępna jako otwarte oprogramowanie na platformie Github</string>
-  <string name="about.rate_our_app">Oceń aplikację</string>
-  <string name="about.give_us_feedback">Prześlij nam opinię!</string>
-  <string name="about.bugreport">Zgłoś błąd</string>
-  <string name="about.source_code">Kod źródłowy</string>
-  <string name="repeatEvery">Powtarzaj co</string>
+  <string name="about_title">O programie</string>
+  <string name="about_libraries">Biblioteki</string>
+  <string name="about_habitica_open_source">Habitica jest dostępna jako otwarte oprogramowanie na platformie Github</string>
+  <string name="about_rate_our_app">Oceń aplikację</string>
+  <string name="about_give_us_feedback">Prześlij nam opinię!</string>
+  <string name="about_bugreport">Zgłoś błąd</string>
+  <string name="about_source_code">Kod źródłowy</string>
   <!--Network Errors-->
-  <string name="network_error_title">Błąd połączenia</string>
-  <string name="network_error_no_network_body">Nie masz połączenia z internetem.</string>
   <string name="internal_error_api">Wygląda na to, że mamy problem z serwerem. Spróbuj później.</string>
   <string name="authentication_error_title">Błąd autentykacji</string>
-  <string name="authentication_error_body">Twoja nazwa użytkownika lub hasło są niepoprawne.</string>
   <string name="login_validation_error_title">Błąd walidacji</string>
   <string name="login_validation_error_fieldsmissing">Musisz wypełnić wszystkie pola.</string>
   <string name="save_changes">Zapisz</string>
   <string name="copy">Kopiuj</string>
   <string name="notes">Notatki</string>
-  <string name="text">Tekst</string>
   <string name="difficulty">Trudność</string>
   <string name="tags">Tagi</string>
   <string name="trivial">Trywialny</string>
@@ -90,18 +70,7 @@
   <string name="negative_habit_form">Negatywne ( - )</string>
   <string name="checklist">Lista</string>
   <string name="reminders">Przypomnienia</string>
-  <string name="actions">Akcje</string>
   <string name="attributes">Atrybuty</string>
-  <string name="physical">Siła</string>
-  <string name="mental">Inteligencja</string>
-  <string name="social">Kondycja</string>
-  <string name="other">Percepcja</string>
-  <string name="frequency">Częstotliwość</string>
-  <string name="frequency_weekly">W konkretne dni tygodnia</string>
-  <string name="frequency_daily">Co X dni</string>
-  <string name="repeatables_summary_title">Podsumowanie</string>
-  <string name="repeatables_title">Powtórzenia</string>
-  <string name="repeatables_on_title">Powtarza się</string>
   <string name="repeatables_frequency_daily">Codzienny</string>
   <string name="repeatables_frequency_weekly">Cotygodniowy</string>
   <string name="repeatables_frequency_monthly">Co miesiąc </string>
@@ -122,23 +91,14 @@
   <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>
-  <string name="profile_image">Obrazek profilowy</string>
-  <string name="mana_price_button">%d PM</string>
-  <string name="used_skill">Użyłeś %1$s za %2$d pkt many.</string>
   <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="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>
-  <string name="flag_confirm">Oznacz wiadomość</string>
   <string name="unlock_lvl_11">Odblokuj na poziomie 11</string>
-  <string name="no_party_message">Nie jesteś w drużynie. Żeby dołączyć do drużyny odwiedź stronę internetową.</string>
   <string name="forgot_pw_btn">Zapomniane hasło</string>
-  <string name="tavern.inn.checkOut">Reaktywuj swoje codzienne</string>
-  <string name="tavern.inn.rest">Zapauzuj swoje codzienne</string>
-  <string name="reward.dialog.buy">Kup</string>
-  <string name="reward.dialog.dismiss">Anuluj</string>
+  <string name="tavern.inn_checkOut">Reaktywuj swoje codzienne</string>
+  <string name="tavern.inn_rest">Zapauzuj swoje codzienne</string>
+  <string name="reward.dialog_buy">Kup</string>
+  <string name="reward.dialog_dismiss">Anuluj</string>
   <string name="party">Drużyna</string>
   <string name="chat">Czat</string>
   <string name="members">Członkowie</string>
@@ -146,8 +106,6 @@
   <string name="dailies">Codzienne</string>
   <string name="todos">Do zrobienia</string>
   <string name="rewards">Nagrody</string>
-  <string name="taskform.delete.title">Jesteś pewien?</string>
-  <string name="taskform.delete.message">Czy na pewno chcesz usunąć?</string>
   <string name="yes">Tak</string>
   <string name="no">Nie</string>
   <string name="quest">Misja</string>
@@ -155,14 +113,12 @@
   <string name="avatar_hair">Włosy</string>
   <string name="avatar_shirt">Koszulka</string>
   <string name="avatar_skin">Skóra</string>
-  <string name="avatar_ears">Zwierzęce uszy</string>
   <string name="avatar_base">Spód</string>
   <string name="avatar_color">Kolor</string>
   <string name="avatar_beard">Broda</string>
   <string name="avatar_mustache">Wąsy</string>
   <string name="avatar_flower">Kwiatek</string>
   <string name="avatar_bangs">Grzywka</string>
-  <string name="avatar_nothing">Nie wybrano</string>
   <string name="avatar_size">Rozmiar</string>
   <string name="avatar_size_slim">Szczupła</string>
   <string name="avatar_size_broad">Krzepka</string>
@@ -172,22 +128,16 @@
   <string name="purchase_button">Kup</string>
   <string name="purchase_set_title">Kup zestaw %s</string>
   <string name="due_date">Termin</string>
-  <string name="quest.accept">Akceptuj</string>
-  <string name="quest.reject">Odrzuć</string>
-  <string name="quest.begin">Rozpocznij Quest</string>
-  <string name="quest.cancel">Anuluj Zaproszenie</string>
-  <string name="quest.abort">Przerwij Quest</string>
-  <string name="quest.leave">Opuść Misję</string>
-  <string name="quest.pending">Oczekujące</string>
-  <string name="quest.accepted">Zaakceptowane</string>
-  <string name="quest.rejected">Odrzucone</string>
-  <string name="quest.participants">Uczestnicy</string>
+  <string name="quest_accept">Akceptuj</string>
+  <string name="quest_reject">Odrzuć</string>
+  <string name="quest_begin">Rozpocznij Quest</string>
+  <string name="quest_cancel">Anuluj Zaproszenie</string>
+  <string name="quest_abort">Przerwij Quest</string>
   <string name="version_info">Wersja %1$s (%2$d)</string>
   <string name="sidebar_help">Pomoc i FAQ</string>
   <string name="complete_tutorial">Jasne!</string>
   <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>
@@ -196,11 +146,8 @@
   <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>
   <string name="next_button">Następny</string>
   <string name="skip_button">Pomiń</string>
-  <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>
@@ -231,28 +178,19 @@
   <string name="setup_task_creativity_1">Studiować mistrzostwo rzemiosła</string>
   <string name="setup_task_creativity_2">Pracować nad twórczym projektem</string>
   <string name="setup_task_creativity_3">Ukończyć twórczy projekt</string>
-  <string name="gem.purchase.support">Chcesz nam pomóc w utrzymaniu Habitiki? Możesz wesprzeć deweloperów kupując Klejnoty!\n\nZa Klejnoty można kupować zabawne dodatki do konta, takie jak:\n\n - Fajne kostiumy dla Twojego awatara\n - Fantastyczne tła\n - Ciekawe misje, w których nagrodą są jaja chowańców\n - Możliwość zmiany klasy przed osiągnięciem poziomu 100\n\nStukrotne dzięki za pomaganie nam w czynieniu Habitiki najlepszą, jaka może być. Twoja pomoc wiele dla nas znaczy!</string>
   <string name="my_guilds">Moje Gildie</string>
   <string name="public_guilds">Publiczne Gildie</string>
   <string name="guild">Gildia</string>
   <string name="leave">Opuść</string>
   <string name="join">Dołącz</string>
-  <string name="leader">Lider</string>
   <string name="gems">Klejnoty</string>
-  <string name="copy_as_todo">Kopiuj jako Do-Zrobienia</string>
-  <string name="send_pm">Wyślij wiadomość</string>
-  <string name="flag">Oznacz</string>
   <string name="delete">Usuń</string>
   <string name="name">Nazwa</string>
   <string name="description">Opis</string>
   <string name="add_tag">Dodaj nowy tag</string>
   <string name="privacy">Prywatność</string>
   <string name="write_message">Napisz wiadomość</string>
-  <string name="post">Wyślij</string>
   <string name="guild_search_hint">Szukaj gildii</string>
-  <string name="todo_due">Termin: %s</string>
-  <string name="daily_streak">licznik serii: %d</string>
-  <string name="todo_has_duedate">Zdania mają termin wykonania</string>
   <string name="battle_gear">Sprzęt Bojowy</string>
   <string name="costume">Kostium</string>
   <string name="outfit_head">Głowa</string>
@@ -266,9 +204,7 @@
   <string name="wear_costume">Użyj kostiumu</string>
   <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 misji</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>
@@ -280,12 +216,8 @@
   <string name="armoireEquipment">Znalazłeś element rzadkiego Ekwipunku w Skrzyni: %s! Super!</string>
   <string name="armoireFood">Przeszukujesz Skrzynię i znajdujesz %1$s %2$s. Co to tam robi?</string>
   <string name="armoireExp">Mocujesz się ze Skrzynią i zyskujesz Doświadczenie. A masz!</string>
-  <string name="armoireNotesFull">Otwórz Skrzynię żeby losowo otrzymać specjalne Wyposażenie, Doświadczenie lub jedzenie! Pozostało elementów : %d</string>
-  <string name="armoireLastItem">Znalazłeś ostatni element rzadkiego Wyposażenia w Zaklętej Skrzyni.</string>
-  <string name="armoireNotesEmpty">Skrzynia otrzyma nowe Wyposażenie w pierwszym tygodniu każdego miesiąca. Do tego czasu klikaj aby otrzymać Doświadczenie i Jedzenie!</string>
   <string name="sell">Sprzedaj (%d Złoto)</string>
   <string name="hatch_with_potion">Wykluj za pomocą mikstury</string>
-  <string name="feed_to_pet">Nakarm chowańca</string>
   <string name="hatch_egg">Wykluj za pomocą jaja</string>
   <string name="invite_party">Zaproś drużynę</string>
   <string name="dialog_feeding">Nakarm %s</string>
@@ -296,16 +228,7 @@
   <string name="close">Zamknij</string>
   <string name="share">Podziel się</string>
   <string name="notification_pet_fed">Nakarmiłeś/aś %s!</string>
-  <string name="notification_purchase">Kupiłeś %s</string>
   <string name="notification_purchase_reward">Kupiłeś nagrodę</string>
-  <string name="sectiondrop">Standardowe</string>
-  <string name="sectionpremium">Eliksir Magiczny</string>
-  <string name="sectionquest">Misja</string>
-  <string name="sectionspecial">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">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ń.
@@ -324,7 +247,6 @@
   <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>
   <string name="select_class">Wybierz klasę postaci</string>
   <string name="opt_out_class">Wycofaj się</string>
-  <string name="opt_out_description">Nie zależy ci na klasach? Chcesz wybrać później? Wycofaj się - będziesz wojownikiem bez specjalnych umiejętności. Możesz przeczytać o systemie klas później na wiki i włączyć klasy w każdej chwili.</string>
   <string name="class_confirmation">Jesteś pewien, że chcesz być %s?</string>
   <string name="class_changed">Jesteś teraz %s!</string>
   <string name="class_changed_description">Masz nowe domyślne wyposażenie bojowe, które możesz zmienić pod Wyposażeniem!</string>
@@ -339,12 +261,9 @@
   <string name="invite_existing_users">Zaproś istniejących użytkowników</string>
   <string name="send">Wyślij</string>
   <string name="invite">Zaproś znajomych</string>
-  <string name="invite_id_description">Jeśli Twoi znajomi używają już Habitiki, zaproś ich za pomocą ID Użytkownika tutaj.</string>
   <string name="invite_email_description">Jeśli przyjaciel dołączył do Habitiki przez Twojego maila, zostanie automatycznie dodany do Twojej drużyny!</string>
   <string name="add_invites">Dodaj zaproszenia</string>
-  <string name="user_id">ID Użytkownika</string>
   <string name="email">Email</string>
-  <string name="invite_users">Zaproś do drużyny</string>
   <string name="share_using">Udostępnij używanie</string>
   <string name="share_levelup">Uzyskałem poziom %d w Habitice dzięki poprawie moich życiowych nawyków!</string>
   <string name="share_hatched">Właśnie wyklułem chowańca %1$s %2$s w Habitice dzięki wypełnianiu życiowych zadań!</string>
@@ -352,8 +271,6 @@
   <string name="open_in_store">Otwórz w sklepie Google Play</string>
   <string name="change_class_confirmation">Jesteś pewien, że chcesz zmienić klasę? Będzie to kosztować 3 kryształy.</string>
   <string name="change_class_equipment_warning">Ostrzeżenie: Nie będziesz nie będziesz mógł kupić wyposażenia dla klasy: %s.</string>
-  <string name="leaderMessage">Wiadomość od %1$s</string>
-  <string name="leaderName">Lider: %1$s</string>
   <string name="confirm">Potwierdź</string>
   <string name="market">Sklep</string>
   <string name="timeTravelers">Podróżnicy w czasie</string>
@@ -362,36 +279,15 @@
   <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>
-  <string name="hourglass">klepsydra</string>
-  <string name="hourglasses">klepsydry</string>
-  <string name="gold_singular">złoto</string>
   <string name="gold_plural">złoto</string>
   <string name="chat_message_copied">Wiadomość skopiowana do schowka</string>
-  <string name="copy_chat_message">Kopiuj do schowka</string>
-  <string name="edit_tag_title">Edytuj tag</string>
   <string name="edit_tag_btn_edit">Edytuj</string>
-  <string name="edit_tag_btn_done">Zrobione</string>
-  <string name="edit_tag_btn_delete">Usuń</string>
   <string name="confirm_delete_tag_title">Jesteś pewien?</string>
   <string name="confirm_delete_tag_message">Czy na pewno chcesz usunąć?</string>
-  <string name="filter_drawer_edit_tags">Edytuj tagi</string>
-  <string name="filter_drawer_filter_tags">Filtruj po tagach</string>
   <!--QR Strings-->
-  <string name="qr_section_title">Ktoś może zaprosić cię przy pomocy tego kodu QR</string>
-  <string name="qr_save_message">Kod QR zapisany w</string>
-  <string name="qr_dialogue_title">Twój kod QR</string>
-  <string name="download">Pobierz</string>
-  <string name="send_new_message">Wyślij nową wiadomość</string>
   <string name="choose_recipient_title">Wybierz odbiorcę wiadomości</string>
   <string name="action_continue">Kontynuuj</string>
-  <string name="scan_qr_code">Przeskanuj kod QR</string>
-  <string name="enter_recipient_uuid">Wpisz ID odbiorcy</string>
   <string name="invited_to_party">Zostałeś zaproszony do drużyny!</string>
   <string name="stats_widget_label">Statystyki Habitiki</string>
   <string name="add_task">Dodaj Zadanie</string>
@@ -403,15 +299,14 @@
   <string name="widget_habit_button">Nawyk Habitiki</string>
   <string name="widget_dailies">Codzienne Habitiki</string>
   <string name="widget_todo_list">Lista Do-Zrobienia Habitiki</string>
-  <string name="widget_add_task">Dodaj zadanie do Habitiki</string>
   <string name="google_services_missing">Nie znaleziono usługi Google Play.</string>
-  <string name="gem.purchase.toolbartitle">Zamów</string>
-  <string name="gem.purchase.title">Kupując klejnoty, wspierasz deweloperów Habitiki i pozwalasz projektowi istnieć</string>
-  <string name="gem.purchase.subtitle">Klejnoty pozwalają dokupić ekstra dodatki do konta, na przykład:</string>
-  <string name="gem.purchase.listitem1">Świetne kostiumy dla awatara</string>
-  <string name="gem.purchase.listitem2">Genialne tła</string>
-  <string name="gem.purchase.listitem3">Zadania, w których nagrodą są jaja</string>
-  <string name="gem.purchase.listitem4">Możliwość zmiany klasy przed osiągnięciem 100. poziomu</string>
+  <string name="gem.purchase_toolbartitle">Zamów</string>
+  <string name="gem.purchase_title">Kupując klejnoty, wspierasz deweloperów Habitiki i pozwalasz projektowi istnieć</string>
+  <string name="gem.purchase_subtitle">Klejnoty pozwalają dokupić ekstra dodatki do konta, na przykład:</string>
+  <string name="gem.purchase_listitem1">Świetne kostiumy dla awatara</string>
+  <string name="gem.purchase_listitem2">Genialne tła</string>
+  <string name="gem.purchase_listitem3">Zadania, w których nagrodą są jaja</string>
+  <string name="gem.purchase_listitem4">Możliwość zmiany klasy przed osiągnięciem 100. poziomu</string>
   <string name="support_habitica">Wesprzyj Habitikę</string>
   <string name="skill_transformation_use">użyj</string>
   <string name="hatching_market_info">Nie znajdujesz poszukiwanych prezentów? Sprawdź na Targu!</string>
@@ -425,24 +320,24 @@
   <string name="belongs_to_challenge">Należy do wyzwania</string>
   <string name="has_reminder">Ma powiadomienie</string>
   <string name="has_tag">Ma tag</string>
-  <string name="subscribe.title">Subskrypcja wspiera deweloperów i pozwala utrzymać Habitikę</string>
+  <string name="subscribe_title">Subskrypcja wspiera deweloperów i pozwala utrzymać Habitikę</string>
   <string name="subscribe_prompt">Zostań abonentem i uzyskuj te użyteczne korzyści:</string>
-  <string name="subscribe.listitem1">Kup klejnoty za złoto</string>
-  <string name="subscribe.listitem2">Ekskluzywne przedmioty miesiąca </string>
-  <string name="subscribe.listitem3">Zachowuj dodatkowe wpisy w historii konta</string>
-  <string name="subscribe.listitem4">Dzienny limit łupów podwojony</string>
+  <string name="subscribe_listitem1">Kup klejnoty za złoto</string>
+  <string name="subscribe_listitem2">Ekskluzywne przedmioty miesiąca </string>
+  <string name="subscribe_listitem3">Zachowuj dodatkowe wpisy w historii konta</string>
+  <string name="subscribe_listitem4">Dzienny limit łupów podwojony</string>
   <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="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="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\" w 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="cancel_subscription_google_description">Nie chcesz dłużej subskrypcji\? Możesz z niej zrezygnować w sekcji \"Moje Aplikacje\" w 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>
@@ -457,8 +352,6 @@
   <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>
   <string name="challenge_leave_title">Opuść wyzwanie</string>
   <string name="challenge_leave_text">Jesteś pewien, że chcesz opuścić wyzwanie “%s”?</string>
   <string name="challenge_remove_tasks_title">Usuń zadania</string>
@@ -466,45 +359,31 @@
   <string name="remove_tasks">Usuń</string>
   <string name="keep_tasks">Zachowaj</string>
   <string name="my_challenges">Moje wyzwania</string>
-  <string name="public_challenges">Publiczne</string>
-  <string name="challenges">Wyzwania</string>
   <string name="daily">Codzienny </string>
   <string name="habit">Nawyk</string>
   <string name="reward">Nagroda</string>
   <string name="todo">Do-Zrobienia</string>
   <string name="official">Oficjalne</string>
-  <string name="participating">Uczestnictwo </string>
   <string name="challenge">Wyzwanie</string>
-  <string name="go_to_challenge">Idź do wyzwania </string>
   <string name="not_part_of_a_challenge">Obecnie nie uczestniczysz w żadnym wyzwaniu!</string>
   <string name="check_the_public_challenge_tab">Puknij zakładkę \"Publiczne\", aby znaleźć wyzwania stworzone przez innych użytkowników, które najlepiej pasują do ciebie!</string>
-  <string name="add_reminder">Dodaj przypomnienie</string>
-  <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">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>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Twoja następna nagroda zostanie odblokowana za %1$d wizyt</string>
   <string name="pending_approval">oczekująca aprobata</string>
   <string name="filters">Filtry</string>
   <string name="done">Zrobione</string>
-  <string name="group_tasks_edit_description">Grupowe zadanie nie mogą być edytowane.</string>
-  <string name="group_tasks_edit_title">Nie możesz edytować tego zadania</string>
   <string name="groups">Grupy</string>
   <string name="all">Wszystkie</string>
   <string name="none">Żadne</string>
   <string name="owned">Posiadane</string>
   <string name="not_owned">Nieposiadane</string>
-  <string name="new_game">Nowa\nGra</string>
   <string name="login_btn_fb">Zaloguj z Facebookiem</string>
   <string name="login_btn_google">Zaloguj z Google</string>
   <string name="action_back">Wróć</string>
@@ -535,7 +414,6 @@
   <string name="maintenance">Utrzymanie</string>
   <string name="reload_content">Odśwież zawartość</string>
   <string name="dailyDueDefaultView">Ustaw codzienne ‘dzisiejsze’ jako domyślne</string>
-  <string name="repeat_summary">Powtarzaj %1$s co %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>
@@ -548,7 +426,6 @@
   <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>
@@ -557,28 +434,26 @@
   <string name="yesterdaililes_prompt">Czy wykonałeś wczoraj któreś z tych Codziennych?</string>
   <string name="start_day">Rozpocznij mój 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>
   <string name="pending">Oczekujące</string>
   <string name="accepted">Zaakceptowane</string>
   <string name="declined">Odrzucone</string>
   <string name="participants">Uczestnicy</string>
   <string name="invitations">Zaproszenia</string>
-  <string name="quest_leader_header" formatted="false">Rozpoczęta przez %s</string>
+  <string name="quest_leader_header">Rozpoczęta przez %s</string>
   <string name="reloading_content">Odświeżanie zawartości</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: pozostało %d</string>
+  <string name="available_until">Dostępne do %s</string>
+  <string name="gems_left_nomax">Miesięczne Klejnoty: pozostało %d</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_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d punktów doświadczenia</string>
+  <string name="gold_reward">%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>
@@ -589,7 +464,6 @@
   <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="insufficientGoldTitle">Za mało złota</string>
@@ -619,7 +493,6 @@
   <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>
@@ -634,7 +507,7 @@
   <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="points_to_allocate">%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>
@@ -642,8 +515,6 @@
   <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>
@@ -654,14 +525,12 @@
   <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="rage_strike_count">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="strike_active_title">%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>
@@ -669,9 +538,7 @@
   <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="world_boss_action_prompt">Pokonaj Bossa by zdobyć specjalne nagrody i uratować Habitikę od terroru %s!</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>
@@ -681,14 +548,10 @@
     <string name="ago_1hour">1 godzinę temu</string>
     <string name="invite_username_description">Jeśli masz już znajomych, którzy korzystają z Habitiki, zaproś ich, używając ich nazwy użytkownika tutaj.</string>
     <string name="create_challenge">Stwórz wyzwanie</string>
-    <string name="edit_challenge">Edytuj</string>
-    <string name="loading">Ładowanie…</string>
-    <string name="insufficientGold">Musisz najpierw wykonać więcej zadań, zanim będzie Cię stać na ten przedmiot!</string>
+  <string name="insufficientGold">Musisz najpierw wykonać więcej zadań, zanim będzie Cię stać na ten przedmiot!</string>
     <string name="change_username">Zmień nazwę użytkownika</string>
-    <string name="id_copied">ID skopiowane do schowka</string>
-    <string name="report">Zaraportuj</string>
-    <string name="like">Lubię to</string>
-    <string name="reply">Odpowiedz</string>
+  <string name="report">Zaraportuj</string>
+  <string name="reply">Odpowiedz</string>
     <string name="challenge_categories">Kategorie Wyzwań</string>
     <string name="joined">Dołączono</string>
     <string name="public_challenge">Wyzwanie Publiczne</string>
@@ -699,8 +562,7 @@
     <string name="week_reminder_title">Jak Ci idzie z zadaniami\?</string>
     <string name="two_handed">Dwuręczna</string>
     <string name="usernamePromptTitle">Czas ustawić Twoją nazwę użytkownika!</string>
-    <string name="confirmUsername">Potwierdź nazwę użytkownika</string>
-    <string name="cancel">Anuluj</string>
+  <string name="cancel">Anuluj</string>
     <string name="confirm_username">Potwierdź nazwę użytkownika</string>
     <string name="username_not_confirmed">Nazwa użytkownika nie została potwierdzona</string>
     <string name="username_confirmed">Nazwa użytkownika została potwierdzona</string>
@@ -716,17 +578,17 @@
     <string name="reminder_title">Pamiętaj aby odznaczyć swoje zadania</string>
     <string name="ago_minutes">%d minut temu</string>
     <string name="ago_hours">%d godzin temu</string>
-    <string name="evolved_pet_title">Oswoiłeś %1$s %2$s, idź na przejażdżkę!</string>
+    <string name="evolved_pet_title">Oswoiłeś %s, idź na przejażdżkę!</string>
     <string name="opting_out_progress">Wycofywanie się</string>
     <string name="subscription_duration_norenew">Na %s</string>
-    <string name="subscribe.listitem2.description">Co miesiąc dostaniesz wyjątkowy kosmetyczny przedmiot który możesz założyć na swój awatar!
+    <string name="subscribe.listitem2_description">Co miesiąc dostaniesz wyjątkowy kosmetyczny przedmiot który możesz założyć na swój awatar!
 \n
 \nDodatkowo, za każde trzy miesiące ciągłej subskrypcji, Tajemniczy Podróżnicy w Czasie zapewnią ci dostęp do historycznych (i futurystycznych!) przedmiotów kosmetycznych.</string>
-    <string name="subscribe.listitem4.description">Podwojone limity łupów pozwolą ci otrzymać więcej przedmiotów każdego dnia, za ukończone zadania, co sprawi że twoja stajnia wypełni się szybciej!</string>
-    <string name="subscribe1month.gemcap">Limit 25 klejnotów</string>
-    <string name="subscribe3month.gemcap">Limit 3 klejnotów</string>
-    <string name="subscribe6month.gemcap">Limit 35 klejnotów</string>
-    <string name="subscribe12month.gemcap">Limit 45 klejnotów</string>
+    <string name="subscribe.listitem4_description">Podwojone limity łupów pozwolą ci otrzymać więcej przedmiotów każdego dnia, za ukończone zadania, co sprawi że twoja stajnia wypełni się szybciej!</string>
+    <string name="subscribe1month_gemcap">Limit 25 klejnotów</string>
+    <string name="subscribe3month_gemcap">Limit 3 klejnotów</string>
+    <string name="subscribe6month_gemcap">Limit 35 klejnotów</string>
+    <string name="subscribe12month_gemcap">Limit 45 klejnotów</string>
     <string name="due">Do</string>
     <string name="join_a_challenge">Dołącz do wyzwania aby dodać wybrany zastaw zadań do twojej listy i rywalizuj z innymi Habitikanami aby zdobyć osiągnięcia a nawet klejnoty!</string>
     <string name="welcome_text">Oh, musisz byś to nowy. Jestem Justin, będę twoim przewodnikiem po Habitice.
@@ -737,11 +599,9 @@
     <string name="dailyDueDefaultViewDescription">Włączenie opcji powoduje wyświetlanie zadań ‘dzisiejszych’ zamiast ‘wszystkich’</string>
     <string name="gem_reward">Nagroda w klejnotach</string>
     <string name="identify_your_challenge_with_a_tag">Określ wyzwanie krótką nazwą</string>
-    <string name="abort_confirmation">Czy na pewno chcesz przerwać tę misję\? Zostanie ona przerwana u wszystkich uczestników z twojej drużyny a cały postęp zostanie utracony. Zwój misji zostanie zwrócony do właściciela.</string>
-    <string name="leave_quest_confirmation">Czy na pewno chcesz opuścić trwającą misję\? Cały twój postęp w misji zostanie utracony.</string>
-    <string name="gems_left_max" formatted="false">Miesięczne Klejnoty: pozostało %1$d/%2$d</string>
+  <string name="gems_left_max">Miesięczne Klejnoty: pozostało %1$d/%2$d</string>
     <string name="forgot_password_confirmation">Instrukcja dotyczącą ustawiania nowego hasła zostanie wysłana na e-mail, o ile został on ustawiony w profilu.</string>
-    <string name="strike_active_description" formatted="false">Nasz ukochany %s został zdewastowany, gdy %s roztrzaskał %s. Szybko, kończ swoje zadania, żeby pokonać potwora i pomóc w odbudowie!!</string>
+    <string name="strike_active_description">Nasz ukochany %s został zdewastowany, gdy %s roztrzaskał %s. Szybko, kończ swoje zadania, żeby pokonać potwora i pomóc w odbudowie!!</string>
     <string name="equipment_str">SIŁ:</string>
     <string name="equipment_con">KON:</string>
     <string name="equipment_int">INT:</string>
diff --git a/Habitica/res/values-pt-rBR/strings.profile.xml b/Habitica/res/values-pt-rBR/strings.profile.xml
index c561e157d..3536adfcf 100644
--- a/Habitica/res/values-pt-rBR/strings.profile.xml
+++ b/Habitica/res/values-pt-rBR/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Nível:</string>
     <string name="profile_class_bonus">Bônus de Classe:</string>
     <string name="profile_allocated">Alocado:</string>
-    <string name="profile_boosts">Aumentos:</string>
     <string name="profile_private_message">Mensagem Privada</string>
     <string name="profile_achievements">Conquistas</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Fechar</string>
 
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.sidebar.xml b/Habitica/res/values-pt-rBR/strings.sidebar.xml
index e1a3da91f..da5fd73ad 100644
--- a/Habitica/res/values-pt-rBR/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rBR/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tarefas</string>
-  <string name="sidebar.skills">Habilidades</string>
-  <string name="sidebar.section.social">Social</string>
-  <string name="sidebar.inbox">Mensagens</string>
-  <string name="sidebar.tavern">Taverna</string>
-  <string name="sidebar.party">Grupo</string>
-  <string name="sidebar.purchaseGems">Gemas &amp; Inscrição</string>
-  <string name="sidebar.guilds">Guildas</string>
-  <string name="sidebar.challenges">Desafios</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>
-  <string name="sidebar.news">Noticias</string>
-  <string name="sidebar.settings">Configurações</string>
-  <string name="sidebar.about">Sobre</string>
+  <string name="sidebar_tasks">Tarefas</string>
+  <string name="sidebar_skills">Habilidades</string>
+  <string name="sidebar.section_social">Social</string>
+  <string name="sidebar_inbox">Mensagens</string>
+  <string name="sidebar_tavern">Taverna</string>
+  <string name="sidebar_party">Grupo</string>
+  <string name="sidebar_purchaseGems">Gemas &amp; Inscrição</string>
+  <string name="sidebar_guilds">Guildas</string>
+  <string name="sidebar_challenges">Desafios</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>
+  <string name="sidebar_news">Noticias</string>
+    <string name="sidebar_about">Sobre</string>
   <string name="sidebar_shops">Compras</string>
   <string name="sidebar_stats">Atributos</string>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.tutorial.xml b/Habitica/res/values-pt-rBR/strings.tutorial.xml
index d7554d12a..80bcb9e36 100644
--- a/Habitica/res/values-pt-rBR/strings.tutorial.xml
+++ b/Habitica/res/values-pt-rBR/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <string name="tutorial_rewards_1">Compre equipamento para seu personagem com o ouro que você ganha!</string>
   <string name="tutorial_rewards_2">Você também pode fazer recompensas reais personalizadas baseadas em o que motiva você.</string>
   <string name="tutorial_tasks_complete">Isso é tudo por enquanto. Se você precisa de um lembrete, cheque a seção de Perguntas Frequentes.</string>
-  <string name="tutorial_equipment">Quando você compra equipamentos, eles aparecem aqui. Seu Equipamento de Batalha afeta seus status e suas Fantasias (se habilitadas) afetam o que o seu avatar veste.</string>
-  <string name="tutorial_items">Obtenha itens ao completar tarefas e subir de nível. Selecione um item para usá-lo!</string>
-  <string name="tutorial_pets">Ao completar tarefas do mundo real, você tem uma chance aleatória de encontrar ovos e poções. Combine-os para obter mascotes</string>
-  <string name="tutorial_skills">Habilidades são especiais e têm efeitos poderosos! Selecione uma Habilidade para usá-la. Isso vai consumir Mana (a barra azul), que você consegue usando o Habitica todos os dias e completando suas tarefas da vida real. Confira as Perguntas Frequentes no menu para mais informações!</string>
+    <string name="tutorial_skills">Habilidades são especiais e têm efeitos poderosos! Selecione uma Habilidade para usá-la. Isso vai consumir Mana (a barra azul), que você consegue usando o Habitica todos os dias e completando suas tarefas da vida real. Confira as Perguntas Frequentes no menu para mais informações!</string>
   <string name="tutorial_party">É aqui que você e seus amigos podem se ajudar em seus objetivos e lutar contra monstros usando suas tarefas!</string>
-  <string name="tutorial_tavern">Seja bem vindo à Taberna, uma sala de bate-papo pública e para todas as idades! Aqui você pode conversar sobre produtividade e fazer perguntas. Divirta-se!</string>
-  <string name="tutorial_classes">Escolha se será um Guerreiro, Mago, Curandeiro ou Andarilho. Cada classe tem Equipamentos e Habilidades únicos. Selecione (?) para saber mais! </string>
-  <string name="tutorial_stats">Toque no botão cinza para alocar todos seus atributos de uma vez ou toque nas setas para adicionar um ponto de cada vez.</string>
+  <string name="tutorial_tavern">Seja bem-vindo à Taberna, uma sala de bate-papo pública e para todas as idades! Aqui você pode conversar sobre produtividade e fazer perguntas. Divirta-se!</string>
+    <string name="tutorial_stats">Toque no botão cinza para alocar todos seus atributos de uma vez ou toque nas setas para adicionar um ponto de cada vez.</string>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 6a7782a00..56be08ce6 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Experiência</string>
   <string name="HP_default">Vida</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Preferências não puderam ser carregadas do código de barras</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Configurações</string>
-  <string name="SP_address_hint">Seu servidor personalizado</string>
-  <string name="SP_userID_title">ID de usuário</string>
+    <string name="SP_userID_title">ID de usuário</string>
   <string name="SP_userID_summary">Seu ID de usuário</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Seu API Token</string>
   <string name="Language_title">Idioma</string>
   <string name="Language_summary">Mudar idioma do Habitica</string>
-  <string name="SP_user_qr_code">Seu QR Code</string>
-  <string name="PS_contact_title">Contate-me</string>
-  <string name="unknown_error">Aconteceu um erro…</string>
-  <string name="pref_account_header">Conta</string>
+    <string name="PS_contact_title">Contate-me</string>
+    <string name="pref_account_header">Conta</string>
   <string name="pref_first_day_of_the_week_title">Primeiro dia da semana</string>
   <string name="pref_first_day_of_the_week_summary">Primeiro dia da semana em todos os calendários</string>
   <string name="pref_reminder_header">Lembrete Diário</string>
   <string name="pref_reminder_checkbox">Ativar Lembrete</string>
   <string name="pref_reminder_picker">Definir Hora do Lembrete</string>
   <string name="pref_cds_header">Início do Dia Personalizado</string>
-  <string name="pref_cds_picker">Definir Início do Dia Personalizado</string>
-  <string name="pref_push_notifications_checkbox">Notificações Push</string>
+    <string name="pref_push_notifications_checkbox">Notificações Push</string>
   <string name="push_notifications">Notificações Push</string>
   <string name="push_notifications_sum">Configurar suas notificações push</string>
   <string name="preference_push_you_won_challenge">Você venceu um Desafio!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Sua missão começou</string>
   <string name="preference_push_invited_to_quest">Convidado para uma missão</string>
   <!--Adding tasks-->
-  <string name="task_value">Valor</string>
-  <string name="new_todo">Novo Afazer</string>
-  <string name="new_reward">Nova Recompensa</string>
-  <string name="new_daily">Nova Diária</string>
-  <string name="new_habit">Novo Hábito</string>
-  <string name="action_edit">Editar</string>
-  <string name="action_delete">Deletar</string>
-  <string name="action_cancel">Cancelar</string>
+    <string name="action_edit">Editar</string>
+    <string name="action_cancel">Cancelar</string>
   <string name="login_btn">Entrar</string>
   <string name="register_btn">Registrar</string>
   <string name="username">Usuário</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Confirmar senha</string>
   <string name="logout">Sair</string>
   <string name="logout_description">Sair da sua conta</string>
-  <string name="account_details">Detalhes da Conta</string>
-  <string name="LoginActivityName">Bem-vindo</string>
-  <string name="string_revive">Reviver</string>
-  <string name="please_connect">Por favor conecte-se pela aplicação antes de usar um widget</string>
-  <string name="about.title">Sobre</string>
-  <string name="about.libraries">Bibliotecas</string>
-  <string name="about.versionhistory">Histórico de versão</string>
-  <string name="about.habitica_open_source">Habitica está disponível como software de código aberto no Github</string>
-  <string name="about.rate_our_app">Avalie nosso Aplicativo</string>
-  <string name="about.give_us_feedback">Nos envie Feedback!</string>
-  <string name="about.bugreport">Reportar um Erro</string>
-  <string name="about.source_code">Código Fonte</string>
-  <string name="repeatEvery">Repete a Cada</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Erro de Conexão</string>
-  <string name="network_error_no_network_body">Você não está conectado(a) à internet.</string>
-  <string name="internal_error_api">Parece haver um problema com o servidor. Tente novamente mais tarde.</string>
+    <string name="LoginActivityName">Bem-vindo</string>
+    <string name="about_title">Sobre</string>
+  <string name="about_libraries">Bibliotecas</string>
+    <string name="about_habitica_open_source">Habitica está disponível como software de código aberto no Github</string>
+  <string name="about_rate_our_app">Avalie nosso Aplicativo</string>
+  <string name="about_give_us_feedback">Nos envie Feedback!</string>
+  <string name="about_bugreport">Reportar um Erro</string>
+  <string name="about_source_code">Código Fonte</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Parece haver um problema com o servidor. Tente novamente mais tarde.</string>
   <string name="authentication_error_title">Erro de Autenticação</string>
-  <string name="authentication_error_body">Seu usuário e/ou senha estavam errados.</string>
-  <string name="login_validation_error_title">Erro de Validação</string>
+    <string name="login_validation_error_title">Erro de Validação</string>
   <string name="login_validation_error_fieldsmissing">Você precisa preencher todos os campos.</string>
   <string name="save_changes">Salvar</string>
   <string name="copy">Copiar</string>
   <string name="notes">Notas</string>
-  <string name="text">Texto</string>
-  <string name="difficulty">Dificuldade</string>
+    <string name="difficulty">Dificuldade</string>
   <string name="tags">Marcadores</string>
   <string name="trivial">Trivia</string>
   <string name="easy">Fácil</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Negativo ( - )</string>
   <string name="checklist">Lista</string>
   <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">Percepçã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">Sumário</string>
-  <string name="repeatables_title">Repete</string>
-  <string name="repeatables_on_title">Repete em</string>
-  <string name="repeatables_frequency_daily">Diário</string>
+    <string name="attributes">Atributos</string>
+    <string name="repeatables_frequency_daily">Diário</string>
   <string name="repeatables_frequency_weekly">Semanal</string>
   <string name="repeatables_frequency_monthly">Mensal</string>
   <string name="repeatables_frequency_yearly">Anual</string>
@@ -123,24 +92,15 @@
   <string name="faint_header">Sua vida caiu abaixo de zero!</string>
   <string name="faint_button">Restaurar Vida &amp; Tentar Novamente</string>
   <string name="filter">Filtro</string>
-  <string name="profile_image">Imagem de Perfil</string>
-  <string name="mana_price_button">%d PM</string>
-  <string name="used_skill">Você usou %1$s, custando %2$d mana.</string>
-  <string name="used_skill_without_mana">Você usou %1$s.</string>
+    <string name="used_skill_without_mana">Você usou %1$s.</string>
   <string name="new_checklist_item">Novo item de Lista</string>
-  <string name="add_checklist_item">Adicionar</string>
-  <string name="reminder_title">Lembre-se de marcar suas Diárias</string>
-  <string name="skill_progress_title">Usando Habilidade</string>
-  <string name="coming_soon">Em Breve</string>
-  <string name="chat_flag_confirmation">Você tem certeza que quer reportar esta mensagem por violação?</string>
-  <string name="flag_confirm">Reportar Mensagem</string>
-  <string name="unlock_lvl_11">Desbloqueie no nível 11</string>
-  <string name="no_party_message">Você não está em um grupo. Para entrar em um grupo, por favor visite o site.</string>
-  <string name="forgot_pw_btn">Esqueci a senha</string>
-  <string name="tavern.inn.checkOut">Reativar Diárias</string>
-  <string name="tavern.inn.rest">Pausar Diárias</string>
-  <string name="reward.dialog.buy">Comprar</string>
-  <string name="reward.dialog.dismiss">Desfazer</string>
+    <string name="reminder_title">Lembre-se de marcar suas Diárias</string>
+    <string name="unlock_lvl_11">Desbloqueie no nível 11</string>
+    <string name="forgot_pw_btn">Esqueci a senha</string>
+  <string name="tavern.inn_checkOut">Reativar Diárias</string>
+  <string name="tavern.inn_rest">Pausar Diárias</string>
+  <string name="reward.dialog_buy">Comprar</string>
+  <string name="reward.dialog_dismiss">Desfazer</string>
   <string name="party">Grupo</string>
   <string name="chat">Bate-papo</string>
   <string name="members">Membros</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Diárias</string>
   <string name="todos">Afazeres</string>
   <string name="rewards">Recompensas</string>
-  <string name="taskform.delete.title">Você tem certeza?</string>
-  <string name="taskform.delete.message">Você realmente quer deletar?</string>
-  <string name="yes">Sim</string>
+    <string name="yes">Sim</string>
   <string name="no">Não</string>
   <string name="quest">Missão</string>
   <string name="avatar_body">Corpo</string>
   <string name="avatar_hair">Cabelo</string>
   <string name="avatar_shirt">Camisa</string>
   <string name="avatar_skin">Pele</string>
-  <string name="avatar_ears">Orelhas de Animal</string>
-  <string name="avatar_base">Básico</string>
+    <string name="avatar_base">Básico</string>
   <string name="avatar_color">Cor</string>
   <string name="avatar_beard">Barba</string>
   <string name="avatar_mustache">Bigode</string>
   <string name="avatar_flower">Flor</string>
   <string name="avatar_bangs">Franja</string>
-  <string name="avatar_nothing">Nada selecionado</string>
-  <string name="avatar_size">Tamanho</string>
+    <string name="avatar_size">Tamanho</string>
   <string name="avatar_size_slim">Magro</string>
   <string name="avatar_size_broad">Largo</string>
   <string name="avatar_background">Cenário</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Comprar</string>
   <string name="purchase_set_title">Comprar conjunto %s</string>
   <string name="due_date">Data limite</string>
-  <string name="quest.accept">Aceitar</string>
-  <string name="quest.reject">Rejeitar</string>
-  <string name="quest.begin">Iniciar Missão</string>
-  <string name="quest.cancel">Cancelar Convite</string>
-  <string name="quest.abort">Abortar Missão</string>
-  <string name="quest.leave">Abandonar Missão</string>
-  <string name="quest.pending">Pendente</string>
-  <string name="quest.accepted">Aceito</string>
-  <string name="quest.rejected">Rejeitado</string>
-  <string name="quest.participants">Participantes</string>
-  <string name="version_info">Versão %1$s (%2$d)</string>
+  <string name="quest_accept">Aceitar</string>
+  <string name="quest_reject">Rejeitar</string>
+  <string name="quest_begin">Iniciar Missão</string>
+  <string name="quest_cancel">Cancelar Convite</string>
+  <string name="quest_abort">Abortar Missão</string>
+    <string name="version_info">Versão %1$s (%2$d)</string>
   <string name="sidebar_help">Ajuda &amp; Perguntas Frequentes</string>
   <string name="complete_tutorial">Entendi!</string>
   <string name="dismiss_tutorial">Lembre-me novamente</string>
   <string name="intro_1_subtitle">Bem-vindo(a) ao</string>
-  <string name="intro_1_title">Habitica</string>
-  <string name="intro_1_description">É hora de se divertir enquanto faz suas coisas. Junte-se a mais de%s pessoas melhorando suas vidas uma tarefa por vez.</string>
+    <string name="intro_1_description">É hora de se divertir enquanto faz suas coisas. Junte-se a mais de%s pessoas melhorando suas vidas uma tarefa por vez.</string>
   <string name="intro_2_subtitle">Progresso no jogo</string>
   <string name="intro_2_title">Progresso na vida</string>
   <string name="intro_2_description">Desbloqueie recursos no jogo ao completar suas tarefas da vida real. Ganhe armaduras, mascotes e mais como recompensas por atingir suas metas.</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Socialize</string>
   <string name="intro_3_description">Mantenha suas metas sob controle com a ajuda de seus amigos. Ajudem-se na vida e na batalha enquanto melhoram juntos!</string>
   <string name="intro_finish_button">Vamos começar!</string>
-  <string name="previous_button">Anterior</string>
-  <string name="next_button">Próximo</string>
+    <string name="next_button">Próximo</string>
   <string name="skip_button">Pular</string>
-  <string name="setup_welcome_description">Bem vindo ao Habitica, onde avançar no jogo vai melhorar sua vida real! Completando metas do mundo real, você vai desbloquear equipamentos, mascotes, missões e mais.</string>
-  <string name="setup_welcome_title">Bem-vindo(a)</string>
-  <string name="avatar_setup_description">Então, como você quer se parecer? Não se preocupe, você pode mudar isso depois.</string>
+    <string name="avatar_setup_description">Então, como você quer se parecer? Não se preocupe, você pode mudar isso depois.</string>
   <string name="task_setup_description">Ótimo! Então, no que você está interessado em trabalhar ao longo desta jornada?</string>
   <string name="setup_group_work">Trabalho</string>
   <string name="setup_group_exercise">Exercício</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Estudar um guru</string>
   <string name="setup_task_creativity_2">Trabalhar em um projeto criativo</string>
   <string name="setup_task_creativity_3">Terminar um projeto criativo</string>
-  <string name="gem.purchase.support">Quer nos ajudar a manter o Habitica funcionando? Você pode contribuir com os desenvolvedores ao comprar gemas!\n\nGemas permitem que você compre extras legais para sua conta, incluindo:  \n\n - Fantasias legais para seu avatar\n - Cenários\n - Missões divertidas que te recompensam com ovos\n - A habilidade de mudar de classe antes do nível 100\n\n Muito obrigado por nos ajudar a manter o Habita o melhor possível. Sua ajuda significa muito para nós!</string>
-  <string name="my_guilds">Minhas Guildas</string>
+    <string name="my_guilds">Minhas Guildas</string>
   <string name="public_guilds">Guildas Públicas</string>
   <string name="guild">Guildas</string>
   <string name="leave">Sair</string>
   <string name="join">Entrar</string>
-  <string name="leader">Líder</string>
-  <string name="gems">Gemas</string>
-  <string name="copy_as_todo">Copiar como Afazer</string>
-  <string name="send_pm">Enviar Inbox</string>
-  <string name="flag">Reportar</string>
-  <string name="delete">Excluir</string>
+    <string name="gems">Gemas</string>
+    <string name="delete">Excluir</string>
   <string name="name">Nome</string>
   <string name="description">Descrição</string>
   <string name="add_tag">Adicionar nova etiqueta</string>
   <string name="privacy">Privacidade</string>
   <string name="write_message">Escrever Mensagem</string>
-  <string name="post">Publicar</string>
-  <string name="guild_search_hint">Procurar Guildas</string>
-  <string name="todo_due">Data limite: %s</string>
-  <string name="daily_streak">Combo atual: %d</string>
-  <string name="todo_has_duedate">Tarefa com Data</string>
-  <string name="battle_gear">Equipamento de Batalha</string>
+    <string name="guild_search_hint">Procurar Guildas</string>
+    <string name="battle_gear">Equipamento de Batalha</string>
   <string name="costume">Traje</string>
   <string name="outfit_head">Cabeça</string>
   <string name="outfit_headAccessory">Acessório de Cabeça</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Habilitar Traje</string>
   <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_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="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="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>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">Você encontrou uma peça de um Equipamento raro no Armário: %s Incrível!</string>
   <string name="armoireFood">Você abriu a caixa e encontrou %1$s %2$s. O que isso está fazendo aqui?</string>
   <string name="armoireExp">Você lutou com o Armário e ganhou Experiência. Toma essa!</string>
-  <string name="armoireNotesFull">Abra o Armário para receber aleatoriamente um Equipamento especial, Experiência, ou comida! Peças de Equipamentos restantes: %d</string>
-  <string name="armoireLastItem">Você encontrou a ultima peça de um Equipamento raro no Armário Encantado.</string>
-  <string name="armoireNotesEmpty">O Armário terá novos Equipamentos na primeira semana de cada mês. Até lá, continue clicando para Experiência e Comida!</string>
-  <string name="sell">Vender (%d Ouro)</string>
+    <string name="sell">Vender (%d Ouro)</string>
   <string name="hatch_with_potion">Chocar com poção</string>
-  <string name="feed_to_pet">Alimentar mascote</string>
-  <string name="hatch_egg">Chocar com ovo</string>
+    <string name="hatch_egg">Chocar com ovo</string>
   <string name="invite_party">Convidar Grupo</string>
   <string name="dialog_feeding">Alimentar %s com:</string>
   <string name="use_animal">Usar</string>
@@ -305,17 +237,8 @@
   <string name="close">Fechar</string>
   <string name="share">Compartilhar</string>
   <string name="notification_pet_fed">Você alimentou seu %s!</string>
-  <string name="notification_purchase">Você comprou %s</string>
-  <string name="notification_purchase_reward">Você comprou uma recompensa</string>
-  <string name="sectiondrop">Base</string>
-  <string name="sectionpremium">Poção Mágica</string>
-  <string name="sectionquest">Missão</string>
-  <string name="sectionspecial">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="notification_purchase_reward">Você comprou uma recompensa</string>
+    <string name="world_quest">Missão Global</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
@@ -334,8 +257,7 @@
   <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>
-  <string name="opt_out_description">Não quer se preocupar com classes? Quer escolher depois? Cancelar - você será um guerreiro sem habilidades especiais. Você pode ler sobre o sistema de classes mais tarde na wiki e habilitá-las a qualquer momento.</string>
-  <string name="class_confirmation">Você tem certeza que quer ser um %s?</string>
+    <string name="class_confirmation">Você tem certeza que quer ser um %s?</string>
   <string name="class_changed">Você é um %s agora!</string>
   <string name="class_changed_description">Você tem o novo Equipamento de Batalha padrão, que você pode alterar em Equipamentos!</string>
   <string name="choose_class">Escolha sua Classe</string>
@@ -349,24 +271,18 @@
   <string name="invite_existing_users">Convide usuários existentes</string>
   <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_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
-</string>
-  <string name="email">E-mail</string>
-  <string name="invite_users">Convidar para o Grupo</string>
-  <string name="share_using">Compartilhar via</string>
+    <string name="email">E-mail</string>
+    <string name="share_using">Compartilhar via</string>
   <string name="share_levelup">Eu cheguei ao nível %d em Habitica, melhorando meus hábitos da vida real!</string>
   <string name="share_hatched">Eu acabei de ganhar um filhote de %1$s %2$s no Habitica por completar minhas tarefas da vida real!</string>
   <string name="share_raised">Eu acabei de ganhar um %1$s de montaria no Habitica por completar minhas tarefas da vida real!</string>
   <string name="open_in_store">Abra na Play Store</string>
   <string name="change_class_confirmation">Você tem certeza que quer mudar sua classe? Isso irá custar 3 gemas.</string>
   <string name="change_class_equipment_warning">Aviso: Você não poderá mais comprar equipamentos da classe %s.</string>
-  <string name="leaderMessage">Mensagem de %1$s</string>
-  <string name="leaderName">Líder: %1$s</string>
-  <string name="confirm">Confirmar</string>
+    <string name="confirm">Confirmar</string>
   <string name="market">Mercado</string>
   <string name="timeTravelers">Viajantes do Tempo</string>
   <string name="seasonalShop">Loja Sazonal</string>
@@ -374,37 +290,16 @@
   <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>
-  <string name="purchase_confirmation_title">Confirmar compra</string>
-  <string name="confirm_purchase_text">Compre %1$s por %2$s %3$s</string>
-  <string name="gem">gema</string>
-  <string name="hourglass">ampulheta</string>
-  <string name="hourglasses">ampulhetas</string>
-  <string name="gold_singular">ouro</string>
-  <string name="gold_plural">ouros</string>
+    <string name="successful_purchase">Comprado %1$s</string>
+    <string name="gold_plural">ouros</string>
   <string name="chat_message_copied">Mensagem copiada para Área de Transferência</string>
-  <string name="copy_chat_message">Copiar para Área de Transferência</string>
-  <string name="edit_tag_title">Editar Etiqueta</string>
-  <string name="edit_tag_btn_edit">Editar</string>
-  <string name="edit_tag_btn_done">Feito</string>
-  <string name="edit_tag_btn_delete">Deletar</string>
-  <string name="confirm_delete_tag_title">Você tem certeza?</string>
+    <string name="edit_tag_btn_edit">Editar</string>
+    <string name="confirm_delete_tag_title">Você tem certeza?</string>
   <string name="confirm_delete_tag_message">Você realmente quer deletar?</string>
-  <string name="filter_drawer_edit_tags">Editar Etiquetas</string>
-  <string name="filter_drawer_filter_tags">Filtrar por Etiquetas</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Deixe que te convidem com esse QR Code</string>
-  <string name="qr_save_message">QR Code salvo em</string>
-  <string name="qr_dialogue_title">Seu QR Code</string>
-  <string name="download">Baixar</string>
-  <string name="send_new_message">Enviar uma nova mensagem</string>
-  <string name="choose_recipient_title">Escolha o destinatário da mensagem</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Escolha o destinatário da mensagem</string>
   <string name="action_continue">Continuar</string>
-  <string name="scan_qr_code">Escanear QR Code</string>
-  <string name="enter_recipient_uuid">Insira o ID de Usuário do convidado</string>
-  <string name="invited_to_party">Você foi convidado para um grupo!</string>
+    <string name="invited_to_party">Você foi convidado para um grupo!</string>
   <string name="stats_widget_label">Estatísticas Habitica</string>
   <string name="add_task">Adicionar Tarefa</string>
   <string name="add_habit">Adicionar Hábito</string>
@@ -415,15 +310,14 @@
   <string name="widget_habit_button">Habitica Fazer Hábito</string>
   <string name="widget_dailies">Habitica Diárias</string>
   <string name="widget_todo_list">Lista de Afazeres do Habitica</string>
-  <string name="widget_add_task">Habitica Adicionar Tarefa</string>
-  <string name="google_services_missing">Servidores da Google Play não foram encontrados.</string>
-  <string name="gem.purchase.toolbartitle">Comprar</string>
-  <string name="gem.purchase.title">Comprar gemas irá contribuir com os desenvolvedores e ajudará a manter o Habitica funcionando</string>
-  <string name="gem.purchase.subtitle">Gemas permitem que você compre acessórios diferenciados para a sua conta, incluindo:</string>
-  <string name="gem.purchase.listitem1">Fantasias super legais para o seu avatar</string>
-  <string name="gem.purchase.listitem2">Cenários Super Legais</string>
-  <string name="gem.purchase.listitem3">Missões que recompensam você com ovos de mascotes</string>
-  <string name="gem.purchase.listitem4">Habilidade de trocar a sua classe antes do nível 100</string>
+    <string name="google_services_missing">Servidores da Google Play não foram encontrados.</string>
+  <string name="gem.purchase_toolbartitle">Comprar</string>
+  <string name="gem.purchase_title">Comprar gemas irá contribuir com os desenvolvedores e ajudará a manter o Habitica funcionando</string>
+  <string name="gem.purchase_subtitle">Gemas permitem que você compre acessórios diferenciados para a sua conta, incluindo:</string>
+  <string name="gem.purchase_listitem1">Fantasias super legais para o seu avatar</string>
+  <string name="gem.purchase_listitem2">Cenários Super Legais</string>
+  <string name="gem.purchase_listitem3">Missões que recompensam você com ovos de mascotes</string>
+  <string name="gem.purchase_listitem4">Habilidade de trocar a sua classe antes do nível 100</string>
   <string name="support_habitica">Contribua com o Habitica</string>
   <string name="skill_transformation_use">usar</string>
   <string name="hatching_market_info">Não conseguindo o drop certo? Dê uma olhada no Mercado!</string>
@@ -437,34 +331,34 @@
   <string name="belongs_to_challenge">Pertence ao Desafio</string>
   <string name="has_reminder">Tem Lembrete</string>
   <string name="has_tag">Tem Etiqueta</string>
-  <string name="subscribe.title">Assinaturas contribuen com os desenvolvedores e ajudam a manter o Habitica funcionando</string>
+  <string name="subscribe_title">Assinaturas contribuen com os desenvolvedores e ajudam a manter o Habitica funcionando</string>
   <string name="subscribe_prompt">Seja um assinante e você terá estes úteis benefícios:</string>
-  <string name="subscribe.listitem1">Comprar gemas com ouro</string>
-  <string name="subscribe.listitem2">Itens mensais exclusivos</string>
-  <string name="subscribe.listitem3">Manter entradas adicionais no histórico</string>
-  <string name="subscribe.listitem4">Quantidade máxima de drop duplicada</string>
+  <string name="subscribe_listitem1">Comprar gemas com ouro</string>
+  <string name="subscribe_listitem2">Itens mensais exclusivos</string>
+  <string name="subscribe_listitem3">Manter entradas adicionais no histórico</string>
+  <string name="subscribe_listitem4">Quantidade máxima de drop duplicada</string>
   <string name="subscriptions">Assinaturas</string>
   <string name="subscription_duration">Acontece a cada %s</string>
   <string name="subscription_duration_norenew">Por%s</string>
   <string name="subscribe">Assinar</string>
-  <string name="subscribe.listitem1.description">Alexandre, o Mercador irá agora vender a você Gemas por 20 ouros cada uma!\n\nSuas remessas mensais são inicialmente restritas a 25 Gemas por mês, aumentam baseado no seu tempo de assinatura. A capacidade aumenta em 5 Gemas para cada três meses de assinatura, limitando-se a um máximo de 50 Gemas por mês!</string>
-  <string name="subscribe.listitem2.description">Cada mês você irá receber um item cosmético único para o seu personagem!
+  <string name="subscribe.listitem1_description">Alexandre, o Mercador irá agora vender a você Gemas por 20 ouros cada uma!\n\nSuas remessas mensais são inicialmente restritas a 25 Gemas por mês, aumentam baseado no seu tempo de assinatura. A capacidade aumenta em 5 Gemas para cada três meses de assinatura, limitando-se a um máximo de 50 Gemas por mês!</string>
+  <string name="subscribe.listitem2_description">Cada mês você irá receber um item cosmético único para o seu personagem!
 \n
 \nAlém disso, para cada três meses de inscrição, os Viajantes Misteriosos do Tempo irão te dar acesso a itens cosméticos históricos (e futuristas).</string>
-  <string name="subscribe.listitem3.description">Torna Afazeres completos e histórico de tarefas disponíveis por mais tempo.</string>
-  <string name="subscribe.listitem4.description">A capacidade de drop dobrada fará com que você receba mais itens de atividades completas todos os dias ajudando você a completar o seu estábulo mais rápido!</string>
-  <string name="subscribe1month.gemcap">Limite de 25 Gemas</string>
-  <string name="subscribe3month.gemcap">Limite de 30 Gemas</string>
-  <string name="subscribe6month.gemcap">Limite de 35 Gemas</string>
-  <string name="subscribe12month.gemcap">Limite de 45 Gemas </string>
+  <string name="subscribe.listitem3_description">Torna Afazeres completos e histórico de tarefas disponíveis por mais tempo.</string>
+  <string name="subscribe.listitem4_description">A capacidade de drop dobrada fará com que você receba mais itens de atividades completas todos os dias ajudando você a completar o seu estábulo mais rápido!</string>
+  <string name="subscribe1month_gemcap">Limite de 25 Gemas</string>
+  <string name="subscribe3month_gemcap">Limite de 30 Gemas</string>
+  <string name="subscribe6month_gemcap">Limite de 35 Gemas</string>
+  <string name="subscribe12month_gemcap">Limite de 45 Gemas </string>
   <string name="subscription_hourglasses">+%d Ampola Mística</string>
   <string name="payment_method">Método de pagamento</string>
   <string name="subscription">Assinatura</string>
   <string name="active">Ativo</string>
   <string name="due">Data de vencimento</string>
   <string name="cancel_subscription">Cancelar Assinatura</string>
-  <string name="cancel_subscription_google.description">Não quer mais ser Assinante\? Você pode achar a opção de Cancelar a Assinatura na seção \"Meus apps\" no menu do Google Play Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Não quer mais ser Assinante\? Devido ao seu método de pagamento, você precisará cancelar em nosso site. Para fazer isso, toque no botão abaixo, faça login na sua conta, toque no ícone do usuário no canto superior direito e vá para Assinatura. Nós sentiremos sua falta. Só e possível cancelar sua inscrição pelo site. Clique no botão abaixo para abrir o site no seu navegador!</string>
+  <string name="cancel_subscription_google_description">Não quer mais ser Assinante\? Você pode achar a opção de Cancelar a Assinatura na seção \"Meus apps\" no menu do Google Play Store.</string>
+  <string name="cancel_subscription_notgoogle_description">Não quer mais ser Assinante\? Devido ao seu método de pagamento, você precisará cancelar em nosso site. Para fazer isso, toque no botão abaixo, faça login na sua conta, toque no ícone do usuário no canto superior direito e vá para Assinatura. Nós sentiremos sua falta. Só e possível cancelar sua inscrição pelo site. Clique no botão abaixo para abrir o site no seu navegador!</string>
   <string name="visit_habitica_website">Visite o site do Habitica</string>
   <string name="current_bonuses">Bônus Atuais</string>
   <string name="months_subscribed">Meses Assinando</string>
@@ -479,56 +373,40 @@
   <string name="twelve_months">12 meses</string>
   <string name="subscribe_prompt_thanks">Por Assinar você está recebendo estes úteis benefícios:</string>
   <string name="subscription_status">Status da Assinatura</string>
-  <string name="byLeader">em %s</string>
-  <string name="challenge_details">Detalhes do Desafio</string>
-  <string name="challenge_leave_title">Sair do Desafio</string>
+    <string name="challenge_leave_title">Sair do Desafio</string>
   <string name="challenge_leave_text">Tem certeza que deseja sair do Desafio “%s”?</string>
   <string name="challenge_remove_tasks_title">Remover tarefas</string>
   <string name="challenge_remove_tasks_text">Você quer remover as tarefas?</string>
   <string name="remove_tasks">Remover</string>
   <string name="keep_tasks">Manter</string>
   <string name="my_challenges">Meus Desafios</string>
-  <string name="public_challenges">Públicos</string>
-  <string name="challenges">Desafios</string>
-  <string name="daily">Diária</string>
+    <string name="daily">Diária</string>
   <string name="habit">Hábito</string>
   <string name="reward">Recompensa</string>
   <string name="todo">Afazer</string>
   <string name="official">Oficial</string>
-  <string name="participating">Participando</string>
-  <string name="challenge">Desafio</string>
-  <string name="go_to_challenge">Vá para o Desafio</string>
-  <string name="not_part_of_a_challenge">Você não está participando de nenhum Desafio no momento!</string>
+    <string name="challenge">Desafio</string>
+    <string name="not_part_of_a_challenge">Você não está participando de nenhum Desafio no momento!</string>
   <string name="join_a_challenge">Participe de um Desafio para adicionar um conjunto de tarefas selecionadas para sua lista, então concorra com outros Habiticanos para ganhar conquistas e até gemas!</string>
   <string name="check_the_public_challenge_tab">Toque na guia \"Público\" para encontrar os Desafios criados por usuários que sejam mais adequados para você!</string>
-  <string name="add_reminder">Adicionar Lembrete</string>
-  <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">Mensagens</string>
-  <string name="FAQ">Perguntas Frequentes</string>
-  <string name="special">Especial</string>
+    <string name="inbox">Mensagens</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>
-  <string name="limited_count">%d saiu</string>
-  <string name="gem_shop">Gema</string>
+    <string name="gem_shop">Gema</string>
   <string name="mystery_item">Item Misterioso</string>
   <string name="myster_item_notes">Cada mês, Assinantes irão receber um item misterioso. Isso é geralmente liberado cerca de uma semana antes do final do mês.</string>
   <string name="open">Abrir</string>
-  <string name="notification_mystery_item">Você abre a caixa e encontra %s!</string>
-  <string name="checkInRewardEarned">Você ganhou um %1$s como recompensa por sua devoção para melhorar sua vida.</string>
+    <string name="checkInRewardEarned">Você ganhou um %1$s como recompensa por sua devoção para melhorar sua vida.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Próximo prêmio em %1$d Check-Ins</string>
   <string name="pending_approval">aprovação pendente</string>
   <string name="filters">Filtros</string>
   <string name="done">Feito</string>
-  <string name="group_tasks_edit_description">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="groups">Grupos</string>
   <string name="all">Todos</string>
   <string name="none">Nenhum</string>
   <string name="owned">Possuído</string>
   <string name="not_owned">Não possuído</string>
-  <string name="new_game">Novo\nJogo</string>
-  <string name="login_btn_fb">Logar com Facebook</string>
+    <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 o Justin e serei seu guia no Habitica.\n\nPrimeiro, como devemos chamá-lo? Sinta-se livre para mudar o nome que eu havia escolhido. Quando você estiver com tudo definido, vamos criar seu avatar!</string>
@@ -560,7 +438,6 @@
   <string name="reload_content">Recarregar Conteúdo</string>
   <string name="dailyDueDefaultView">Diárias por padrão na aba \"Ativas\"</string>
   <string name="dailyDueDefaultViewDescription">Com esta opção habilitada, suas Diárias irão começar na aba \"Ativas\" em vez de \"Todas\",</string>
-  <string name="repeat_summary">Repete %1$s toda %2$s %3$s %4$s</string>
   <string name="no_billing_gems">Seu aparelho não possui nenhum dos métodos de pagamento suportados. Por favor, use o site do Habitica se você quiser comprar gemas.</string>
   <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>
@@ -568,8 +445,7 @@
   <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</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_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">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>
@@ -579,42 +455,36 @@
   <string name="new_challenge_title">Novo titulo do desafio</string>
   <string name="ownership">Propriedade</string>
   <string name="inn">Pousada</string>
-  <string name="system">Sistema</string>
-  <string name="start_quest">Começar uma nova Missão</string>
+    <string name="start_quest">Começar uma nova Missão</string>
   <string name="leave_party">Deixar Grupo</string>
   <string name="party_description">Descrição do grupo</string>
-  <string name="abort_confirmation">Tem certeza que quer abortar a missão? Isso vai abortar para todos do seu grupo e todo o progresso será perdido. O pergaminho de missão será devolvido ao dono.</string>
-  <string name="leave_quest_confirmation">Tem certeza que você quer abandonar a missão ativa? Todo o progresso da missão será perdido.</string>
-  <string name="number_participants">%1$d Participantes</string>
+    <string name="number_participants">%1$d Participantes</string>
   <string name="welcome_back">Bem vindo(a) de volta</string>
   <string name="yesterdaililes_prompt">Fez alguma dessas Diárias ontem?</string>
   <string name="start_day">Começar Meu Dia</string>
   <string name="leave_party_confirmation">Você tem certeza de que quer sair do grupo?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Próximo prêmio em %d Check-ins</string>
-  <string name="pending">Pendente</string>
+    <string name="pending">Pendente</string>
   <string name="accepted">Aceito</string>
   <string name="declined">Negado</string>
   <string name="participants">Participantes</string>
   <string name="invitations">Convites</string>
-  <string name="quest_leader_header" formatted="false">Iniciado por %s</string>
+  <string name="quest_leader_header">Iniciado por %s</string>
   <string name="quest_abort_message">Tem certeza que quer abortar a missão? Isso vai abortar para todos do seu grupo e todo o progresso será perdido. O pergaminho de missão será devolvido ao dono.</string>
-  <string name="loading">Carregando…</string>
-  <string name="reloading_content">Recarregando Conteúdo</string>
+    <string name="reloading_content">Recarregando Conteúdo</string>
   <string name="thousand_abbrev">k</string>
   <string name="million_abbrev">mi</string>
   <string name="billion_abbrev">bi</string>
-  <string name="your_balance">Seu saldo:</string>
-  <string name="available_until" formatted="false">Disponível até %s</string>
-  <string name="gems_left_max" formatted="false">Gemas Mensais: %1$d/%2$d Restando</string>
-  <string name="gems_left_nomax" formatted="false">Gemas Mensais: %d Restando</string>
+    <string name="available_until">Disponível até %s</string>
+  <string name="gems_left_max">Gemas Mensais: %1$d/%2$d Restando</string>
+  <string name="gems_left_nomax">Gemas Mensais: %d Restando</string>
   <string name="health">Vida</string>
   <string name="collect">Colete</string>
   <string name="rage_meter">Indicador de Fúria</string>
   <string name="boss_quest">Missão de Chefão</string>
   <string name="collection_quest">Missão de Coleta</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Pontos de Experiência</string>
-  <string name="gold_reward" formatted="false">%d Ouro</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Pontos de Experiência</string>
+  <string name="gold_reward">%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>
@@ -627,8 +497,7 @@
   <string name="reset_account_confirmation">resetar minha conta</string>
   <string name="delete_account_confirmation">deletar minha conta</string>
   <string name="danger_zone">Zona de Perigo</string>
-  <string name="nevermind">Deixa Pra Lá</string>
-  <string name="resetting_account">Resetando Conta</string>
+    <string name="resetting_account">Resetando Conta</string>
   <string name="deleting_account">Deletando Conta</string>
   <string name="insufficientGold">Você precisa completar mais tarefas antes de conseguir comprar este item!</string>
   <string name="insufficientGems">Você precisará de mais Gemas para comprar este item!</string>
@@ -661,8 +530,7 @@
   <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_login_name">Alterar Nome de Login</string>
-  <string name="change_username">Mudar nome de usuário</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>
@@ -683,7 +551,7 @@
   <string name="distribute_class">Distribuir baseado na classe</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="points_to_allocate">%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>
@@ -693,9 +561,7 @@
   <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="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>
@@ -709,19 +575,13 @@
   <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="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="rage_strike_count">Strikes de Raiva: %d/%d</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="strike_active_title">O %s foi Atacado!</string>
+    <string name="strike_active_description">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>
@@ -731,29 +591,21 @@
   <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="join_party_title">Deseja entrar em um grupo?</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="world_boss_description_title">O que é um Chefão Global?</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="world_boss_action_prompt">Derrote o Chefão para obter recompensas especiais e salvar Habitica do Terror do %s!</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="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>
@@ -787,17 +639,15 @@
   <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="usernamePromptWiki">Se você quiser saber mais sobre essa mudança, <a href="https://habitica.wikia.com/wiki/Player_Names">visite nossa wiki.</a></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="usernamePromptWiki">Se você quiser saber mais sobre essa mudança, <a href="https://habitica.wikia_com/wiki/Player_Names">visite nossa wiki.</a></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="username_level">\@%s・Nível %d</string>
-  <string name="enter_recipient_username">Digite o @ nome de usuário do destinatário</string>
+    <string name="enter_recipient_username">Digite o @ nome de usuário do destinatário</string>
   <string name="username_copied">Nome de usuário copiado para Área de Transferência</string>
   <string name="verification_pet">Um desses Mascotes Veteranos estará esperando por você depois que tiver terminado de confirmar!</string>
   <string name="welcomeNameTitle">Como devemos chamá-lo?</string>
@@ -821,8 +671,6 @@
   <string name="send_gift">Enviar Presente</string>
   <string name="server">Servidor</string>
   <string name="gift_confirmation_title">Seu presente foi enviado!</string>
-  <string name="gift_confirmation_text_g1g1">Sua assinatura de presente foi enviada e uma outra assinatura foi aplicada à sua conta!</string>
-  <string name="gift_confirmation_text">Sua assinatura de presente foi enviada e uma outra assinatura foi aplicada à sua conta.</string>
   <string name="opting_out_progress">Cancelando</string>
   <string name="delete_oauth_account_description">Você tem certeza\? Isso vai apagar sua conta para sempre e voce nao vai poder restaurar-la! You vai precisar registrar uma nova conta para usar o Habitica novamente. As Gems salvas ou gastas não serão reembolsadas. Se você estiver absolutamente certo, digite DELETE na caixa de texto abaixo.</string>
   <string name="discover">Explorar</string>
diff --git a/Habitica/res/values-pt-rPT/strings.profile.xml b/Habitica/res/values-pt-rPT/strings.profile.xml
index c35ab4618..5b217ef86 100644
--- a/Habitica/res/values-pt-rPT/strings.profile.xml
+++ b/Habitica/res/values-pt-rPT/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Nível:</string>
     <string name="profile_class_bonus">Bónus-classe:</string>
     <string name="profile_allocated">Alocada:</string>
-    <string name="profile_boosts">Aumentos</string>
     <string name="profile_private_message">Mensagem Privada</string>
     <string name="profile_achievements">Conquistas</string>
-    <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 90b547baf..0903489b2 100644
--- a/Habitica/res/values-pt-rPT/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rPT/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Tarefas</string>
-  <string name="sidebar.skills">Habilidades</string>
-  <string name="sidebar.section.social">Social</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>
-  <string name="sidebar.guilds">Guildas</string>
-  <string name="sidebar.challenges">Desafios</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>
-  <string name="sidebar.news">Noticias</string>
-  <string name="sidebar.settings">Definições</string>
-  <string name="sidebar.about">Sobre</string>
+  <string name="sidebar_tasks">Tarefas</string>
+  <string name="sidebar_skills">Habilidades</string>
+  <string name="sidebar.section_social">Social</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>
+  <string name="sidebar_guilds">Guildas</string>
+  <string name="sidebar_challenges">Desafios</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>
+  <string name="sidebar_news">Noticias</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 e944e871a..03bf66215 100644
--- a/Habitica/res/values-pt-rPT/strings.tutorial.xml
+++ b/Habitica/res/values-pt-rPT/strings.tutorial.xml
@@ -1,13 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_equipment">Quando comprar equipamento, este aparece aqui. O seu Equipamento de Batalha afeta as suas estatísticas, e o seu Vestuário (se ativado) afeta o que o seu avatar pode vestir.</string>
-  <string name="tutorial_items">Ganhe itens completando as tarefas e subindo de nível. Toque num item para o usar!</string>
-  <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_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 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>
-<string name="tutorial_overview">Aqui estamos! Inseri algumas tarefas para ti com base nos teus interesses. Experimenta adicionar algumas por tua conta. Podes editar qualquer tarefa ao tocar o título.</string>
+    <string name="tutorial_overview">Aqui estamos! Inseri algumas tarefas para ti com base nos teus interesses. Experimenta adicionar algumas por tua conta. Podes editar qualquer tarefa ao tocar o título.</string>
     <string name="tutorial_habits_1">Primeiro os Hábitos. Podem ser Hábitos positivos que queres melhorar ou Hábitos negativos que queres deixar.</string>
     <string name="tutorial_habits_2">Sempre que realizares um hábito positivo, clica no + para receberes experiência e ouro!</string>
     </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index f93f5f340..82b88954e 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Experiência</string>
   <string name="HP_default">Vida</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Não foi possível carregar as predefinições do código de barras</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Definições</string>
-  <string name="SP_address_hint">O seu servidor personalizado</string>
-  <string name="SP_userID_title">Id. do Utilizador</string>
+    <string name="SP_userID_title">Id. do Utilizador</string>
   <string name="SP_userID_summary">A Sua Id. de Utilizador</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">O teu token API</string>
   <string name="Language_title">Língua </string>
   <string name="Language_summary">Mudar a língua do Habitica</string>
-  <string name="SP_user_qr_code">O Seu Código QR</string>
-  <string name="PS_contact_title">Contactar-me</string>
-  <string name="unknown_error">Ocorreu um erro…</string>
-  <string name="pref_account_header">Conta</string>
+    <string name="PS_contact_title">Contactar-me</string>
+    <string name="pref_account_header">Conta</string>
   <string name="pref_first_day_of_the_week_title">Primeiro Dia da Semana</string>
   <string name="pref_first_day_of_the_week_summary">Primeiro dia da semana em todos os calendários </string>
   <string name="pref_reminder_header">Lembrete Diário</string>
   <string name="pref_reminder_checkbox">Ativar Lembrete</string>
   <string name="pref_reminder_picker">Definir Hora do Lembrete</string>
   <string name="pref_cds_header">Início do Dia Personalizado</string>
-  <string name="pref_cds_picker">Definir Hora do Início do Dia Personalizado</string>
-  <string name="pref_push_notifications_checkbox">Enviar Notificações do Utilizador</string>
+    <string name="pref_push_notifications_checkbox">Enviar Notificações do Utilizador</string>
   <string name="push_notifications">Enviar Notificações</string>
   <string name="push_notifications_sum">Defina as suas definições das notificações de \'envio\'</string>
   <string name="preference_push_you_won_challenge">Ganhou um Desafio!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">A Sua Missão Começou</string>
   <string name="preference_push_invited_to_quest">Convidado para a Missão</string>
   <!--Adding tasks-->
-  <string name="task_value">Valor</string>
-  <string name="new_todo">Novo Afazer</string>
-  <string name="new_reward">Nova Recompensa</string>
-  <string name="new_daily">Nova Tarefa Diária</string>
-  <string name="new_habit">Novo Hábito</string>
-  <string name="action_edit">Editar</string>
-  <string name="action_delete">Eliminar</string>
-  <string name="action_cancel">Cancelar</string>
+    <string name="action_edit">Editar</string>
+    <string name="action_cancel">Cancelar</string>
   <string name="login_btn">Iniciar Sessão</string>
   <string name="register_btn">Registar</string>
   <string name="username">Nome de utilizador</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Confirmar palavra-passe</string>
   <string name="logout">Terminar Sessão</string>
   <string name="logout_description">Termine a sessão da sua conta</string>
-  <string name="account_details">Detalhes da Conta</string>
-  <string name="LoginActivityName">Bem-vindo</string>
-  <string name="string_revive">Reanimar</string>
-  <string name="please_connect">Por favor, ligue-se através da aplicação antes de usar a widget</string>
-  <string name="about.title">Sobre</string>
-  <string name="about.libraries">Bibliotecas</string>
-  <string name="about.versionhistory">Histórico da versão</string>
-  <string name="about.habitica_open_source">O Habitica está disponível como software de código aberto no GitHub</string>
-  <string name="about.rate_our_app">Classifique a nossa Aplicação</string>
-  <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>
-  <string name="internal_error_api">Parece que existe um problema com o servidor. Tente novamente mais tarde.</string>
+    <string name="LoginActivityName">Bem-vindo</string>
+    <string name="about_title">Sobre</string>
+  <string name="about_libraries">Bibliotecas</string>
+    <string name="about_habitica_open_source">O Habitica está disponível como software de código aberto no GitHub</string>
+  <string name="about_rate_our_app">Classifique a nossa Aplicação</string>
+  <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>
+    <!--Network Errors-->
+    <string name="internal_error_api">Parece que existe um problema com o servidor. Tente novamente mais tarde.</string>
   <string name="authentication_error_title">Erro de Autenticação</string>
-  <string name="authentication_error_body">O seu Nome de Utilizador e/ou Palavra-passe está incorreto.</string>
-  <string name="login_validation_error_title">Erro de Validação</string>
+    <string name="login_validation_error_title">Erro de Validação</string>
   <string name="login_validation_error_fieldsmissing">Tem de preencher todos os campos.</string>
   <string name="save_changes">Guardar</string>
   <string name="copy">Copiar</string>
   <string name="notes">Notas</string>
-  <string name="text">Texto</string>
-  <string name="difficulty">Dificuldade</string>
+    <string name="difficulty">Dificuldade</string>
   <string name="tags">Etiquetas</string>
   <string name="trivial">Trivial</string>
   <string name="easy">Fácil</string>
@@ -90,17 +70,8 @@
   <string name="negative_habit_form">Negativo ( - )</string>
   <string name="checklist">Lista de Verificações</string>
   <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="attributes">Atributos</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>
@@ -118,23 +89,14 @@
   <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>
-  <string name="profile_image">Imagem de Perfil</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">Usou %1$s de %2$d mana.</string>
-  <string name="used_skill_without_mana">Utilizou %1$s.</string>
+    <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="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>
-  <string name="flag_confirm">Marcar Mensagem</string>
-  <string name="unlock_lvl_11">Desbloquear no nível 11</string>
-  <string name="no_party_message">Não faz parte de nenhuma equipa. Para se juntar a uma equipa, por favor, visite o site da Web.</string>
-  <string name="forgot_pw_btn">Esqueci-me da Palavra-passe</string>
-  <string name="tavern.inn.checkOut">Reativar as suas Tarefas Diárias</string>
-  <string name="tavern.inn.rest">Pausar as suas Tarefes Diárias</string>
-  <string name="reward.dialog.buy">Comprar</string>
-  <string name="reward.dialog.dismiss">Rejeitar</string>
+    <string name="unlock_lvl_11">Desbloquear no nível 11</string>
+    <string name="forgot_pw_btn">Esqueci-me da Palavra-passe</string>
+  <string name="tavern.inn_checkOut">Reativar as suas Tarefas Diárias</string>
+  <string name="tavern.inn_rest">Pausar as suas Tarefes Diárias</string>
+  <string name="reward.dialog_buy">Comprar</string>
+  <string name="reward.dialog_dismiss">Rejeitar</string>
   <string name="party">Equipa</string>
   <string name="chat">Conversar</string>
   <string name="members">Membros</string>
@@ -142,24 +104,20 @@
   <string name="dailies">Tarefas Diárias</string>
   <string name="todos">Afazeres</string>
   <string name="rewards">Recompensas</string>
-  <string name="taskform.delete.title">Tem a certeza?</string>
-  <string name="taskform.delete.message">Quer mesmo eliminar?</string>
-  <string name="yes">Sim</string>
+    <string name="yes">Sim</string>
   <string name="no">Não</string>
   <string name="quest">Missão</string>
   <string name="avatar_body">Corpo</string>
   <string name="avatar_hair">Cabelo</string>
   <string name="avatar_shirt">Camisa</string>
   <string name="avatar_skin">Pele</string>
-  <string name="avatar_ears">Ouvidos do Animal</string>
-  <string name="avatar_base">Base</string>
+    <string name="avatar_base">Base</string>
   <string name="avatar_color">Cor</string>
   <string name="avatar_beard">Barba</string>
   <string name="avatar_mustache">Bigode</string>
   <string name="avatar_flower">Flor</string>
   <string name="avatar_bangs">Franjas</string>
-  <string name="avatar_nothing">Nada definido</string>
-  <string name="avatar_size">Tamanho</string>
+    <string name="avatar_size">Tamanho</string>
   <string name="avatar_size_slim">Magro</string>
   <string name="avatar_size_broad">Largo</string>
   <string name="avatar_background">Fundo</string>
@@ -168,32 +126,23 @@
   <string name="purchase_button">Comprar</string>
   <string name="purchase_set_title">Comprar conjunto %s</string>
   <string name="due_date">Data Limite</string>
-  <string name="quest.accept">Aceitar</string>
-  <string name="quest.reject">Rejeitar</string>
-  <string name="quest.begin">Iniciar Missão</string>
-  <string name="quest.cancel">Cancelar Convite</string>
-  <string name="quest.abort">Abortar Missão</string>
-  <string name="quest.leave">Sair da Missão</string>
-  <string name="quest.pending">Pendente</string>
-  <string name="quest.accepted">Aceite</string>
-  <string name="quest.rejected">Rejeitado</string>
-  <string name="quest.participants">Participantes</string>
-  <string name="version_info">Versão %1$s (%2$d)</string>
+  <string name="quest_accept">Aceitar</string>
+  <string name="quest_reject">Rejeitar</string>
+  <string name="quest_begin">Iniciar Missão</string>
+  <string name="quest_cancel">Cancelar Convite</string>
+  <string name="quest_abort">Abortar Missão</string>
+    <string name="version_info">Versão %1$s (%2$d)</string>
   <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 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_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>
   <string name="intro_3_description">Mantém os teus objectivos sob vigilância com a ajuda dos teus amigos. Suportem-se uns aos outros na vida e lutem enquanto melhoram simultâneamente!</string>
   <string name="intro_finish_button">Vamos começar!</string>
-  <string name="previous_button">Anterior</string>
-  <string name="next_button">Seguinte</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 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_work">Trabalho</string>
   <string name="setup_group_exercise">Exercício</string>
   <string name="setup_group_health">Vida</string>
   <string name="setup_group_school">Escola</string>
@@ -221,28 +170,19 @@
   <string name="setup_task_creativity_1">Estudar a mestria de um ofício</string>
   <string name="setup_task_creativity_2">Trabalhe num projeto criativo</string>
   <string name="setup_task_creativity_3">Termine um projeto criativo</string>
-  <string name="gem.purchase.support">Quer ajudar-nos a manter o Habitica a funcionar? Pode suportar os programadores ao comprar gemas!\n\nAs gemas permitem-te comprar extras divertidos para a sua conta, incluindo: \n\n - Fatos engraçados para o teu avatar\n - Fundos fantásticos\n - Missões engraçadas que o recompensam com ovos de mascotes\n - A possibilidade de alterar a sua classe antes do nível 100\n\nMuito obrigado por nos ajudar a tornar o Habitica no melhor que este pode ser. O seu suporte significa muito para nós!</string>
-  <string name="my_guilds">As Minhas Guildas</string>
+    <string name="my_guilds">As Minhas Guildas</string>
   <string name="public_guilds">Guildas Públicas</string>
   <string name="guild">Guilda</string>
   <string name="leave">Sair</string>
   <string name="join">Aderir</string>
-  <string name="leader">Líder</string>
-  <string name="gems">Gemas</string>
-  <string name="copy_as_todo">Copiar como Afazer</string>
-  <string name="send_pm">Enviar Mensagem Pessoal</string>
-  <string name="flag">Marcar</string>
-  <string name="delete">Eliminar</string>
+    <string name="gems">Gemas</string>
+    <string name="delete">Eliminar</string>
   <string name="name">Nome</string>
   <string name="description">Descrição</string>
   <string name="privacy">Privacidade</string>
   <string name="write_message">Escrever Mensagem</string>
-  <string name="post">Publicar</string>
-  <string name="guild_search_hint">Procurar por guildas</string>
-  <string name="todo_due">Data limite: %s</string>
-  <string name="daily_streak">elemento atual: %d</string>
-  <string name="todo_has_duedate">A Tarefa tem Data Limite</string>
-  <string name="battle_gear">Equipamento de Batalha</string>
+    <string name="guild_search_hint">Procurar por guildas</string>
+    <string name="battle_gear">Equipamento de Batalha</string>
   <string name="costume">Traje</string>
   <string name="outfit_head">Cabeça</string>
   <string name="outfit_headAccessory">Acessório de Cabeça</string>
@@ -255,9 +195,7 @@
   <string name="wear_costume">Usar Traje</string>
   <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_minutes">%dm atrás</string>
+    <string name="ago_minutes">%dm atrás</string>
   <string name="ago_hours">%dh atrás</string>
   <string name="ago_1hour">1h atrás</string>
   <string name="today">Hoje</string>
@@ -271,13 +209,9 @@
   <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>
-  <string name="armoireNotesFull">Abre o Armário para receberes aleatoriamente uma peça de Equipamento, Experiência ou comida! Número de peças de Equipamento que restam por encontrar: %d</string>
-  <string name="armoireLastItem">Encontraste a última peça rara de Equipamento no Armário Encantado.</string>
-  <string name="armoireNotesEmpty">O Armário terá novos Equipamentos na primeira semana de cada mês. Até lá, continua a clicar para receberes Experiência e comida!</string>
-  <string name="sell">Vender (%d Ouro)</string>
+    <string name="sell">Vender (%d Ouro)</string>
   <string name="hatch_with_potion">Nascimento com poção</string>
-  <string name="feed_to_pet">Alimento para o animal</string>
-  <string name="hatch_egg">Nascimento com ovo</string>
+    <string name="hatch_egg">Nascimento com ovo</string>
   <string name="invite_party">Convidar a equipa</string>
   <string name="dialog_feeding">Alimente %s com:</string>
   <string name="use_animal">Usar</string>
@@ -287,17 +221,8 @@
   <string name="close">Fechar</string>
   <string name="share">Partilhar</string>
   <string name="notification_pet_fed">Alimentou o seu %s!</string>
-  <string name="notification_purchase">Comprou %s</string>
-  <string name="notification_purchase_reward">Comprou uma recompensa</string>
-  <string name="sectiondrop">Padrão</string>
-  <string name="sectionpremium">Porção Mágica</string>
-  <string name="sectionquest">Missão</string>
-  <string name="sectionspecial">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="notification_purchase_reward">Comprou uma recompensa</string>
+    <string name="world_quest">Missão Mundial</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>
@@ -310,8 +235,7 @@
   <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>
-  <string name="opt_out_description">Não queres saber das classes? Preferes escolher mais tarde? Abstém-te - serás um guerreiro sem habilidades especiais. Podes ler mais sobre o sistema de classes na wiki e activar as classes quando quiseres em Utilizador -&gt; Atributos.</string>
-  <string name="class_confirmation">Tem a certeza que deseja ser um %s?</string>
+    <string name="class_confirmation">Tem a certeza que deseja ser um %s?</string>
   <string name="class_changed">Agora é um %s!</string>
   <string name="choose_class">Escolher Classe</string>
   <string name="dialog_go_back">Recuar</string>
@@ -323,56 +247,30 @@
   <string name="invite_existing_users">Convidar Utilizadores Existentes</string>
   <string name="send">Enviar</string>
   <string name="invite">Convidar Amigos</string>
-  <string name="invite_id_description">Se já tiver amigos a utilziar o Habitica, convide-os atarvés da Id. do Utilizador aqui.</string>
-  <string name="invite_email_description">Se um amigo se juntar ao Habitica através do seu e-mail, eles serão convidados automaticamente para a sua equipa!</string>
+    <string name="invite_email_description">Se um amigo se juntar ao Habitica através do seu e-mail, eles serão convidados automaticamente para a sua equipa!</string>
   <string name="add_invites">Adicionar Convites</string>
-  <string name="user_id">Id. do Utilizador</string>
-  <string name="email">E-mail</string>
-  <string name="invite_users">Convidar para a Equipa</string>
-  <string name="share_using">Partilhe, utilizando</string>
+    <string name="email">E-mail</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 montaria %1$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>
-  <string name="leaderMessage">Mensagem de %1$s</string>
-  <string name="leaderName">Líder: %1$s</string>
-  <string name="confirm">Confirmar</string>
+    <string name="confirm">Confirmar</string>
   <string name="market">Mercado</string>
   <string name="timeTravelers">Viajantes no Tempo</string>
   <string name="seasonalShop">Loja Sazonal</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>
-  <string name="hourglass">ampulheta</string>
-  <string name="hourglasses">ampulhetas</string>
-  <string name="gold_singular">ouro</string>
-  <string name="gold_plural">ouro</string>
+    <string name="successful_purchase">Comprou %1$s</string>
+    <string name="gold_plural">ouro</string>
   <string name="chat_message_copied">Mensagem copiada para a Área de Transferência</string>
-  <string name="copy_chat_message">Copie para a área de transferência</string>
-  <string name="edit_tag_title">Editar Etiqueta</string>
-  <string name="edit_tag_btn_edit">Editar</string>
-  <string name="edit_tag_btn_done">Concluído</string>
-  <string name="edit_tag_btn_delete">Eliminar</string>
-  <string name="confirm_delete_tag_title">Tem certeza?</string>
+    <string name="edit_tag_btn_edit">Editar</string>
+    <string name="confirm_delete_tag_title">Tem certeza?</string>
   <string name="confirm_delete_tag_message">Quer mesmo eliminar?</string>
-  <string name="filter_drawer_edit_tags">Editar Etiquetas</string>
-  <string name="filter_drawer_filter_tags">Filtrar por Etiquetas</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Tenha alguém convidar-lhe com esse Código QR</string>
-  <string name="qr_save_message">Código QR salvo no</string>
-  <string name="qr_dialogue_title">O Seu Código QR</string>
-  <string name="download">Transferir</string>
-  <string name="send_new_message">Envie nova mensagem</string>
-  <string name="choose_recipient_title">Escolher Destinatário da Mensagem</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Escolher Destinatário da Mensagem</string>
   <string name="action_continue">Continuar</string>
-  <string name="scan_qr_code">Digitalizar Código QR</string>
-  <string name="enter_recipient_uuid">Insira a Id. do Utilizador Destinatário</string>
-  <string name="invited_to_party">Foi convidado para se juntar à equipa!</string>
+    <string name="invited_to_party">Foi convidado para se juntar à equipa!</string>
   <string name="stats_widget_label">Habitica Estatísticas </string>
   <string name="add_task">Adicionar uma Tarefa</string>
   <string name="add_habit">Adicionar um Hábito </string>
@@ -383,15 +281,14 @@
   <string name="widget_habit_button">Habitica Fazer Hábito</string>
   <string name="widget_dailies">Tarefas Diárias do Habitica</string>
   <string name="widget_todo_list">Habitica - Lista de Afazeres</string>
-  <string name="widget_add_task">Habitica Adicionar Tarefa</string>
-  <string name="google_services_missing">Os serviços Google play não pode ser achado.</string>
-  <string name="gem.purchase.toolbartitle">Comprar</string>
-  <string name="gem.purchase.title">Ao comprar gemas apoia os programadores e ajuda a manter o Habitica em funcionamento</string>
-  <string name="gem.purchase.subtitle">As gemas permitem-lhe comprar extras engraçados para a sua conta, incluindo:</string>
-  <string name="gem.purchase.listitem1">Disfarces divertidos para o teu avatar</string>
-  <string name="gem.purchase.listitem2">Fundos de Ecrã fantásticos</string>
-  <string name="gem.purchase.listitem3">Missões que recompensam com ovos de animal</string>
-  <string name="gem.purchase.listitem4">A habilidade de alterar a tua classe antes do nível 100</string>
+    <string name="google_services_missing">Os serviços Google play não pode ser achado.</string>
+  <string name="gem.purchase_toolbartitle">Comprar</string>
+  <string name="gem.purchase_title">Ao comprar gemas apoia os programadores e ajuda a manter o Habitica em funcionamento</string>
+  <string name="gem.purchase_subtitle">As gemas permitem-lhe comprar extras engraçados para a sua conta, incluindo:</string>
+  <string name="gem.purchase_listitem1">Disfarces divertidos para o teu avatar</string>
+  <string name="gem.purchase_listitem2">Fundos de Ecrã fantásticos</string>
+  <string name="gem.purchase_listitem3">Missões que recompensam com ovos de animal</string>
+  <string name="gem.purchase_listitem4">A habilidade de alterar a tua classe antes do nível 100</string>
   <string name="support_habitica">Suportar o Habitica</string>
   <string name="skill_transformation_use">Usar</string>
   <string name="hatching_market_info">Não encontras os objectos certos? Dá uma olhada no Mercado!</string>
@@ -405,8 +302,8 @@
   <string name="belongs_to_challenge">Pertence ao Desafio</string>
   <string name="has_reminder">Tem Lembrete</string>
   <string name="has_tag">Tem Etiqueta</string>
-  <string name="subscribe.listitem1">Compre gemas com ouro</string>
-  <string name="subscribe.listitem2">Itens exclusivos mensalmente</string>
+  <string name="subscribe_listitem1">Compre gemas com ouro</string>
+  <string name="subscribe_listitem2">Itens exclusivos mensalmente</string>
   <string name="subscriptions">Subscrições</string>
   <string name="subscribe">Subscreber</string>
   <string name="payment_method">Método de pagamento</string>
@@ -424,49 +321,34 @@
   <string name="six_months">6 meses</string>
   <string name="twelve_months">12 meses</string>
   <string name="subscription_status">Estado da Subscrição</string>
-  <string name="byLeader">por %s</string>
-  <string name="challenge_details">Detalhes do Desafio</string>
-  <string name="challenge_leave_title">Sair do Desafio</string>
+    <string name="challenge_leave_title">Sair do Desafio</string>
   <string name="challenge_remove_tasks_title">Remover tarefas</string>
   <string name="challenge_remove_tasks_text">Deseja remover as tarefas?</string>
   <string name="remove_tasks">Remover</string>
   <string name="keep_tasks">Manter</string>
   <string name="my_challenges">Os Meus Desafios</string>
-  <string name="public_challenges">Público
- </string>
-  <string name="challenges">Desafios</string>
-  <string name="daily">Diariamente</string>
+    <string name="daily">Diariamente</string>
   <string name="habit">Hábito</string>
   <string name="reward">Prémio</string>
   <string name="todo">Afazer</string>
   <string name="official">Oficial</string>
-  <string name="participating">Participação</string>
-  <string name="challenge">Desafio</string>
-  <string name="go_to_challenge">Ir para o Desafio</string>
-  <string name="not_part_of_a_challenge">De momento, não faz parte de qualquer desafio!</string>
+    <string name="challenge">Desafio</string>
+    <string name="not_part_of_a_challenge">De momento, não faz parte de qualquer desafio!</string>
   <string name="join_a_challenge">Participe num Desafio para adicionar um conjunto de tarefas para a sua lista, e depois competir contra outros Habiticans para ganhar conquistas e até mesmo gemas!</string>
-  <string name="add_reminder">Adicionar Lembrete</string>
-  <string name="warning">Aviso</string>
-  <string name="open_settings">Abrir Definições</string>
-  <string name="inbox">Mensagens</string>
-  <string name="FAQ">Perguntas Mais Frequentes</string>
-  <string name="special">Especial</string>
+    <string name="inbox">Mensagens</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>
-  <string name="limited_count">%d restante</string>
-  <string name="gem_shop">Gema</string>
+    <string name="gem_shop">Gema</string>
   <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="groups">Grupos</string>
   <string name="all">Tudo</string>
   <string name="none">Nenhum</string>
-  <string name="new_game">Novo\nJogo</string>
-  <string name="login_btn_fb">Iniciar Sessão com Facebook</string>
+    <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>
@@ -487,15 +369,12 @@
   <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="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>
-<string name="repeatables_title">Repete</string>
-    <string name="repeatables_on_title">Repete em</string>
     <string name="levelup_header">Alcançaste o Nível %1$d!</string>
     <string name="levelup_detail">Por completares os teus objectivos na vida real, subiste de nível e agora estás totalmente curado!</string>
     <string name="faint_penalty_body">Perdeste um Nível. o teu Ouro, e uma peça de Equipamento, mas podes recuperá-los de volta com trabalho árduo! Boa sorte — Vais-te sair bem.</string>
@@ -511,7 +390,7 @@
     <string name="ago_1day">1d atrás</string>
     <string name="ago_days">%dd atrás</string>
     <string name="ago_1Minute">1m atrás</string>
-    <string name="evolved_pet_title">Domaste %1$s %2$s, vamos dar um passeio!</string>
+    <string name="evolved_pet_title">Domaste %s, vamos dar um passeio!</string>
     <string name="inn_description">Preciso de um descanso\? Visite o Daniel\'s Inn para pausar alguns dos mecanismos de jogo mais difíceis do Habitica:
 \n
 \n • As diárias perdidas não o prejudicarão
diff --git a/Habitica/res/values-ru/strings.profile.xml b/Habitica/res/values-ru/strings.profile.xml
index 269e56583..ee2286655 100644
--- a/Habitica/res/values-ru/strings.profile.xml
+++ b/Habitica/res/values-ru/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <string name="profile_achievement_ok">Хорошо</string>
-    <string name="profile_qrcode_close">Закрыть</string>
 
 </resources>
diff --git a/Habitica/res/values-ru/strings.sidebar.xml b/Habitica/res/values-ru/strings.sidebar.xml
index b24e56c4d..7c31a21d3 100644
--- a/Habitica/res/values-ru/strings.sidebar.xml
+++ b/Habitica/res/values-ru/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">Задачи</string>
-  <string name="sidebar.skills">Навыки</string>
-  <string name="sidebar.section.social">Общение</string>
-  <string name="sidebar.inbox">Сообщения</string>
-  <string name="sidebar.tavern">Таверна</string>
-  <string name="sidebar.party">Команда</string>
-  <string name="sidebar.purchaseGems">Покупка самоцветов</string>
-  <string name="sidebar.guilds">Гильдии</string>
-  <string name="sidebar.challenges">Испытания</string>
-  <string name="sidebar.section.inventory">Инвентарь</string>
-  <string name="sidebar.avatar">Аватар</string>
-  <string name="sidebar.equipment">Снаряжение</string>
-  <string name="sidebar.stable">Стойла</string>
-  <string name="sidebar.news">Новости</string>
-  <string name="sidebar.settings">Настройки</string>
-  <string name="sidebar.about">О приложении</string>
+  <string name="sidebar_tasks">Задачи</string>
+  <string name="sidebar_skills">Навыки</string>
+  <string name="sidebar.section_social">Общение</string>
+  <string name="sidebar_inbox">Сообщения</string>
+  <string name="sidebar_tavern">Таверна</string>
+  <string name="sidebar_party">Команда</string>
+  <string name="sidebar_purchaseGems">Покупка самоцветов</string>
+  <string name="sidebar_guilds">Гильдии</string>
+  <string name="sidebar_challenges">Испытания</string>
+  <string name="sidebar.section_inventory">Инвентарь</string>
+  <string name="sidebar_avatar">Аватар</string>
+  <string name="sidebar_equipment">Снаряжение</string>
+  <string name="sidebar_stable">Стойла</string>
+  <string name="sidebar_news">Новости</string>
+    <string name="sidebar_about">О приложении</string>
   <string name="sidebar_shops">Магазины</string>
   <string name="sidebar_stats">Статистика</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.tutorial.xml b/Habitica/res/values-ru/strings.tutorial.xml
index 10e180b3d..781b3f329 100644
--- a/Habitica/res/values-ru/strings.tutorial.xml
+++ b/Habitica/res/values-ru/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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_skills">Навыки — это специальные способности, которые имеют мощные эффекты! Нажмите на навык что бы использовать его. Это будет стоить вам очков маны (синяя шкала), которая пополняется при входе в игру каждый день и завершением задач в реальной жизни. Читайте FAQ в меню, чтобы узнать подробности!</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>
+    <string name="tutorial_stats">Нажмите серую кнопку, чтобы распределить все ваши характеристики сразу, или нажмите на стрелки, чтобы добавить им по одному очку за раз.</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index f4f796988..4bf7e0d6e 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Опыт</string>
   <string name="HP_default">Здоровье</string>
   <string name="MP_default">Мана</string>
-  <string name="ERR_pb_barcode">Настройки не могут быть загружены из штрих-кода</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Настройки</string>
-  <string name="SP_address_hint">Ваш клиентский сервер</string>
-  <string name="SP_userID_title">ID пользователя</string>
+    <string name="SP_userID_title">ID пользователя</string>
   <string name="SP_userID_summary">Ваш ID</string>
   <string name="SP_APIToken_title">API Знак</string>
   <string name="SP_APIToken_summary">Ваш API Token</string>
   <string name="Language_title">Язык</string>
   <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="PS_contact_title">Свяжитесь со мной</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_reminder_header">Ежедневное напоминание</string>
   <string name="pref_reminder_checkbox">Активируйте напоминание</string>
   <string name="pref_reminder_picker">Установите время напоминания</string>
   <string name="pref_cds_header">Персональное начало суток</string>
-  <string name="pref_cds_picker">Установить персональное начало суток</string>
-  <string name="pref_push_notifications_checkbox">Push-уведомления пользователя</string>
+    <string name="pref_push_notifications_checkbox">Push-уведомления пользователя</string>
   <string name="push_notifications">Push-уведомления</string>
   <string name="push_notifications_sum">Настройте push-уведомления</string>
   <string name="preference_push_you_won_challenge">Вы прошли испытание!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Ваш Квест начался</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>
+    <string name="action_edit">Редактировать</string>
+    <string name="action_cancel">Закрыть</string>
   <string name="login_btn">Вход</string>
   <string name="register_btn">Регистрация</string>
   <string name="username">Имя пользователя</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Подтвердите пароль</string>
   <string name="logout">Выйти</string>
   <string name="logout_description">Выйти из вашего аккаунта</string>
-  <string name="account_details">Детали аккаунта</string>
-  <string name="LoginActivityName">Добро пожаловать</string>
-  <string name="string_revive">Воскресить</string>
-  <string name="please_connect">Пожалуйста, подключитесь через приложение, прежде чем использовать виджет</string>
-  <string name="about.title">О приложении</string>
-  <string name="about.libraries">Библиотеки</string>
-  <string name="about.versionhistory">История версий</string>
-  <string name="about.habitica_open_source">Habitica – проект с открытым исходным кодом, который доступен на Github</string>
-  <string name="about.rate_our_app">Оцените наше приложение</string>
-  <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="LoginActivityName">Добро пожаловать</string>
+    <string name="about_title">О приложении</string>
+  <string name="about_libraries">Библиотеки</string>
+    <string name="about_habitica_open_source">Habitica – проект с открытым исходным кодом, который доступен на Github</string>
+  <string name="about_rate_our_app">Оцените наше приложение</string>
+  <string name="about_give_us_feedback">Оставьте отзыв!</string>
+  <string name="about_bugreport">Сообщить об ошибке</string>
+  <string name="about_source_code">Исходный код</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Кажется, возникли технические проблемы на сервере. Повторите попытку позже.</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_title">Ошибка проверки</string>
   <string name="login_validation_error_fieldsmissing">Вы должны заполнить все поля.</string>
   <string name="save_changes">Сохранить</string>
   <string name="copy">Копировать</string>
   <string name="notes">Заметки</string>
-  <string name="text">Текст</string>
-  <string name="difficulty">Сложность</string>
+    <string name="difficulty">Сложность</string>
   <string name="tags">Метки</string>
   <string name="trivial">Пустяк</string>
   <string name="easy">Легко</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Вредная ( - )</string>
   <string name="checklist">Список</string>
   <string name="reminders">Напоминания</string>
-  <string name="actions">Действия</string>
-  <string name="attributes">Характеристики</string>
-  <string name="physical">Сила</string>
-  <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="attributes">Характеристики</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>
@@ -123,24 +92,15 @@
   <string name="faint_header">У вас закончилось здоровье!</string>
   <string name="faint_button">Восстановить здоровье &amp; Попробовать ещё раз</string>
   <string name="filter">Фильтр</string>
-  <string name="profile_image">Аватар</string>
-  <string name="mana_price_button">%d МP</string>
-  <string name="used_skill">Вы использовали %1$s за %2$d маны.</string>
-  <string name="used_skill_without_mana">Вы использовали %1$s.</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="skill_progress_title">Использовать навык</string>
-  <string name="coming_soon">Скоро</string>
-  <string name="chat_flag_confirmation">Вы уверены, что хотите пожаловаться на это сообщение?</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>
-  <string name="tavern.inn.checkOut">Cнова активировать ваши ежедневные задания</string>
-  <string name="tavern.inn.rest">Временно приостановить ваши ежедневные задания</string>
-  <string name="reward.dialog.buy">Купить</string>
-  <string name="reward.dialog.dismiss">Отклонить</string>
+    <string name="reminder_title">Не забудьте отмечать свои задачи</string>
+    <string name="unlock_lvl_11">Открывается на 11 уровне</string>
+    <string name="forgot_pw_btn">Забыли пароль</string>
+  <string name="tavern.inn_checkOut">Cнова активировать ваши ежедневные задания</string>
+  <string name="tavern.inn_rest">Временно приостановить ваши ежедневные задания</string>
+  <string name="reward.dialog_buy">Купить</string>
+  <string name="reward.dialog_dismiss">Отклонить</string>
   <string name="party">Команда</string>
   <string name="chat">Чат</string>
   <string name="members">Участники</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Ежедневные задания</string>
   <string name="todos">Задачи</string>
   <string name="rewards">Награды</string>
-  <string name="taskform.delete.title">Вы уверены?</string>
-  <string name="taskform.delete.message">Вы уверены, что хотите удалить?</string>
-  <string name="yes">Да</string>
+    <string name="yes">Да</string>
   <string name="no">Нет</string>
   <string name="quest">Квест</string>
   <string name="avatar_body">Тело</string>
   <string name="avatar_hair">Причёска</string>
   <string name="avatar_shirt">Рубашка</string>
   <string name="avatar_skin">Кожа</string>
-  <string name="avatar_ears">Уши животных</string>
-  <string name="avatar_base">Основа</string>
+    <string name="avatar_base">Основа</string>
   <string name="avatar_color">Цвет</string>
   <string name="avatar_beard">Борода</string>
   <string name="avatar_mustache">Усы</string>
   <string name="avatar_flower">Цветок</string>
   <string name="avatar_bangs">Чёлка</string>
-  <string name="avatar_nothing">Не выбрано</string>
-  <string name="avatar_size">Телосложение</string>
+    <string name="avatar_size">Телосложение</string>
   <string name="avatar_size_slim">Стройное</string>
   <string name="avatar_size_broad">Плотное</string>
   <string name="avatar_background">Фон</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Купить</string>
   <string name="purchase_set_title">Купить комплект %s</string>
   <string name="due_date">Дата выполнения</string>
-  <string name="quest.accept">Принять</string>
-  <string name="quest.reject">Отклонить</string>
-  <string name="quest.begin">Начать квест</string>
-  <string name="quest.cancel">Отменить приглашение</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>
-  <string name="quest.participants">Участники</string>
-  <string name="version_info">Версия %1$s (%2$d)</string>
+  <string name="quest_accept">Принять</string>
+  <string name="quest_reject">Отклонить</string>
+  <string name="quest_begin">Начать квест</string>
+  <string name="quest_cancel">Отменить приглашение</string>
+  <string name="quest_abort">Остановить квест</string>
+    <string name="version_info">Версия %1$s (%2$d)</string>
   <string name="sidebar_help">Помощь и ЧаВо</string>
   <string name="complete_tutorial">Есть!</string>
   <string name="dismiss_tutorial">Напомнить позже</string>
   <string name="intro_1_subtitle">Добро пожаловать в</string>
-  <string name="intro_1_title">Хабитика</string>
-  <string name="intro_1_description">Пришло время веселиться, пока вы делаете свою работу. Присоединитесь к %s участникам, уже улучшающих свою жизнь.</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>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Общайтесь</string>
   <string name="intro_3_description">Добивайтесь поставленнх целей с помощью друзей. Поддерживайте друг друга в реальной жизни и в сражении, делая свою жизнь лучше!</string>
   <string name="intro_finish_button">Давайте начнем!</string>
-  <string name="previous_button">Назад</string>
-  <string name="next_button">Далее</string>
+    <string name="next_button">Далее</string>
   <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="avatar_setup_description">Итак, как бы вы хотели выглядеть? Не беспокойтесь, вы это сможете изменить позже.</string>
   <string name="task_setup_description">Великолепно! Теперь, вы заинтересованы в работе на протяжении этого путешествия?</string>
   <string name="setup_group_work">Работа</string>
   <string name="setup_group_exercise">Тренировки</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Улучшить навык владения ремеслом</string>
   <string name="setup_task_creativity_2">Поработать над творческим проектом</string>
   <string name="setup_task_creativity_3">Закончить творческий проект</string>
-  <string name="gem.purchase.support">Хотите помочь нам развивать Habitica и дальше? Вы можете поддержать разработчиков, купив самоцветы!\n\nСамоцветы позволяют вам купить забавные дополнения такие, как:  \n\n - классные костюмы для вашего аватара;\n - потрясающие фоны;\n - веселые квесты, в награду за которые вы получите яйца с питомцами;\n - возможность сменить класс до 100 уровня.\n\nБольшое спасибо за то, что вы помогаете Habitica делать лучшей на сколь это возможно. Ваша поддержка очень важна для нас!</string>
-  <string name="my_guilds">Мои гильдии</string>
+    <string name="my_guilds">Мои гильдии</string>
   <string name="public_guilds">Открытые гильдии</string>
   <string name="guild">Гильдия</string>
   <string name="leave">Покинуть</string>
   <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="gems">Самоцветы</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>
-  <string name="guild_search_hint">Поиск для гильдий</string>
-  <string name="todo_due">Выполнить к: %s</string>
-  <string name="daily_streak">выполнено подряд: %d</string>
-  <string name="todo_has_duedate">У задания есть срок выполнения</string>
-  <string name="battle_gear">Боевая экипировка</string>
+    <string name="guild_search_hint">Поиск для гильдий</string>
+    <string name="battle_gear">Боевая экипировка</string>
   <string name="costume">Костюм</string>
   <string name="outfit_head">Голова</string>
   <string name="outfit_headAccessory">Аксессуары</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Использовать костюм</string>
   <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="quest_begin_message">Вы уверены? Только %1$d из %2$d членов команды присоединились к этому квесту! Квест начнется автоматически, когда все игроки присоедятся или отклонят приглашение.</string>
+    <string name="ago_1day">1 день назад</string>
   <string name="ago_days">%d дней назад</string>
   <string name="ago_hours">%d часов назад</string>
   <string name="ago_1hour">1 час назад</string>
@@ -286,13 +222,9 @@
   <string name="armoireEquipment">Вы нашли в сундуке редкий предмет: %s! Потрясающе!</string>
   <string name="armoireFood">Копаясь в сундуке, вы находите %1$s %2$s. Откуда это здесь?</string>
   <string name="armoireExp">Вы сражаетесь с сундуком и набираете опыт. Получай!</string>
-  <string name="armoireNotesFull">Откройте сундук, чтобы случайным образом получить особое снаряжение, опыт или еду! Осталось предметов снаряжения: %d</string>
-  <string name="armoireLastItem">Вы получили последний редкий предмет из зачарованного сундука.</string>
-  <string name="armoireNotesEmpty">Новое снаряжение будет появляться в сундуке раз в месяц. До тех пор – продолжайте кликать ради опыта и еды!</string>
-  <string name="sell">Продать (%d золота)</string>
+    <string name="sell">Продать (%d золота)</string>
   <string name="hatch_with_potion">Полить эликсиром</string>
-  <string name="feed_to_pet">Покормить питомца</string>
-  <string name="hatch_egg">Вывести питомца из яйца</string>
+    <string name="hatch_egg">Вывести питомца из яйца</string>
   <string name="invite_party">Пригласить команду</string>
   <string name="dialog_feeding">Покормить %s:</string>
   <string name="use_animal">Использовать</string>
@@ -303,17 +235,8 @@
   <string name="close">Закрыть</string>
   <string name="share">Поделиться</string>
   <string name="notification_pet_fed">Вы покормили вашего %s!</string>
-  <string name="notification_purchase">Вы купили %s</string>
-  <string name="notification_purchase_reward">Вы купили награду</string>
-  <string name="sectiondrop">Обычные</string>
-  <string name="sectionpremium">Магический эликсир</string>
-  <string name="sectionquest">Квест</string>
-  <string name="sectionspecial">Редкие питомцы</string>
-  <string name="sectionmounts">Основные скакуны</string>
-  <string name="sectionpremiumMounts">Магический эликсир</string>
-  <string name="sectionquestMounts">Квест</string>
-  <string name="sectionspecialMounts">Редкие питомцы</string>
-  <string name="world_quest">Мировой квест</string>
+    <string name="notification_purchase_reward">Вы купили награду</string>
+    <string name="world_quest">Мировой квест</string>
   <string name="inn_description">Нужен отдых? Запишитесь в гостиницу Даниэля, чтобы остановить несколько сложных игровых механик страны Habitica:\n\n
 • Пропущенные ежедневные дела не нанесут урона\n
 • Задачи не будут терять серий или понижения в цвете\n
@@ -332,8 +255,7 @@
   <string name="healer_description">Целители неуязвимы перед уроном и распространяют защиту на других. Пропущенные ежедневные задания и вредные привычки несильно их беспокоят, а после неудачи они могут восстановить здоровье. Играйте за целителя, если вам нравится помогать другим членам команды или если вас вдохновляет мысль о возможности усердным трудом обмануть смерть!</string>
   <string name="select_class">Выберите класс</string>
   <string name="opt_out_class">Отказаться</string>
-  <string name="opt_out_description">Не хотите утруждать себя классами? Тогда откажитесь — и останетесь воином и ваши очки будут обрабатываться автоматически. Активировать классы можно будет позже в меню настроек.</string>
-  <string name="class_confirmation">Вы уверены, что хотите быть %s?</string>
+    <string name="class_confirmation">Вы уверены, что хотите быть %s?</string>
   <string name="class_changed">Теперь вы %s!</string>
   <string name="class_changed_description">У вас есть новая боевая экипировка по умолчанию, которую вы можете сменить в разделе Снаряжение!</string>
   <string name="choose_class">Выбрать класс</string>
@@ -347,23 +269,18 @@
   <string name="invite_existing_users">Пригласить существующих пользователей</string>
   <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_username_description">Если у вас уже есть друзья, которые пользуются Habitica, пригласите их используя имя пользователя.</string>
   <string name="invite_email_description">Если друг присоединится к Habitica, перейдя по ссылке в вашем письме, он автоматически будет приглашён в вашу команду!</string>
   <string name="add_invites">Добавить приглашенных</string>
-  <string name="user_id">ID пользователя</string>
-  <string name="email">Электронная почта</string>
-  <string name="invite_users">Пригласить в команду</string>
-  <string name="share_using">Поделиться с помощью</string>
+    <string name="email">Электронная почта</string>
+    <string name="share_using">Поделиться с помощью</string>
   <string name="share_levelup">Я достиг %d уровня в Habitica, улучшая привычки в реальной жизни!</string>
   <string name="share_hatched">У меня только что вылупился питомец %1$s %2$s в Habitica, потому что я выполнял задачи в реальной жизни!</string>
   <string name="share_raised">Я только что получил скакуна %1$s в Habitica, выполняя задачи в реальной жизни!</string>
   <string name="open_in_store">Откройте в Play маркет</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="confirm">Подтвердить</string>
   <string name="market">Магазин</string>
   <string name="timeTravelers">Путешественники во времени</string>
   <string name="seasonalShop">Сезонная лавка</string>
@@ -371,37 +288,16 @@
   <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>
-  <string name="hourglass">песочные часы</string>
-  <string name="hourglasses">песочные часы</string>
-  <string name="gold_singular">золото</string>
-  <string name="gold_plural">золото</string>
+    <string name="successful_purchase">Купленный %1$s</string>
+    <string name="gold_plural">золото</string>
   <string name="chat_message_copied">Сообщение скопировано в буфер обмена</string>
-  <string name="copy_chat_message">Скопировать в буфер обмена</string>
-  <string name="edit_tag_title">Редактировать метку</string>
-  <string name="edit_tag_btn_edit">Редактировать</string>
-  <string name="edit_tag_btn_done">Готово</string>
-  <string name="edit_tag_btn_delete">Удалить</string>
-  <string name="confirm_delete_tag_title">Вы уверены?</string>
+    <string name="edit_tag_btn_edit">Редактировать</string>
+    <string name="confirm_delete_tag_title">Вы уверены?</string>
   <string name="confirm_delete_tag_message">Вы уверены, что хотите удалить?</string>
-  <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>
-  <string name="send_new_message">Отправить новое сообщение</string>
-  <string name="choose_recipient_title">Выберите получателя</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Выберите получателя</string>
   <string name="action_continue">Продолжить</string>
-  <string name="scan_qr_code">Сканировать QR код</string>
-  <string name="enter_recipient_uuid">Ввести пользовательский ID участника</string>
-  <string name="invited_to_party">Вас пригласили в команду!</string>
+    <string name="invited_to_party">Вас пригласили в команду!</string>
   <string name="stats_widget_label">Характеристики Habitica</string>
   <string name="add_task">Добавить задачу</string>
   <string name="add_habit">Добавить привычку</string>
@@ -412,15 +308,14 @@
   <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="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>
@@ -434,26 +329,26 @@
   <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_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="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 Камней за каждые три месяца последовательной подписки вплоть до максимума в 50 Камней в месяц!</string>
-  <string name="subscribe.listitem2.description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
-  <string name="subscribe.listitem3.description">Завершенный список дел и история доступны дольше.</string>
-  <string name="subscribe.listitem4.description">Удвоенный предел количества полученных трофеев позволит вам получить больше предметов посредством выполнения задач каждый день, помогая быстрее заполнить стойла!</string>
+  <string name="subscribe.listitem1_description">Торговец Александр теперь будет продавать вам Драгоценные Камни за 20 золотых монет каждый!\n\nЕго месячная поставка сперва ограничится 25 Камнями в месяц, но может быть увеличена в зависимости от времени вашей подписки.\n\nРазмер поставки увеличивается на 5 Камней за каждые три месяца последовательной подписки вплоть до максимума в 50 Камней в месяц!</string>
+  <string name="subscribe.listitem2_description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
+  <string name="subscribe.listitem3_description">Завершенный список дел и история доступны дольше.</string>
+  <string name="subscribe.listitem4_description">Удвоенный предел количества полученных трофеев позволит вам получить больше предметов посредством выполнения задач каждый день, помогая быстрее заполнить стойла!</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 Store.</string>
-  <string name="cancel_subscription_notgoogle.description">Вы хотите отменить свою подписку\? Из-за способа оплаты вы можете отменить подписку только через сайт. Нажмите кнопку ниже, чтобы открыть страницу в браузере!</string>
+  <string name="cancel_subscription_google_description">Больше не хотите использовать подписку? При желании можете отписаться в разделе \"Мои приложения\" в Google Play Store.</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>
@@ -468,56 +363,40 @@
   <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_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>
-  <string name="daily">Ежедневное задание</string>
+    <string name="daily">Ежедневное задание</string>
   <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="challenge">Испытание</string>
+    <string name="not_part_of_a_challenge">Сейчас вы не участвуете в испытаниях!</string>
   <string name="join_a_challenge">Присоединитесь к испытанию, чтобы добавить готовый набор задач в ваш список, и соревнуйтесь с другими хабитанцами, чтобы заработать достижения и даже самоцветы!</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">Похоже, что у вас активен параметр разработчика \\"Не сохранять операции\\". Обычно из-за него возникают проблемы с приложением Habitica, поэтому мы советуем его отключить.</string>
-  <string name="inbox">Сообщения</string>
-  <string name="FAQ">Часто задаваемые вопросы</string>
-  <string name="special">Специальное</string>
+    <string name="inbox">Сообщения</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="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="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="groups">Группы</string>
   <string name="all">Все</string>
   <string name="none">Никто</string>
   <string name="owned">Принадлежит</string>
   <string name="not_owned">Не принадлежит</string>
-  <string name="new_game">Новая\nИгра</string>
-  <string name="login_btn_fb">Зарегистрироваться с Facebook</string>
+    <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>
@@ -549,7 +428,6 @@
   <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>
@@ -557,8 +435,7 @@
   <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_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>
@@ -568,42 +445,36 @@
   <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="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="number_participants">%1$dУчастники</string>
   <string name="welcome_back">C возвращением</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="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_leader_header">Начато %s</string>
   <string name="quest_abort_message">Вы уверены, что хотите отменить эту миссию? Это прервет её прохождение для каждого в вашей команде и весь прогресс будет потерян. Квестовый свиток останется у владельца.</string>
-  <string name="loading">Загрузка…</string>
-  <string name="reloading_content">Обновление содержимого</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="available_until">Доступно до %s</string>
+  <string name="gems_left_max">Ежемесячные самоцветы: осталось %1$d/%2$d</string>
+  <string name="gems_left_nomax">Ежемесячные самоцветы: осталось %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_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d опыта</string>
+  <string name="gold_reward">%d золота</string>
   <string name="quest_owner_rewards">Награды для владельца квеста</string>
   <string name="str_abbrv">СИЛ</string>
   <string name="per_abbrv">ВОС</string>
@@ -616,8 +487,7 @@
   <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="resetting_account">Сброс аккаунта</string>
   <string name="deleting_account">Удаление аккаунта</string>
   <string name="insufficientGold">Вам нужно выполнить больше задач, прежде чем вы сможете позволить себе этот предмет!</string>
   <string name="insufficientGems">Для покупки этого предмета вам нужно больше самоцветов!</string>
@@ -650,8 +520,7 @@
   <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_username">Измените имя пользователя</string>
   <string name="change">Изменить</string>
   <string name="character_level">Уровень персонажа</string>
   <string name="auto_allocate_points">Автоматически распределять очки</string>
@@ -672,7 +541,7 @@
   <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="points_to_allocate">%dочк. для распределения</string>
   <string name="distribute_evenly_help">Назначает одинаковое количество очков для каждой характеристики.</string>
   <string name="distribute_class_help">Назначает больше очков на важные вашему классу характеристики.</string>
   <string name="distribute_task_help">Назначаемые очки основываются на параметрах силы, интеллекта, телосложения и восприятии, связанных с выполняемыми вами задачами.</string>
@@ -682,9 +551,7 @@
   <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="tavern_description">Добро пожаловать в Гостиницу! Пододвигайе кресло к чату или возьмите перерыв и отдохните от ваших заданий.</string>
   <string name="check_into_inn">Разместиться в гостинице</string>
   <string name="community_guidelines">Правила сообщества</string>
   <string name="view_community_guidelines">Посмотреть правила сообщества</string>
@@ -698,19 +565,13 @@
   <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="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="rage_strike_count">Ярость: %d/%d</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="strike_active_title">Атаковали %s!</string>
+    <string name="strike_active_description">Наш любимый %s был печально потрясен, когда %s порушил %s. Скорее, завершайте ваши задания, чтобы победить этого монстра и помочь в восстановлении!</string>
   <string name="questShop">Лавка квестов</string>
   <string name="market_owner_long">Торговец Александр</string>
   <string name="tavern_owner_long">Даниэль, хозяин гостиницы</string>
@@ -720,33 +581,21 @@
   <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="join_party_title">Хотите присоединиться к команде?</string>
+    <string name="insufficientSubscriberGems">Вы купили все самоцветы, доступные в этом месяце. Новая партия будет доступна в течение первых трех дней следующего месяца. Спасибо за подписку!</string>
+    <string name="world_boss_description_title">Кто такой Мировой босс?</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="world_boss_action_prompt">Победите босса, чтобы заслужить особые награды и спасти страну страна Habitica от %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="reply">Ответить</string>
   <string name="challenge_prize">Награда за испытание</string>
   <string name="challenge_categories">Категории Испытаний</string>
   <string name="created_challenge">Создать испытание</string>
@@ -780,17 +629,15 @@
   <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="usernamePromptWiki">Если хотите узнать более подробнее про изменения, то <a href="https://habitica.wikia_com/wiki/Player_Names">посетите вики.</a></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="username_copied">Ник скопирован в буфер обмена</string>
+    <string name="username_copied">Ник скопирован в буфер обмена</string>
   <string name="verification_pet">Один из питомцев-ветеранов будет ожидать вас, после подтверждения своего выбора!</string>
   <string name="welcomeNameTitle">Как к вам обращаться?</string>
   <string name="display_name_length_error">Отображаемое имя должно быть от 1 до 30 символов</string>
@@ -803,13 +650,13 @@
   <string name="equipment_int">ИНТ:</string>
   <string name="equipment_per">ВОС:</string>
   <string name="ago_1Minute">1 минуту назад</string>
-  <string name="ago_minutes">%sминуты назад</string>
+  <string name="ago_minutes">%dминуты назад</string>
   <string name="opting_out_progress">Не принимать участие</string>
   <string name="subscription_duration_norenew">Для %s</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="subscribe1month_gemcap">Максимум 25 драгоценные камни</string>
+  <string name="subscribe3month_gemcap">Максимум 30 драгоценные камни</string>
+  <string name="subscribe6month_gemcap">Максимум 35 драгоценные камни</string>
+  <string name="subscribe12month_gemcap">Максимум 45 драгоценные камни</string>
   <string name="delete_oauth_account_description">Уверены ли вы\? Это удалит вашу учетную запись навсегда и она никогда не будет восстановлена! Вам нужно будет зарегистрировать новую учетную запись, чтобы снова использовать Habitica. Банк или потраченные драгоценные камни не будут возвращены. Если вы абсолютно уверены, введите DELETE в текстовом поле ниже.</string>
   <string name="enter_recipient_username">Введите @ имя получателя</string>
   <string name="visit_website">посетите сайт</string>
diff --git a/Habitica/res/values-sw320dp/dimens.xml b/Habitica/res/values-sw320dp/dimens.xml
index d40b16fa2..a6b3daec9 100644
--- a/Habitica/res/values-sw320dp/dimens.xml
+++ b/Habitica/res/values-sw320dp/dimens.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <dimen name="login_field_width">300dp</dimen>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-tr/strings.profile.xml b/Habitica/res/values-tr/strings.profile.xml
index e2be2b049..c9b401367 100644
--- a/Habitica/res/values-tr/strings.profile.xml
+++ b/Habitica/res/values-tr/strings.profile.xml
@@ -9,10 +9,7 @@
     <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">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>
-    <string name="profile_qrcode_close">Kapat</string>
 
 </resources>
diff --git a/Habitica/res/values-tr/strings.sidebar.xml b/Habitica/res/values-tr/strings.sidebar.xml
index 62ed67db3..c031c4a83 100644
--- a/Habitica/res/values-tr/strings.sidebar.xml
+++ b/Habitica/res/values-tr/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">İşler</string>
-  <string name="sidebar.skills">Yetenekler</string>
-  <string name="sidebar.section.social">Sosyal</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>
-  <string name="sidebar.guilds">Loncalar</string>
-  <string name="sidebar.challenges">Mücadeleler</string>
-  <string name="sidebar.section.inventory">Envanter</string>
-  <string name="sidebar.avatar">Avatar</string>
-  <string name="sidebar.equipment">Ekipman</string>
-  <string name="sidebar.stable">Ahır</string>
-  <string name="sidebar.news">Haberler</string>
-  <string name="sidebar.settings">Ayarlar</string>
-  <string name="sidebar.about">Hakkında</string>
+  <string name="sidebar_tasks">İşler</string>
+  <string name="sidebar_skills">Yetenekler</string>
+  <string name="sidebar.section_social">Sosyal</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>
+  <string name="sidebar_guilds">Loncalar</string>
+  <string name="sidebar_challenges">Mücadeleler</string>
+  <string name="sidebar.section_inventory">Envanter</string>
+  <string name="sidebar_avatar">Avatar</string>
+  <string name="sidebar_equipment">Ekipman</string>
+  <string name="sidebar_stable">Ahır</string>
+  <string name="sidebar_news">Haberler</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 9fce3ed28..852ba69a5 100644
--- a/Habitica/res/values-tr/strings.tutorial.xml
+++ b/Habitica/res/values-tr/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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>
-  <string name="tutorial_pets">Gerçek dünya işlerini tamamladıkça, artık rastgele yumurta ve iksir bulma şansın var. Hayvanları yumurtadan çıkarmak için o ikisini birleştir</string>
-  <string name="tutorial_skills">Yetenekler güçlü etkileri olan özel becerilerdir! Kullanmak için bir yetenğe bas. Bu Mana ile (mavi çubuk), yani hergün giriş yapmakla ve gerçek hayat görevlerini tamamlamakla kazanarak ödenir. Daha fazla bilgi için menüdeki SSS\'ı kontrol et!</string>
+    <string name="tutorial_skills">Yetenekler güçlü etkileri olan özel becerilerdir! Kullanmak için bir yetenğe bas. Bu Mana ile (mavi çubuk), yani hergün giriş yapmakla ve gerçek hayat görevlerini tamamlamakla kazanarak ödenir. Daha fazla bilgi için menüdeki SSS\'ı kontrol et!</string>
   <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>
+    <string name="tutorial_stats">Niteliklerinin çoğunu tek seferde paylaştırmak için gri butona dokun veya 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 8fa9dbc8c..9ba14be38 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">Tecrübe</string>
   <string name="HP_default">Sağlık</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">Ayarlar barkoddan yüklenemedi</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">Ayarlar</string>
-  <string name="SP_address_hint">Sizin özel sunucunuz</string>
-  <string name="SP_userID_title">Kullanıcı ID\'si</string>
+    <string name="SP_userID_title">Kullanıcı ID\'si</string>
   <string name="SP_userID_summary">Sizin Kullanıcı Kimliğiniz</string>
   <string name="SP_APIToken_title">API Anahtarı</string>
   <string name="SP_APIToken_summary">Sizin API Anahtarınız</string>
   <string name="Language_title">Dil</string>
   <string name="Language_summary">Habitica\'nın dilini değiştirin</string>
-  <string name="SP_user_qr_code">Sizin QR Kodunuz</string>
-  <string name="PS_contact_title">Benimle iletişime geçin</string>
-  <string name="unknown_error">Bir hata oluştu…</string>
-  <string name="pref_account_header">Hesap</string>
+    <string name="PS_contact_title">Benimle iletişime geçin</string>
+    <string name="pref_account_header">Hesap</string>
   <string name="pref_first_day_of_the_week_title">Haftanın İlk Günü</string>
   <string name="pref_first_day_of_the_week_summary">Tüm takvimlerde haftanın ilk günü</string>
   <string name="pref_reminder_header">Günlük Hatırlatıcı</string>
   <string name="pref_reminder_checkbox">Hatırlatıcıyı Etkinleştirin</string>
   <string name="pref_reminder_picker">Hatırlatıcı Zamanını Ayarla</string>
   <string name="pref_cds_header">Özel Gün Başlangıcı</string>
-  <string name="pref_cds_picker">Özel Gün Başlangıç Zamanını Ayarla</string>
-  <string name="pref_push_notifications_checkbox">Kullanıcı Bildirimleri</string>
+    <string name="pref_push_notifications_checkbox">Kullanıcı Bildirimleri</string>
   <string name="push_notifications">Bildirimler</string>
   <string name="push_notifications_sum">Bildirim ayarlarınızı yapın</string>
   <string name="preference_push_you_won_challenge">Bir Mücadele kazandın!</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">Görevin Başladı</string>
   <string name="preference_push_invited_to_quest">Göreve Davet Edildin</string>
   <!--Adding tasks-->
-  <string name="task_value">Değer</string>
-  <string name="new_todo">Yeni Yapılacak İş</string>
-  <string name="new_reward">Yeni Ödül</string>
-  <string name="new_daily">Yeni Günlük İş</string>
-  <string name="new_habit">Yeni Alışkanlık</string>
-  <string name="action_edit">Düzenle</string>
-  <string name="action_delete">Sil</string>
-  <string name="action_cancel">İptal et</string>
+    <string name="action_edit">Düzenle</string>
+    <string name="action_cancel">İptal et</string>
   <string name="login_btn">Giriş yap</string>
   <string name="register_btn">Kayıt ol</string>
   <string name="username">Kullanıcı adı</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">Şifreni onayla</string>
   <string name="logout">Çıkış yap</string>
   <string name="logout_description">Hesabından çıkış yap</string>
-  <string name="account_details">Hesap Detayları</string>
-  <string name="LoginActivityName">Hoş Geldin</string>
-  <string name="string_revive">Dirilt</string>
-  <string name="please_connect">Lütfen bir ekran aracı kullanmadan önce uygulamaya bağlan</string>
-  <string name="about.title">Hakkında</string>
-  <string name="about.libraries">Kütüphaneler</string>
-  <string name="about.versionhistory">Sürüm geçmişi</string>
-  <string name="about.habitica_open_source">Habitica Github üzerinde açık kaynak olarak mevcuttur</string>
-  <string name="about.rate_our_app">Uygulamamızı Değerlendir</string>
-  <string name="about.give_us_feedback">Bize Geribildirim gönder!</string>
-  <string name="about.bugreport">Hata Bildir</string>
-  <string name="about.source_code">Kaynak Kodu</string>
-  <string name="repeatEvery">Tekrar aralığı</string>
-  <!--Network Errors-->
-  <string name="network_error_title">Bağlantı Hatası</string>
-  <string name="network_error_no_network_body">İnternete bağlı değilsin.</string>
-  <string name="internal_error_api">Sunucu ile ilgili bir hata var gibi görünüyor. Daha sonra tekrar dene.</string>
+    <string name="LoginActivityName">Hoş Geldin</string>
+    <string name="about_title">Hakkında</string>
+  <string name="about_libraries">Kütüphaneler</string>
+    <string name="about_habitica_open_source">Habitica Github üzerinde açık kaynak olarak mevcuttur</string>
+  <string name="about_rate_our_app">Uygulamamızı Değerlendir</string>
+  <string name="about_give_us_feedback">Bize Geribildirim gönder!</string>
+  <string name="about_bugreport">Hata Bildir</string>
+  <string name="about_source_code">Kaynak Kodu</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">Sunucu ile ilgili bir hata var gibi görünüyor. Daha sonra tekrar dene.</string>
   <string name="authentication_error_title">Kimlik doğrulama hatası</string>
-  <string name="authentication_error_body">Kullanıcı adı ve/veya Şifre hatalı.</string>
-  <string name="login_validation_error_title">Doğrulama Hatası</string>
+    <string name="login_validation_error_title">Doğrulama Hatası</string>
   <string name="login_validation_error_fieldsmissing">Tüm alanları doldurmanız gerekiyor.</string>
   <string name="save_changes">Kaydet</string>
   <string name="copy">Kopyala</string>
   <string name="notes">Notlar</string>
-  <string name="text">Metin</string>
-  <string name="difficulty">Zorluk</string>
+    <string name="difficulty">Zorluk</string>
   <string name="tags">Etiketler</string>
   <string name="trivial">Önemsiz</string>
   <string name="easy">Kolay</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">Olumsuz ( - )</string>
   <string name="checklist">Maddeler</string>
   <string name="reminders">Hatırlatıcılar</string>
-  <string name="actions">Hareketler</string>
-  <string name="attributes">Özellikler</string>
-  <string name="physical">Güç</string>
-  <string name="mental">Zeka</string>
-  <string name="social">Bünye</string>
-  <string name="other">Sezgi</string>
-  <string name="frequency">Sıklık</string>
-  <string name="frequency_weekly">Haftanın Belirli Günlerinde</string>
-  <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">Tekrarlanır</string>
-  <string name="repeatables_frequency_daily">Günlük</string>
+    <string name="attributes">Özellikler</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>
   <string name="repeatables_frequency_yearly">Yıllık</string>
@@ -123,24 +92,15 @@
   <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>
-  <string name="profile_image">Profil Resmi</string>
-  <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="used_skill_without_mana">%1$s kullandın.</string>
   <string name="new_checklist_item">yeni madde</string>
-  <string name="add_checklist_item">Ekle</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>
-  <string name="flag_confirm">Mesajı İşaretle</string>
-  <string name="unlock_lvl_11">Seviye 11\'de açılır</string>
-  <string name="no_party_message">Bir takıma üye değilsin. Bir takıma katılmak için lütfen internet sitesini ziyaret et. </string>
-  <string name="forgot_pw_btn">Şifremi Unuttum</string>
-  <string name="tavern.inn.checkOut">Günlük İşlerini tekrar etkinleştir</string>
-  <string name="tavern.inn.rest">Günlük İşleri durdur</string>
-  <string name="reward.dialog.buy">Satın al</string>
-  <string name="reward.dialog.dismiss">Yoksay</string>
+    <string name="reminder_title">İşlerini işaretlemeyi unutma</string>
+    <string name="unlock_lvl_11">Seviye 11\'de açılır</string>
+    <string name="forgot_pw_btn">Şifremi Unuttum</string>
+  <string name="tavern.inn_checkOut">Günlük İşlerini tekrar etkinleştir</string>
+  <string name="tavern.inn_rest">Günlük İşleri durdur</string>
+  <string name="reward.dialog_buy">Satın al</string>
+  <string name="reward.dialog_dismiss">Yoksay</string>
   <string name="party">Takım</string>
   <string name="chat">Sohbet</string>
   <string name="members">Üyeler</string>
@@ -148,24 +108,20 @@
   <string name="dailies">Günlük İşler</string>
   <string name="todos">Yapılacak İşler</string>
   <string name="rewards">Ödüller</string>
-  <string name="taskform.delete.title">Emin misin?</string>
-  <string name="taskform.delete.message">Gerçekten silmek istiyor musun?</string>
-  <string name="yes">Evet</string>
+    <string name="yes">Evet</string>
   <string name="no">Hayır</string>
   <string name="quest">Görev</string>
   <string name="avatar_body">Vücut</string>
   <string name="avatar_hair">Saç</string>
   <string name="avatar_shirt">Gömlek</string>
   <string name="avatar_skin">Ten</string>
-  <string name="avatar_ears">Hayvan Kulakları</string>
-  <string name="avatar_base">Temel</string>
+    <string name="avatar_base">Temel</string>
   <string name="avatar_color">Renk</string>
   <string name="avatar_beard">Sakal</string>
   <string name="avatar_mustache">Bıyık</string>
   <string name="avatar_flower">Çiçek</string>
   <string name="avatar_bangs">Kahkül</string>
-  <string name="avatar_nothing">Hiçbir şey ayarlanmadı</string>
-  <string name="avatar_size">Boyut</string>
+    <string name="avatar_size">Boyut</string>
   <string name="avatar_size_slim">İnce</string>
   <string name="avatar_size_broad">Geniş</string>
   <string name="avatar_background">Arka plan </string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">Satın al</string>
   <string name="purchase_set_title">%s seti satın al</string>
   <string name="due_date">Son Tarih</string>
-  <string name="quest.accept">Kabul et</string>
-  <string name="quest.reject">Reddet</string>
-  <string name="quest.begin">Göreve Başla</string>
-  <string name="quest.cancel">Daveti İptal Et</string>
-  <string name="quest.abort">Görevi iptal et</string>
-  <string name="quest.leave">Görevden Ayrıl</string>
-  <string name="quest.pending">Beklemede</string>
-  <string name="quest.accepted">Kabul edildi</string>
-  <string name="quest.rejected">Reddedildi</string>
-  <string name="quest.participants">Katılımcılar</string>
-  <string name="version_info">Versiyon %1$s (%2$d)</string>
+  <string name="quest_accept">Kabul et</string>
+  <string name="quest_reject">Reddet</string>
+  <string name="quest_begin">Göreve Başla</string>
+  <string name="quest_cancel">Daveti İptal Et</string>
+  <string name="quest_abort">Görevi iptal et</string>
+    <string name="version_info">Versiyon %1$s (%2$d)</string>
   <string name="sidebar_help">Yardım &amp; SSS</string>
   <string name="complete_tutorial">Anladım!</string>
   <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">Artık işlerini hallederken eğlenme zamanı. Hayatlarını adım adım iş yaparak geliştiren %s kişiye katıl.</string>
+    <string name="intro_1_description">Artık işlerini hallederken eğlenme zamanı. Hayatlarını adım adım iş yaparak geliştiren %s kişiye katıl.</string>
   <string name="intro_2_subtitle">Oyundaki gelişim</string>
   <string name="intro_2_title">Hayattaki 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>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">Sosyalleş</string>
   <string name="intro_3_description">Hedeflerini arkadaşlarından yardım alarak devam ettir. Hayatta ve savaşlarda birbirinizi geliştirerek birbirinize destek olun!</string>
   <string name="intro_finish_button">Hadi başlayalım!</string>
-  <string name="previous_button">Önceki</string>
-  <string name="next_button">Sonraki</string>
+    <string name="next_button">Sonraki</string>
   <string name="skip_button">Atla</string>
-  <string name="setup_welcome_description">Habitica\'ya hoşgeldin, oyunda ilerledikçe gerçek hayatını da geliştireceksin! Gerçek hayat hedeflerine ulaştıkça ekipman, evcil hayvan, görevler ve dahasının kilidini açacaksın.</string>
-  <string name="setup_welcome_title">Hoş Geldin</string>
-  <string name="avatar_setup_description">Nasıl görünmek istersin\? Dert etme, bunu daha sonra değiştirebilirsin.</string>
+    <string name="avatar_setup_description">Nasıl görünmek istersin\? Dert etme, bunu daha sonra değiştirebilirsin.</string>
   <string name="task_setup_description">Müthiş! Şimdi, bu yolculukta ne üstünde çalışmak istiyorsun\?</string>
   <string name="setup_group_work">İş</string>
   <string name="setup_group_exercise">Egzersiz</string>
@@ -233,29 +180,20 @@
   <string name="setup_task_creativity_1">Bir zanaat uzmanlığına çalış</string>
   <string name="setup_task_creativity_2">Yaratıcı bir proje üzerinde çalış</string>
   <string name="setup_task_creativity_3">Yaratıcı projeyi bitir</string>
-  <string name="gem.purchase.support">Habitica\'yı canlı tutmamız için yardımcı olmak ister misiniz? Yapımcıları elmas alarak destekleyebilirsiniz!\n\nElmaslarla hesabınız için eğlenceli ekstralar alabilirsiniz, örneğin: \n\n - Avatar\'ınız için havalı kostümler\n - Muhteşem arkaplanlar\n - Evcil hayvan yumurtaları kazanacağınız eğlenceli görevler\n - 100. seviyeden evvel sınıfınızı değiştirebileceğiniz beceriler\n\nHabitica\'yı en iyisi yapmamız için yardımcı olduğunuz için teşekkürler. Desteğiniz bize çok şey ifade ediyor!</string>
-  <string name="my_guilds">Loncalarım</string>
+    <string name="my_guilds">Loncalarım</string>
   <string name="public_guilds">Açık Loncalar</string>
   <string name="guild">Lonca</string>
   <string name="leave">Ayrıl</string>
   <string name="join">Katıl</string>
-  <string name="leader">Lider</string>
-  <string name="gems">Elmaslar</string>
-  <string name="copy_as_todo">Yapılacak İşlere kopyala</string>
-  <string name="send_pm">ÖM Gönder</string>
-  <string name="flag">Bildir</string>
-  <string name="delete">Sil</string>
+    <string name="gems">Elmaslar</string>
+    <string name="delete">Sil</string>
   <string name="name">Ad</string>
   <string name="description">Tanım</string>
   <string name="add_tag">Yeni Etiket ekle</string>
   <string name="privacy">Gizlilik</string>
   <string name="write_message">Mesaj Yaz</string>
-  <string name="post">Gönder</string>
-  <string name="guild_search_hint">Lonca ara</string>
-  <string name="todo_due">Şu zamana: %s</string>
-  <string name="daily_streak">mevcut kesintisiz seri: %d</string>
-  <string name="todo_has_duedate">İşin Bitirme Tarihi var</string>
-  <string name="battle_gear">Savaş Ekipmanı</string>
+    <string name="guild_search_hint">Lonca ara</string>
+    <string name="battle_gear">Savaş Ekipmanı</string>
   <string name="costume">Kostüm</string>
   <string name="outfit_head">Kafa</string>
   <string name="outfit_headAccessory">Kafa Aksesuarı</string>
@@ -268,10 +206,8 @@
   <string name="wear_costume">Kostümü Giy</string>
   <string name="equipped">Kuşanılmış</string>
   <string name="quest_cancel_message">Bu görevi iptal etmek istediğinizden 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_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 ya da 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="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 ya da reddettiğinde otomatik olarak başlar.</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>
@@ -288,13 +224,9 @@
   <string name="armoireEquipment">Gardırop içerisinde nadir bir Ekipman parçası buldun: : %s! Harika!</string>
   <string name="armoireFood">Gardırobun altını üstünü getirdin ve %1$s %2$s buldun. Onun burada ne işi var?</string>
   <string name="armoireExp">Gardırop ile güreştin ve Tecrübe kazandın. Al sana!</string>
-  <string name="armoireNotesFull">Gardırobu rastgele özel Ekipman, Tecrübe ve yiyecek elde etmek için açın! Kalan ekipman parçaları: %d</string>
-  <string name="armoireLastItem">Büyülü Gardırop içerisinde nadir Ekipman\'ın son parçasını da buldunuz.</string>
-  <string name="armoireNotesEmpty">Gardırop içerisinde her ayın ilk haftasında yeni bir Ekipman yer alacaktır. O zamana kadar Tecrübe ve Yiyecek için tıklamaya devam et!</string>
-  <string name="sell">Sat (%d Altın)</string>
+    <string name="sell">Sat (%d Altın)</string>
   <string name="hatch_with_potion">İksir ile üret</string>
-  <string name="feed_to_pet">Evcil hayvana besle</string>
-  <string name="hatch_egg">Yumurta ile üret</string>
+    <string name="hatch_egg">Yumurta ile üret</string>
   <string name="invite_party">Takımı davet et</string>
   <string name="dialog_feeding">%s besle:</string>
   <string name="use_animal">Kullan</string>
@@ -305,17 +237,8 @@
   <string name="close">Kapat</string>
   <string name="share">Paylaş</string>
   <string name="notification_pet_fed">%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="sectiondrop">Standart</string>
-  <string name="sectionpremium">Büyülü İksir </string>
-  <string name="sectionquest">Görev</string>
-  <string name="sectionspecial">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="notification_purchase_reward">Bir ödül satın aldın</string>
+    <string name="world_quest">Dünya Görevi</string>
   <string name="inn_description">Bir molaya mı ihtiyacın var\? Daniel\'in hanında dinlenerek Habitica\'nın bazı oyun mekaniklerini durdur:/n/n • Tamamlanmamış günlük işler sana zarar vermez/n • Görevlerin kesintisiz tamamlanma serilerini yitirmez ve renklerinde sönme olmaz/n • Canavarlar tamamlanmamış günlük işler için saldırmaz/n • Canavarlara vereceğin zarar ya da 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>
@@ -330,8 +253,7 @@
   <string name="healer_description">Şifacılar hasarlara karşı su geçirmez 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ı kaybedilen sağlıkları iyileştirirler. Takımdaki diğerlerine refakat etmekten hoşlanıyorsan veya çok çalışarak Ölümü atlatma fikri seni heyecanlandırıyorsa bir şifacı olarak oynayabilirsin!</string>
   <string name="select_class">Sınıf Seç</string>
   <string name="opt_out_class">Çekil</string>
-  <string name="opt_out_description">Sınıflarla rahatsız edilmek istemiyor musun\? Daha sonra mı seçmek istersin\? Çekilirsen - özel becerileri olmayan bir savaşçı olacaksın. Daha sonra Wiki\'de sınıf sistemi hakkında bilgi edinebilir ve istediğin zaman sınıfları etkinleştirebilirsin.</string>
-  <string name="class_confirmation">Bir %s olmak istediğine emin misin?</string>
+    <string name="class_confirmation">Bir %s olmak istediğine emin misin?</string>
   <string name="class_changed">Yeni sınıfın: %s!</string>
   <string name="class_changed_description">Ekipmanlar menüsü altında değiştirebileceğin yeni varsayılan Savaş Ekipmanın var!</string>
   <string name="choose_class">Sınıf Seç</string>
@@ -345,23 +267,18 @@
   <string name="invite_existing_users">Mevcut Kullanıcıları Davet Et</string>
   <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, burada Kullanıcı ID\'leri ile davet edebilirsin.</string>
-  <string name="invite_username_description">Habitica kullanan arkadaşların var ise, burada kullanıcı adları ile davet edebilirsin.</string>
+    <string name="invite_username_description">Habitica kullanan arkadaşların var ise, burada kullanıcı adları ile davet edebilirsin.</string>
   <string name="invite_email_description">E-postan 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>
-  <string name="email">E-posta</string>
-  <string name="invite_users">Takıma davet et</string>
-  <string name="share_using">Kullanımı paylaş</string>
+    <string name="email">E-posta</string>
+    <string name="share_using">Kullanımı paylaş</string>
   <string name="share_levelup">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %d seviye elde ettim!</string>
   <string name="share_hatched">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %1$s %2$s evcil hayvan ürettim.</string>
   <string name="share_raised">Gerçek hayatımdaki alışkanlıklarımı geliştirerek Habitica içerisinde %1$s binek kazandım.</string>
   <string name="open_in_store">Play Store\'da aç</string>
   <string name="change_class_confirmation">Sınıfınızı değiştirmek istediğinize emin misiniz? Bu işlem 3 elmasa mal olacaktır.</string>
   <string name="change_class_equipment_warning">Uyarı: Artık %s sınıfından ekipman alamayacaksınız.</string>
-  <string name="leaderMessage">%1$s tarafından mesaj</string>
-  <string name="leaderName">Lider: %1$s</string>
-  <string name="confirm">Onayla</string>
+    <string name="confirm">Onayla</string>
   <string name="market">Pazar</string>
   <string name="timeTravelers">Zaman Yolcuları</string>
   <string name="seasonalShop">Mevsimsel Dükkan</string>
@@ -369,37 +286,16 @@
   <string name="party_invite">Arkadaşlarını davet ederek kilidini aç</string>
   <string name="login_incentive">Habitica\'ya 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>
-  <string name="purchase_confirmation_title">Satın almayı onayla</string>
-  <string name="confirm_purchase_text">%2$s %3$s karşılığında %1$s satın al</string>
-  <string name="gem">elmas</string>
-  <string name="hourglass">kumsaati</string>
-  <string name="hourglasses">kumsaatleri</string>
-  <string name="gold_singular">altın</string>
-  <string name="gold_plural">altın</string>
+    <string name="successful_purchase">%1$s satın alındı</string>
+    <string name="gold_plural">altın</string>
   <string name="chat_message_copied">Mesaj Panoya kopyalandı</string>
-  <string name="copy_chat_message">Panoya kopyala</string>
-  <string name="edit_tag_title">Etiketi Düzenle</string>
-  <string name="edit_tag_btn_edit">Düzenle</string>
-  <string name="edit_tag_btn_done">Tamam</string>
-  <string name="edit_tag_btn_delete">Sil</string>
-  <string name="confirm_delete_tag_title">Emin misin?</string>
+    <string name="edit_tag_btn_edit">Düzenle</string>
+    <string name="confirm_delete_tag_title">Emin misin?</string>
   <string name="confirm_delete_tag_message">Silmek istediğine emin misin?</string>
-  <string name="filter_drawer_edit_tags">Etiketleri Düzenle</string>
-  <string name="filter_drawer_filter_tags">Etikete göre filtrele</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">Bir kişi sizi bu QR kod ile davet edebilir</string>
-  <string name="qr_save_message">QR Kodun şurada kaydedildi</string>
-  <string name="qr_dialogue_title">QR Kodun</string>
-  <string name="download">İndir</string>
-  <string name="send_new_message">Yeni mesaj gönder</string>
-  <string name="choose_recipient_title">Mesaj Alıcısını Seç</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">Mesaj Alıcısını Seç</string>
   <string name="action_continue">Devam Et</string>
-  <string name="scan_qr_code">QR Kodunu Tara</string>
-  <string name="enter_recipient_uuid">Alıcının Kullanıcı ID\'sini gir</string>
-  <string name="invited_to_party">Bir takıma katılmak için davet edildin!</string>
+    <string name="invited_to_party">Bir takıma katılmak için davet edildin!</string>
   <string name="stats_widget_label">Habitica İstatistikleri</string>
   <string name="add_task">İş Ekle</string>
   <string name="add_habit">Alışkanlık Ekle</string>
@@ -410,15 +306,14 @@
   <string name="widget_habit_button">Habitica Alışkanlığı Yap</string>
   <string name="widget_dailies">Habitica Günlük İşler</string>
   <string name="widget_todo_list">Habitica Yapılacak İşler Listesi</string>
-  <string name="widget_add_task">Habitica İş Ekle</string>
-  <string name="google_services_missing">Google play services bulunamadı.</string>
-  <string name="gem.purchase.toolbartitle">Satın al</string>
-  <string name="gem.purchase.title">Elmas satın almak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
-  <string name="gem.purchase.subtitle">Elmaslar hesabın için eğlenceli ekstralar satın almanı sağlar, dahil olmak üzere:</string>
-  <string name="gem.purchase.listitem1">Avatarın için havalı kostümler</string>
-  <string name="gem.purchase.listitem2">Muhteşem arka planlar</string>
-  <string name="gem.purchase.listitem3">Sizi evcil hayvan yumurtası ile ödüllendiren görevler</string>
-  <string name="gem.purchase.listitem4">100. seviyeden önce sınıf değiştirme imkânı</string>
+    <string name="google_services_missing">Google play services bulunamadı.</string>
+  <string name="gem.purchase_toolbartitle">Satın al</string>
+  <string name="gem.purchase_title">Elmas satın almak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
+  <string name="gem.purchase_subtitle">Elmaslar hesabın için eğlenceli ekstralar satın almanı sağlar, dahil olmak üzere:</string>
+  <string name="gem.purchase_listitem1">Avatarın için havalı kostümler</string>
+  <string name="gem.purchase_listitem2">Muhteşem arka planlar</string>
+  <string name="gem.purchase_listitem3">Sizi evcil hayvan yumurtası ile ödüllendiren görevler</string>
+  <string name="gem.purchase_listitem4">100. seviyeden önce sınıf değiştirme imkânı</string>
   <string name="support_habitica">Habitica\'ya Destek Ol</string>
   <string name="skill_transformation_use">kullan</string>
   <string name="hatching_market_info">İş tamamlarken doğru eşyalar düşmedi mi? Pazara bir göz at!</string>
@@ -432,36 +327,36 @@
   <string name="belongs_to_challenge">Bir Mücadeleye ait</string>
   <string name="has_reminder">Hatırlatıcı Mevcut</string>
   <string name="has_tag">Etiket Mevcut</string>
-  <string name="subscribe.title">Abone olmak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
+  <string name="subscribe_title">Abone olmak geliştiricilere destek verir ve Habitica\'nın çalışmaya devam etmesine yardım eder</string>
   <string name="subscribe_prompt">Abone ol ve bu faydalardan yararlan:</string>
-  <string name="subscribe.listitem1">Altınla elmas satın al</string>
-  <string name="subscribe.listitem2">Özel aylık ekipman</string>
-  <string name="subscribe.listitem3">Fazladan geçmiş kaydını sakla</string>
-  <string name="subscribe.listitem4">Günlük ganimet limiti ikiye katlanır</string>
+  <string name="subscribe_listitem1">Altınla elmas satın al</string>
+  <string name="subscribe_listitem2">Özel aylık ekipman</string>
+  <string name="subscribe_listitem3">Fazladan geçmiş kaydını sakla</string>
+  <string name="subscribe_listitem4">Günlük ganimet limiti ikiye katlanır</string>
   <string name="subscriptions">Abonelikler</string>
   <string name="subscription_duration">Her %s tekrar eder</string>
   <string name="subscribe">Abone Ol</string>
-  <string name="subscribe.listitem1.description">Tüccar İskender artık sana tanesi 20 altına elmas satacak!
+  <string name="subscribe.listitem1_description">Tüccar İskender artık sana tanesi 20 altına elmas satacak!
 \n
 \nAylık sevkiyatı başlangıçta aylık 25 Elmas ile sınırlıdır, ama ardışık abonelik süresine göre artabilir.
 \n
 \nElmas limiti her üç aylık ardışık abonelik için 5 artar, toplam üst limit olan aylık 50 Elmasa kadar artabilir!</string>
-  <string name="subscribe.listitem2.description">Her ay avatarın için özel görsel bir eşya alırsın!
+  <string name="subscribe.listitem2_description">Her ay avatarın için özel görsel bir eşya alırsın!
 \n
 \nAyrıca, her üç aylık ardışık abonelik için, Gizemli Zaman Yolcuları sana tarihi (ve fütüristik!) görsel eşyalara erişim sağlar.</string>
-  <string name="subscribe.listitem3.description">Tamamlanmış Yapılacak İş ve İş geçmişlerine daha uzun süre erişim sağlar.</string>
-  <string name="subscribe.listitem4.description">İki katı ganimet limiti tamamladığın işlerinden her gün daha fazla eşya almana ve ahırını daha hızlı tamamlamana yardımcı olur!</string>
-  <string name="subscribe1month.gemcap">25 Elmas limiti</string>
-  <string name="subscribe3month.gemcap">30 Elmas limiti</string>
-  <string name="subscribe6month.gemcap">35 Elmas limiti</string>
-  <string name="subscribe12month.gemcap">45 Elmas limiti</string>
+  <string name="subscribe.listitem3_description">Tamamlanmış Yapılacak İş ve İş geçmişlerine daha uzun süre erişim sağlar.</string>
+  <string name="subscribe.listitem4_description">İki katı ganimet limiti tamamladığın işlerinden her gün daha fazla eşya almana ve ahırını daha hızlı tamamlamana yardımcı olur!</string>
+  <string name="subscribe1month_gemcap">25 Elmas limiti</string>
+  <string name="subscribe3month_gemcap">30 Elmas limiti</string>
+  <string name="subscribe6month_gemcap">35 Elmas limiti</string>
+  <string name="subscribe12month_gemcap">45 Elmas limiti</string>
   <string name="subscription_hourglasses">+%d Mistik Kum Saati</string>
   <string name="payment_method">Ödeme şekli</string>
   <string name="subscription">Abonelik</string>
   <string name="active">Etkin</string>
   <string name="cancel_subscription">Aboneliği İptal Et</string>
-  <string name="cancel_subscription_google.description">Artık abone olmak istemiyor musun? Google Play Store\'un \"Uygulamalarım\" bölümünde aboneliği iptal etme seçeneğini bulabilirsin.</string>
-  <string name="cancel_subscription_notgoogle.description">Artık abone olmak istemiyor musun? Ödeme yönteminden dolayı, yalnızca web sitesi üzerinden aboneliğini iptal edebilirsin. Siteyi tarayıcında açmak için aşağıdaki düğmeyi tıkla!</string>
+  <string name="cancel_subscription_google_description">Artık abone olmak istemiyor musun? Google Play Store\'un \"Uygulamalarım\" bölümünde aboneliği iptal etme seçeneğini bulabilirsin.</string>
+  <string name="cancel_subscription_notgoogle_description">Artık abone olmak istemiyor musun? Ödeme yönteminden dolayı, yalnızca web sitesi üzerinden aboneliğini iptal edebilirsin. Siteyi tarayıcında açmak için aşağıdaki düğmeyi tıkla!</string>
   <string name="visit_habitica_website">Habitica Websitesini Ziyaret Et</string>
   <string name="current_bonuses">Şu An Sağlanan Faydalar</string>
   <string name="months_subscribed">Abone olunan aylar</string>
@@ -476,56 +371,40 @@
   <string name="twelve_months">12 aylık</string>
   <string name="subscribe_prompt_thanks">Abone Olarak bu faydalardan yararlanıyorsun:</string>
   <string name="subscription_status">Abonelik Durumu</string>
-  <string name="byLeader">%s \'a/e göre</string>
-  <string name="challenge_details">Mücadele Detayları</string>
-  <string name="challenge_leave_title">Mücadeleden Ayrıl</string>
+    <string name="challenge_leave_title">Mücadeleden Ayrıl</string>
   <string name="challenge_leave_text">\"%s\" Mücadelesinden ayrılmak istediğine emin misin\?</string>
   <string name="challenge_remove_tasks_title">İşleri sil</string>
   <string name="challenge_remove_tasks_text">İşleri silmek istiyor musun\?</string>
   <string name="remove_tasks">Sil</string>
   <string name="keep_tasks">Tut</string>
   <string name="my_challenges">Benim Mücadelelerim</string>
-  <string name="public_challenges">Herkese Açık</string>
-  <string name="challenges">Mücadeleler</string>
-  <string name="daily">Günlük İş</string>
+    <string name="daily">Günlük İş</string>
   <string name="habit">Alışkanlık</string>
   <string name="reward">Ödül</string>
   <string name="todo">Yapılacak İş</string>
   <string name="official">Resmi</string>
-  <string name="participating">Katılan</string>
-  <string name="challenge">Mücadele</string>
-  <string name="go_to_challenge">Mücadeleye Git</string>
-  <string name="not_part_of_a_challenge">Henüz herhangi bir Mücadele katılımcısı değilsin!</string>
+    <string name="challenge">Mücadele</string>
+    <string name="not_part_of_a_challenge">Henüz herhangi bir Mücadele katılımcısı değilsin!</string>
   <string name="join_a_challenge">Listene seçili işler eklemek için bir Mücadeleye katıl, sonra da başarılar ve hatta elmaslar kazanmak için diğer Habiticalılarla yarış!</string>
   <string name="check_the_public_challenge_tab">\"Herkese Açık\" sekmesine dokunarak kullanıcılar tarafından yaratılmış Mücadelelerden sana en uygun olanını bul!</string>
-  <string name="add_reminder">Hatırlatıcı Ekle</string>
-  <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ği olan 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">Mesajların</string>
-  <string name="FAQ">Sıkça Sorulan Sorular</string>
-  <string name="special">Özel</string>
+    <string name="inbox">Mesajların</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>
-  <string name="limited_count">%d kaldı</string>
-  <string name="gem_shop">Elmas</string>
+    <string name="gem_shop">Elmas</string>
   <string name="mystery_item">Gizemli Eşya</string>
   <string name="myster_item_notes">Her ay, aboneler gizemli bir eşya alırlar. Bu genelde ayın son haftasından önce açıklanır.</string>
   <string name="open">Aç</string>
-  <string name="notification_mystery_item">Kutuyu açtın ve %s buldun!</string>
-  <string name="checkInRewardEarned">Kendini hayatını geliştirmeye adadığın için ödül olarak %1$s kazandın.</string>
+    <string name="checkInRewardEarned">Kendini hayatını geliştirmeye adadığın için ödül olarak %1$s kazandın.</string>
   <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Bir sonraki ödülün %1$d Girişten sonra açılacak</string>
   <string name="pending_approval">onay bekleniyor</string>
   <string name="filters">Filtreler</string>
   <string name="done">Tamam</string>
-  <string name="group_tasks_edit_description">Grup işleri düzenlenemez.</string>
-  <string name="group_tasks_edit_title">Bu iş düzenlenemez</string>
-  <string name="groups">Gruplar</string>
+    <string name="groups">Gruplar</string>
   <string name="all">Hepsi</string>
   <string name="none">Hiçbiri</string>
   <string name="owned">Sahip olunan</string>
   <string name="not_owned">Sahip olunmayan</string>
-  <string name="new_game">Yeni\nOyun</string>
-  <string name="login_btn_fb">Facebook ile giriş yap</string>
+    <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\'daki rehberin olacağım.
@@ -559,7 +438,6 @@
   <string name="reload_content">İçeriği Yenile</string>
   <string name="dailyDueDefaultView">"Günlük İşleri varsayılan olarak  ‘Aktif’ sekmesine ata"</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$s her %2$s%3$s%4$s tekrarlanır</string>
   <string name="no_billing_gems">Cihazında hiçbir desteklenen ödeme yöntemi yok. Elmas satın almak istersen lütfen habitica web sitesini kullan.</string>
   <string name="no_billing_subscriptions">Cihazında hiçbir desteklenen ödeme yöntemi yok. Abonelik satın almak istersen lütfen habitica web sitesini kullan.</string>
   <string name="save">Kaydet</string>
@@ -567,8 +445,7 @@
   <string name="gem_reward">Elmas Ödülü</string>
   <string name="tasks">İşler</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 1 elmasa ihtiyacın var.</string>
+    <string name="challenge_create_error_tavern_one_gem">Herkese açık bir mücadele yaratmak için en az 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>
@@ -578,42 +455,36 @@
   <string name="new_challenge_title">Yeni mücadele başlığı</string>
   <string name="ownership">Sahiplik</string>
   <string name="inn">Han</string>
-  <string name="system">Sistem</string>
-  <string name="start_quest">Yeni bir Göreve başla</string>
+    <string name="start_quest">Yeni bir Göreve başla</string>
   <string name="leave_party">Takımdan Ayrıl</string>
   <string name="party_description">Takım Tanımı</string>
-  <string name="abort_confirmation">Bu görevi iptal etmek istediğine emin misin?  Tüm davet kabulleri ve ilerleme kaybolacak. Görev sahibi görev parşömenini geri alacaktır.</string>
-  <string name="leave_quest_confirmation">Etkin görevden ayrılmak istediğinden emin misin? Tüm görev ilerlemen kaybolacak.</string>
-  <string name="number_participants">%1$d Katılımcı</string>
+    <string name="number_participants">%1$d Katılımcı</string>
   <string name="welcome_back">Tekrar Hoş Geldin</string>
   <string name="yesterdaililes_prompt">Dün hiç bu Günlük İşlerden yaptın mı\?</string>
   <string name="start_day">Günüme Başla</string>
   <string name="leave_party_confirmation">Takımdan ayrılmak istediğinden emin misin?</string>
-  <string name="nextPrizeUnlocksIn" formatted="false">Bir sonraki ödülün %d Girişten sonra</string>
-  <string name="pending">Beklemede</string>
+    <string name="pending">Beklemede</string>
   <string name="accepted">Kabul edildi</string>
   <string name="declined">Reddedildi</string>
   <string name="participants">Katılımcılar</string>
   <string name="invitations">Davetiyeler</string>
-  <string name="quest_leader_header" formatted="false">%s tarafından başlatıldı</string>
+  <string name="quest_leader_header">%s tarafından başlatıldı</string>
   <string name="quest_abort_message">Bu görevi iptal etmek istediğine emin misin?  Tüm davet kabulleri ve ilerleme kaybolacak. Görev parşömenini görev sahibine geri verilecektir.</string>
-  <string name="loading">Yükleniyor…</string>
-  <string name="reloading_content">İçerik Yeniden Yükleniyor</string>
+    <string name="reloading_content">İçerik Yeniden Yükleniyor</string>
   <string name="thousand_abbrev">bin</string>
   <string name="million_abbrev">milyon</string>
   <string name="billion_abbrev">milyar</string>
-  <string name="your_balance">Bakiye:</string>
-  <string name="available_until" formatted="false">%s tarihine kadar mevcut</string>
-  <string name="gems_left_max" formatted="false">Aylık Elmaslar: %1$d/%2$d Kalmış</string>
-  <string name="gems_left_nomax" formatted="false">Aylık Elmaslar: %d Kalmış</string>
+    <string name="available_until">%s tarihine kadar mevcut</string>
+  <string name="gems_left_max">Aylık Elmaslar: %1$d/%2$d Kalmış</string>
+  <string name="gems_left_nomax">Aylık Elmaslar: %d Kalmış</string>
   <string name="health">Sağlık</string>
   <string name="collect">Topla</string>
   <string name="rage_meter">Öfke Sayacı</string>
   <string name="boss_quest">Canavar Görevi</string>
   <string name="collection_quest">Toplama Görevi</string>
-  <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-  <string name="experience_reward" formatted="false">%d Tecrübe Puanı</string>
-  <string name="gold_reward" formatted="false">%d Altın</string>
+  <string name="quest_reward_count">%1$s x%2$d</string>
+  <string name="experience_reward">%d Tecrübe Puanı</string>
+  <string name="gold_reward">%d Altı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>
@@ -626,8 +497,7 @@
   <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>
-  <string name="nevermind">Boşver</string>
-  <string name="resetting_account">Hesap Sıfırlanıyor</string>
+    <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şılayabilmek için daha fazla iş yapmalısın!</string>
   <string name="insufficientGems">Bu eşyayı almak için daha çok elmasa ihtiyacın var!</string>
@@ -635,7 +505,7 @@
   <string name="insufficientHourglasses">Bu eşyayı almak için daha çok Mistik Kum Saatine ihtiyacın var!</string>
   <string name="get_hourglasses">Kum Saatleri al</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  aç, geçmişten .... ve gelecekten!"</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  aç, geçmişten ..._ ve 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">Yakında yine gel!</string>
@@ -660,8 +530,7 @@
   <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_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>
@@ -682,7 +551,7 @@
   <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="points_to_allocate">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>
@@ -692,9 +561,7 @@
   <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 veya işlerine biraz ara vermek için bir sandalye çek.</string>
+    <string name="tavern_description">Hana hoş geldin! Sohbet etmek veya işlerine biraz ara vermek için bir sandalye çek.</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>
@@ -708,19 +575,13 @@
   <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="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="rage_strike_count">Öfke Saldırıları: %d/%d</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="strike_active_title">%s Saldırıya uğradı!</string>
+    <string name="strike_active_description">Ç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>
@@ -730,29 +591,21 @@
   <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="join_party_title">Bir takıma katılmak ister misin?</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="world_boss_description_title">Dünya Canavarı nedir?</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="world_boss_action_prompt">Özel ödüller kazanmak ve Habitica\'yı %s gazabından kurtarmak için Canavarı yen!</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="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>
@@ -786,17 +639,15 @@
   <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="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="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="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>
diff --git a/Habitica/res/values-w360dp/styles.xml b/Habitica/res/values-w360dp/styles.xml
index e19efefad..a6b3daec9 100644
--- a/Habitica/res/values-w360dp/styles.xml
+++ b/Habitica/res/values-w360dp/styles.xml
@@ -1,6 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AlertDialogContainer">
-        <item name="android:layout_width">300dp</item>
-    </style>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values-zh-rTW/strings.profile.xml b/Habitica/res/values-zh-rTW/strings.profile.xml
index 06d7b1ce1..44c987903 100644
--- a/Habitica/res/values-zh-rTW/strings.profile.xml
+++ b/Habitica/res/values-zh-rTW/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <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 1a6076af6..6c660541b 100644
--- a/Habitica/res/values-zh-rTW/strings.sidebar.xml
+++ b/Habitica/res/values-zh-rTW/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">任務</string>
-  <string name="sidebar.skills">技能</string>
-  <string name="sidebar.section.social">社交</string>
-  <string name="sidebar.inbox">訊息</string>
-  <string name="sidebar.tavern">酒館</string>
-  <string name="sidebar.party">隊伍</string>
-  <string name="sidebar.purchaseGems">購買寶石</string>
-  <string name="sidebar.guilds">公會</string>
-  <string name="sidebar.challenges">挑戰</string>
-  <string name="sidebar.section.inventory">物品欄</string>
-  <string name="sidebar.avatar">頭像</string>
-  <string name="sidebar.equipment">裝備</string>
-  <string name="sidebar.stable">馬廄</string>
-  <string name="sidebar.news">消息</string>
-  <string name="sidebar.settings">設定</string>
-  <string name="sidebar.about">關於</string>
+  <string name="sidebar_tasks">任務</string>
+  <string name="sidebar_skills">技能</string>
+  <string name="sidebar.section_social">社交</string>
+  <string name="sidebar_inbox">訊息</string>
+  <string name="sidebar_tavern">酒館</string>
+  <string name="sidebar_party">隊伍</string>
+  <string name="sidebar_purchaseGems">購買寶石</string>
+  <string name="sidebar_guilds">公會</string>
+  <string name="sidebar_challenges">挑戰</string>
+  <string name="sidebar.section_inventory">物品欄</string>
+  <string name="sidebar_avatar">頭像</string>
+  <string name="sidebar_equipment">裝備</string>
+  <string name="sidebar_stable">馬廄</string>
+  <string name="sidebar_news">消息</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 9abd9bd60..9c6dfc61c 100644
--- a/Habitica/res/values-zh-rTW/strings.tutorial.xml
+++ b/Habitica/res/values-zh-rTW/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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_skills">技能是有強大作用的特殊能力！點擊技能使用。使用技能需要消耗魔法值(藍色條)，魔力可由每日打卡和完成現實任務來獲得。更多信息請查詢FAQ！</string>
   <string name="tutorial_party">在這裡，你和你的朋友可以互相激勵完成目標並通過完成任務組團打BOSS！</string>
   <string name="tutorial_tavern">歡迎來到酒館，這裡是一個公開的不分年齡的聊天室！這裡，可以聊聊心得，問問問題。祝您玩的愉快！</string>
-  <string name="tutorial_classes">選擇成為戰士、法師、醫者或者盜賊！每個職業有獨特的裝備和技能。點擊(?)查看更多！</string>
-  <string name="tutorial_stats">按灰色的按鈕可以把所有的能力點用於一次升級某項能力，或是按箭頭以批次分配能力點。</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 564c754b5..7e03a9a29 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">經驗值</string>
   <string name="HP_default">生命值</string>
   <string name="MP_default">魔法值</string>
-  <string name="ERR_pb_barcode">無法從條碼上讀取數據</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">設定</string>
-  <string name="SP_address_hint">你的自訂伺服器</string>
-  <string name="SP_userID_title">使用者 ID (UUID)</string>
+    <string name="SP_userID_title">使用者 ID (UUID)</string>
   <string name="SP_userID_summary">你的使用者 ID (UUID)</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">你的 API Token</string>
   <string name="Language_title">語言</string>
   <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="PS_contact_title">聯絡我</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_reminder_header">每日任務提醒</string>
   <string name="pref_reminder_checkbox">啟用提醒</string>
   <string name="pref_reminder_picker">設置提醒時間</string>
   <string name="pref_cds_header">自定開始時間</string>
-  <string name="pref_cds_picker">設置自定開始時間</string>
-  <string name="pref_push_notifications_checkbox">開啟推送通知</string>
+    <string name="pref_push_notifications_checkbox">開啟推送通知</string>
   <string name="push_notifications">推送通知</string>
   <string name="push_notifications_sum">設定你的推送通知設置</string>
   <string name="preference_push_you_won_challenge">你贏得了一個挑戰！</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">你的副本開始了</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>
+    <string name="action_edit">編輯</string>
+    <string name="action_cancel">取消</string>
   <string name="login_btn">登入</string>
   <string name="register_btn">註冊</string>
   <string name="username">用戶名</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">確認密碼</string>
   <string name="logout">登出</string>
   <string name="logout_description">從你的帳號登出</string>
-  <string name="account_details">帳號訊息</string>
-  <string name="LoginActivityName">歡迎</string>
-  <string name="string_revive">重生</string>
-  <string name="please_connect">請在使用 widget 之前連接應用程式</string>
-  <string name="about.title">關於</string>
-  <string name="about.libraries">資源庫</string>
-  <string name="about.versionhistory">版本歷史</string>
-  <string name="about.habitica_open_source">Habitica 是一個發佈在 Github 上的開源軟體</string>
-  <string name="about.rate_our_app">評價我們的應用程式</string>
-  <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="LoginActivityName">歡迎</string>
+    <string name="about_title">關於</string>
+  <string name="about_libraries">資源庫</string>
+    <string name="about_habitica_open_source">Habitica 是一個發佈在 Github 上的開源軟體</string>
+  <string name="about_rate_our_app">評價我們的應用程式</string>
+  <string name="about_give_us_feedback">請給我們提交建議！</string>
+  <string name="about_bugreport">回報問題與漏洞</string>
+  <string name="about_source_code">原始程式碼</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">與伺服器連線故障，請稍後再試。</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_title">驗證錯誤</string>
   <string name="login_validation_error_fieldsmissing">請填寫所有內容。</string>
   <string name="save_changes">儲存</string>
   <string name="copy">複製</string>
   <string name="notes">注釋</string>
-  <string name="text">文字</string>
-  <string name="difficulty">難度</string>
+    <string name="difficulty">難度</string>
   <string name="tags">標籤</string>
   <string name="trivial">瑣事</string>
   <string name="easy">簡單</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">負面的 ( - )</string>
   <string name="checklist">檢核表</string>
   <string name="reminders">提醒</string>
-  <string name="actions">動作</string>
-  <string name="attributes">屬性</string>
-  <string name="physical">力量</string>
-  <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="attributes">屬性</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>
@@ -120,23 +89,14 @@
   <string name="faint_header">你的生命值已經見底！</string>
   <string name="faint_button">補滿生命值並再重試</string>
   <string name="filter">篩選</string>
-  <string name="profile_image">頭像</string>
-  <string name="mana_price_button">%d MP</string>
-  <string name="used_skill">你在 %1$s 用了 %2$d 魔法值。</string>
-  <string name="used_skill_without_mana">你使用了 %1$s。</string>
+    <string name="used_skill_without_mana">你使用了 %1$s。</string>
   <string name="new_checklist_item">新增清單內容</string>
-  <string name="add_checklist_item">添加</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="unlock_lvl_11">11 級時解鎖</string>
-  <string name="no_party_message">你沒有加入任何隊伍。如想加入隊伍，請訪問網頁版。</string>
-  <string name="forgot_pw_btn">忘記密碼</string>
-  <string name="tavern.inn.checkOut">重啟每日任務</string>
-  <string name="tavern.inn.rest">暫停每日任務</string>
-  <string name="reward.dialog.buy">購買</string>
-  <string name="reward.dialog.dismiss">取消</string>
+    <string name="unlock_lvl_11">11 級時解鎖</string>
+    <string name="forgot_pw_btn">忘記密碼</string>
+  <string name="tavern.inn_checkOut">重啟每日任務</string>
+  <string name="tavern.inn_rest">暫停每日任務</string>
+  <string name="reward.dialog_buy">購買</string>
+  <string name="reward.dialog_dismiss">取消</string>
   <string name="party">隊伍</string>
   <string name="chat">聊天</string>
   <string name="members">成員</string>
@@ -144,24 +104,20 @@
   <string name="dailies">每日任務</string>
   <string name="todos">待辦事項</string>
   <string name="rewards">獎勵</string>
-  <string name="taskform.delete.title">你確定嗎？</string>
-  <string name="taskform.delete.message">你確定要刪除嗎？</string>
-  <string name="yes">是的</string>
+    <string name="yes">是的</string>
   <string name="no">不</string>
   <string name="quest">副本</string>
   <string name="avatar_body">身體</string>
   <string name="avatar_hair">頭髮</string>
   <string name="avatar_shirt">上衣</string>
   <string name="avatar_skin">膚色</string>
-  <string name="avatar_ears">獸耳裝飾</string>
-  <string name="avatar_base">基礎</string>
+    <string name="avatar_base">基礎</string>
   <string name="avatar_color">顏色</string>
   <string name="avatar_beard">鬍子</string>
   <string name="avatar_mustache">八字鬍</string>
   <string name="avatar_flower">花</string>
   <string name="avatar_bangs">瀏海</string>
-  <string name="avatar_nothing">沒有設置</string>
-  <string name="avatar_size">尺寸</string>
+    <string name="avatar_size">尺寸</string>
   <string name="avatar_size_slim">瘦小</string>
   <string name="avatar_size_broad">強壯</string>
   <string name="avatar_background">背景</string>
@@ -170,23 +126,17 @@
   <string name="purchase_button">購買</string>
   <string name="purchase_set_title">購買禮包 %s</string>
   <string name="due_date">截止日期</string>
-  <string name="quest.accept">接受</string>
-  <string name="quest.reject">拒絕</string>
-  <string name="quest.begin">開始執行副本</string>
-  <string name="quest.cancel">取消邀請</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>
-  <string name="quest.participants">參與者</string>
-  <string name="version_info">版本 %1$s (%2$d)</string>
+  <string name="quest_accept">接受</string>
+  <string name="quest_reject">拒絕</string>
+  <string name="quest_begin">開始執行副本</string>
+  <string name="quest_cancel">取消邀請</string>
+  <string name="quest_abort">放棄副本</string>
+    <string name="version_info">版本 %1$s (%2$d)</string>
   <string name="sidebar_help">幫助 &amp; 常見問題</string>
   <string name="complete_tutorial">瞭解！</string>
   <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_1_description">和 %s 玩家一起用遊戲戰勝拖延症！你可以創建一個帳戶，用它來追蹤你生活中的點滴瑣事。</string>
   <string name="intro_2_subtitle">遊戲進度</string>
   <string name="intro_2_title">生活進度</string>
   <string name="intro_2_description">通過完成現實生活中的任務來解鎖遊戲內容。得到裝備、寵物和更多的獎勵來促使你完成目標。</string>
@@ -194,12 +144,9 @@
   <string name="intro_3_title">與小夥伴一起，並肩擊退怪獸</string>
   <string name="intro_3_description">和朋友們一起為目標努力吧。在生活和戰鬥中互相支持，共同進步！</string>
   <string name="intro_finish_button">開始吧！</string>
-  <string name="previous_button">上一頁</string>
-  <string name="next_button">下一頁</string>
+    <string name="next_button">下一頁</string>
   <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="avatar_setup_description">那麼，你想擁有如何的外觀？不用太過顧慮，之後仍然能夠更改。</string>
   <string name="task_setup_description">太棒了！現在開始設定你的任務，開始賺取經驗和金幣吧。
 
 首先，你想改善生活中的哪一部分呢？</string>
@@ -231,38 +178,20 @@
   <string name="setup_task_creativity_1">學習以成為藝術能手</string>
   <string name="setup_task_creativity_2">進行創新項目</string>
   <string name="setup_task_creativity_3">完成創新項目</string>
-  <string name="gem.purchase.support">想要幫助我們維持 Habitica？透過購買寶石來支持開發團隊吧！
-\n
-\n寶石能用來購買額外的樂趣，包括：
-\n
-\n - 角色的酷酷服裝
-\n - 好看的背景
-\n - 能獲得寵物蛋的有趣副本
-\n - 100 級之前改變職業的能力
-\n
-\n非常感謝您幫助我們使 Habitica 變的更好。您的支持非常重要！</string>
-  <string name="my_guilds">我的工會</string>
+    <string name="my_guilds">我的工會</string>
   <string name="public_guilds">公共公會</string>
   <string name="guild">公會</string>
   <string name="leave">離開</string>
   <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="gems">寶石</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>
-  <string name="guild_search_hint">搜尋公會</string>
-  <string name="todo_due">到期：%s</string>
-  <string name="daily_streak">目前連擊數：%d</string>
-  <string name="todo_has_duedate">任務有截止日</string>
-  <string name="battle_gear">戰鬥裝備</string>
+    <string name="guild_search_hint">搜尋公會</string>
+    <string name="battle_gear">戰鬥裝備</string>
   <string name="costume">服裝</string>
   <string name="outfit_head">頭部</string>
   <string name="outfit_headAccessory">頭飾</string>
@@ -275,10 +204,8 @@
   <string name="wear_costume">穿上裝扮</string>
   <string name="equipped">裝備</string>
   <string name="quest_cancel_message">你確定要取消副本？所有邀請將會消失，副本擁有者會收到退還的副本卷軸。</string>
-  <string name="quest.invitation">副本邀請</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="quest_begin_message">當所有玩家加入或拒絕邀請時，副本會自動開始。你的 %2$d 位隊伍成員中只有 %1$d 位加入副本！你是否確定要直接開始這個副本？一旦開始，其他隊伍成員就不能加入這個副本。</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>
@@ -295,13 +222,9 @@
   <string name="armoireEquipment">你在神秘寶箱裡找到稀有物品：%s！真是太棒了！</string>
   <string name="armoireFood">你在神秘寶箱裡找到了%1$s %2$s。它是用來做什麼的？</string>
   <string name="armoireExp">你奮力打開神秘寶箱而且獲得經驗值！</string>
-  <string name="armoireNotesFull">打開神秘寶箱會隨機獲得特殊裝備、經驗、或是食物！數量剩下：%d 份</string>
-  <string name="armoireLastItem">你在神秘寶箱裡找到了最後一件稀有裝備。</string>
-  <string name="armoireNotesEmpty">神秘寶箱會在每個月的第一個星期更新，在那之前時常簽到以獲得經驗值與食物！</string>
-  <string name="sell">出售 (%d 金幣)</string>
+    <string name="sell">出售 (%d 金幣)</string>
   <string name="hatch_with_potion">用藥水孵化</string>
-  <string name="feed_to_pet">餵食寵物</string>
-  <string name="hatch_egg">孵化寵物蛋</string>
+    <string name="hatch_egg">孵化寵物蛋</string>
   <string name="invite_party">隊伍邀請</string>
   <string name="dialog_feeding">餵養%s用：</string>
   <string name="use_animal">用</string>
@@ -312,17 +235,8 @@
   <string name="close">關閉</string>
   <string name="share">分享</string>
   <string name="notification_pet_fed">你餵食了你的%s！</string>
-  <string name="notification_purchase">你購買了%s</string>
-  <string name="notification_purchase_reward">你購買了一個獎勵</string>
-  <string name="sectiondrop">基本寵物</string>
-  <string name="sectionpremium">神奇藥水寵物</string>
-  <string name="sectionquest">劇情任務寵物</string>
-  <string name="sectionspecial">稀有寵物</string>
-  <string name="sectionmounts">基本坐騎</string>
-  <string name="sectionpremiumMounts">神奇藥水坐騎</string>
-  <string name="sectionquestMounts">副本坐騎</string>
-  <string name="sectionspecialMounts">稀有坐騎</string>
-  <string name="world_quest">世界副本</string>
+    <string name="notification_purchase_reward">你購買了一個獎勵</string>
+    <string name="world_quest">世界副本</string>
   <string name="inn_description">需要休息一會兒？在 Daniel 的酒館客棧登記住宿將暫停一些 Habitica 中比較艱難的遊戲機制：
 \n
 \n • 未完成的每日任務不會對你造成傷害
@@ -341,8 +255,7 @@
   <string name="healer_description">補師對於突如其來的傷害擁有強大的抵抗能力，同時還能保護夥伴。未完成的每日任務和壞習慣都不是補師的對手。而且他們總是有辦法從失敗中恢復生命。如果您熱衷於輔助其他隊友或是享受從死神手中奪回生命的快感，就來加入補師的行列吧！</string>
   <string name="select_class">選擇職業</string>
   <string name="opt_out_class">退出</string>
-  <string name="opt_out_description">不知道該選甚麼職業？想晚點再決定嗎？可以暫時不選擇 - 您將暫時成為沒有任何特殊技能的戰士。您隨時可到 wiki 頁面了解職業系統，並在 玩家圖示 &gt; 設定 中啟用職業。</string>
-  <string name="class_confirmation">你確定想要成為%1$s嗎？</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>
@@ -356,22 +269,17 @@
   <string name="invite_existing_users">邀請現有玩家</string>
   <string name="send">送出</string>
   <string name="invite">邀請朋友</string>
-  <string name="invite_id_description">如果你的朋友們已經在使用 Habitica 了，透過用戶 ID 邀請他們。</string>
-  <string name="invite_email_description">如果您的朋友透過電子郵件加入 Habitica，他們將會自動被邀請加入您的隊伍!</string>
+    <string name="invite_email_description">如果您的朋友透過電子郵件加入 Habitica，他們將會自動被邀請加入您的隊伍!</string>
   <string name="add_invites">添加邀請</string>
-  <string name="user_id">使用者 ID (UUID)</string>
-  <string name="email">Email</string>
-  <string name="invite_users">邀請至隊伍</string>
-  <string name="share_using">分享使用</string>
+    <string name="email">Email</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！</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="confirm">確認</string>
   <string name="market">市場</string>
   <string name="timeTravelers">時光旅行者</string>
   <string name="seasonalShop">季節限定商店</string>
@@ -379,37 +287,16 @@
   <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>
-  <string name="purchase_confirmation_title">確認購買</string>
-  <string name="confirm_purchase_text">"用了%2$s %3$s購買%1$s "</string>
-  <string name="gem">寶石</string>
-  <string name="hourglass">沙漏</string>
-  <string name="hourglasses">沙漏</string>
-  <string name="gold_singular">金幣</string>
-  <string name="gold_plural">金幣</string>
+    <string name="successful_purchase">成功購入%1$s</string>
+    <string name="gold_plural">金幣</string>
   <string name="chat_message_copied">訊息已複製到剪貼板</string>
-  <string name="copy_chat_message">複製到剪貼簿</string>
-  <string name="edit_tag_title">編輯標籤</string>
-  <string name="edit_tag_btn_edit">編輯</string>
-  <string name="edit_tag_btn_done">完成</string>
-  <string name="edit_tag_btn_delete">刪除</string>
-  <string name="confirm_delete_tag_title">你確定嗎？</string>
+    <string name="edit_tag_btn_edit">編輯</string>
+    <string name="confirm_delete_tag_title">你確定嗎？</string>
   <string name="confirm_delete_tag_message">你確定要刪除嗎？</string>
-  <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>
-  <string name="send_new_message">發送新訊息</string>
-  <string name="choose_recipient_title">選擇訊息收件人</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">選擇訊息收件人</string>
   <string name="action_continue">繼續</string>
-  <string name="scan_qr_code">掃描 QR 碼</string>
-  <string name="enter_recipient_uuid">請輸入收件人 ID</string>
-  <string name="invited_to_party">你被邀請參加隊伍！</string>
+    <string name="invited_to_party">你被邀請參加隊伍！</string>
   <string name="stats_widget_label">Habitica 狀態</string>
   <string name="add_task">添加任務</string>
   <string name="add_habit">添加習慣</string>
@@ -420,15 +307,14 @@
   <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="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>
@@ -442,24 +328,24 @@
   <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_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="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">商人 Alexander 可以按每個寶石 20 金幣的價格向你出售寶石！
+  <string name="subscribe.listitem1_description">商人 Alexander 可以按每個寶石 20 金幣的價格向你出售寶石！
 \n
 \n他每個月的初始進貨量是 25 個寶石，進貨量會隨著您的捐助額度增長！
 \n
 \n 每三個月寶石上限就會增加 5，直到最多 1 個月 50 顆寶石！</string>
-  <string name="subscribe.listitem2.description">每個月你將會收到一件獨特的角色飾品！
+  <string name="subscribe.listitem2_description">每個月你將會收到一件獨特的角色飾品！
 \n
 \n另外每連續訂閱三個月，神秘的時間旅行者將授予你得到過去(和未來)飾品的資格。</string>
-  <string name="subscribe.listitem3.description">使完成的待辦事項和任務的歷史記錄保留更長時間。</string>
+  <string name="subscribe.listitem3_description">使完成的待辦事項和任務的歷史記錄保留更長時間。</string>
   <string name="subscribe.listitem4.description">雙倍掉落讓你每天能夠從完成的任務中得到更多的物品，幫助你更快地馴服坐騎！</string>
   <string name="subscription_hourglasses">%d 個神秘沙漏</string>
   <string name="payment_method">付款方式</string>
@@ -482,56 +368,40 @@
   <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_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>
-  <string name="daily">每日任務</string>
+    <string name="daily">每日任務</string>
   <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="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="inbox">訊息</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="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="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="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_fb">透過 Facebook 帳號登入</string>
   <string name="login_btn_google">透過 Google 帳號登入</string>
   <string name="action_back">返回</string>
   <string name="randomize">隨機</string>
@@ -562,7 +432,6 @@
   <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>
@@ -570,8 +439,7 @@
   <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_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>
@@ -581,41 +449,36 @@
   <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="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="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="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_leader_header">由%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="available_until">可供購買直到%s</string>
+  <string name="gems_left_max">每月寶石：剩下 %1$d/%2$d</string>
+  <string name="gems_left_nomax">每月寶石：剩下 %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_reward_count">%1$sx%2$d</string>
+  <string name="experience_reward">%d 經驗值</string>
+  <string name="gold_reward">%d 金幣</string>
   <string name="quest_owner_rewards">副本擁有者獎勵</string>
   <string name="str_abbrv">力量</string>
   <string name="per_abbrv">感知</string>
@@ -630,8 +493,7 @@
   <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="resetting_account">重置帳號</string>
   <string name="deleting_account">刪除帳號</string>
   <string name="insufficientGold">你需要完成更多任務才足以負擔這件物品！</string>
   <string name="insufficientGems">你需要更多寶石來購買這件物品！</string>
@@ -664,8 +526,7 @@
   <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="change">變更</string>
   <string name="character_level">角色等級</string>
   <string name="auto_allocate_points">自動分配點數</string>
   <string name="stat_guide">屬性概要</string>
@@ -685,7 +546,7 @@
   <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="points_to_allocate">%d 屬性點可以分配</string>
   <string name="distribute_evenly_help">平均分配屬性點至所有屬性。</string>
   <string name="distribute_class_help">分配較多的屬性點至對您的職業較重要的屬性。</string>
   <string name="distribute_task_help">依據您完成的任務所關聯的特質分配屬性點。</string>
@@ -695,9 +556,7 @@
   <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="tavern_description">歡迎來到酒館小棧！拉張椅子坐下聊天，或者暫停任務休息一下。</string>
   <string name="check_into_inn">入住客棧</string>
   <string name="community_guidelines">社群規範</string>
   <string name="view_community_guidelines">查看社群規範</string>
@@ -711,20 +570,13 @@
   <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="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="rage_strike_count">暴走攻擊：%d/%d</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="strike_active_title">%s被攻擊了！</string>
+    <string name="strike_active_description">我們心愛的%s在%s攻擊%s時被徹底摧毀了！快點！完成你的任務來打敗怪物，幫忙重建！</string>
   <string name="questShop">副本商店</string>
   <string name="market_owner_long">商人 Alex</string>
   <string name="tavern_owner_long">酒館老闆 Daniel</string>
@@ -734,30 +586,19 @@
   <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 是一個全體玩家一同參與的特殊活動，大家每天同心協力完成任務來打敗強力的怪物！
-\n完成任務即可對 boss 造成傷害
-\n你沒完成任務時，boss 不會攻擊你，但是暴走值會提升，當暴走值達到上限時，將會隨機攻擊一個店主！
-\n你可以同時挑戰一般的副本 boss，傷害會同時灌注在兩者身上
-\n點擊酒館來確認世界 boss 的攻略進度和暴走攻擊</string>
-  <string name="world_boss_description_intro">世界 boss 是一個全體玩家一同參與的特殊活動，大家每天同心協力完成任務來打敗強力的怪物！</string>
+    <string name="insufficientSubscriberGems">你已經將這個月可購買的寶石全數掃空，每個月的前三天將會有更多寶石可供購買！謝謝你的熱情訂閱！</string>
+    <string name="world_boss_description_title">什麼是世界 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 不會因為您未完成的任務而對您產生傷害，但是將會增加他的怒氣值。一旦怒氣值全滿，boss 將會隨機攻擊一位 Habitica 的商人！</string>
   <string name="world_boss_description_3">您可以持續對付一般的副本 boss，傷害會同時灌注在兩者身上</string>
   <string name="world_boss_description_4">請到酒館查看最新的 boss 進度和怒氣值</string>
-  <string name="world_boss_action_prompt" formatted="false">想要獲得特殊獎勵，從%s的魔爪中拯救 Habitica 嗎？那就來打敗 boss 吧！</string>
-  <string name="world_boss_description_subtitle">%s攻擊了！</string>
-  <string name="questShop_owner_long">副本嚮導 Ian</string>
+  <string name="world_boss_action_prompt">想要獲得特殊獎勵，從%s的魔爪中拯救 Habitica 嗎？那就來打敗 boss 吧！</string>
+    <string name="questShop_owner_long">副本嚮導 Ian</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="reply">回覆</string>
   <string name="challenge_prize">挑戰獎品</string>
   <string name="challenge_categories">挑戰類別</string>
   <string name="created_challenge">創建挑戰</string>
@@ -768,7 +609,6 @@
   <string name="moderator">管理員</string>
 <string name="levelup_header">你升到第 %1$d 級！</string>
     <string name="levelup_detail">透過完成你在現實生活中的目標，你現在已經升級並完全治癒了！</string>
-    <string name="loading">讀取中…</string>
     <string name="faint_penalty_body">你降了一級，丟失了所有的金幣和一件裝備。不過繼續努力，你就可以把他們都拿回來！加油，你會更棒的。</string>
     <string name="reminder_title">記得完成你的任務</string>
     <string name="warrior_description">戰士將有較大的機率能觸發「會心一擊」，並在完成任務時可隨機獲得額外的金幣、經驗和掉落率。同時他們還能對 boss 施加巨大的傷害。如果您希望像樂透一樣獲得不可預期的獎勵，或是想在 boss 副本中重創 boss，就來加入戰士的行列吧！</string>
@@ -786,7 +626,6 @@
     <string name="delete_oauth_account_description">您確定嗎？這將會永久刪除您的帳號，並且再也無法恢復！如果您希望再次使用 Habitica，就需要再註冊一個全新的帳號。舊帳號內儲存的和已花費的鑽石也將無法被退還。如果您非常確定要刪除帳號，請在下面的文字欄中輸入您的密碼。</string>
     <string name="change_username">修改使用者名稱</string>
     <string name="join_party_description">把下方的用戶名給一個隊伍成員，這樣他們就能邀請你加入了</string>
-    <string name="join_party_description_id">把你的 UserID 給他們，或者讓他們掃你的 QR 碼來邀請你</string>
     <string name="tavern_description_world_boss">噢我親愛的老夥計，不用擔心下面的怪物，這裏仍然是一個安全的避風港，來聊聊天吧。</string>
     <string name="same_day_reminder_title">你添加任務了嗎？</string>
     <string name="same_day_reminder_text">你增加得越多，獎勵就會越多。溪流終將匯聚成大海。</string>
@@ -814,7 +653,6 @@
     <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>
@@ -822,7 +660,6 @@
     <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>
diff --git a/Habitica/res/values-zh/strings.profile.xml b/Habitica/res/values-zh/strings.profile.xml
index 9bd19f400..374b5f69a 100644
--- a/Habitica/res/values-zh/strings.profile.xml
+++ b/Habitica/res/values-zh/strings.profile.xml
@@ -9,10 +9,7 @@
     <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>
-    <string name="profile_achievement_ok">了解了</string>
-    <string name="profile_qrcode_close">关闭</string>
 
 </resources>
diff --git a/Habitica/res/values-zh/strings.sidebar.xml b/Habitica/res/values-zh/strings.sidebar.xml
index 8b38b397e..a846e8b6e 100644
--- a/Habitica/res/values-zh/strings.sidebar.xml
+++ b/Habitica/res/values-zh/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="sidebar.tasks">任务</string>
-  <string name="sidebar.skills">技能</string>
-  <string name="sidebar.section.social">社交</string>
-  <string name="sidebar.inbox">讯息</string>
-  <string name="sidebar.tavern">酒馆</string>
-  <string name="sidebar.party">队伍</string>
-  <string name="sidebar.purchaseGems">宝石&amp;开通会员</string>
-  <string name="sidebar.guilds">公会</string>
-  <string name="sidebar.challenges">挑战</string>
-  <string name="sidebar.section.inventory">物品栏</string>
-  <string name="sidebar.avatar">角色形象</string>
-  <string name="sidebar.equipment">装备</string>
-  <string name="sidebar.stable">马厩</string>
-  <string name="sidebar.news">新闻</string>
-  <string name="sidebar.settings">设置</string>
-  <string name="sidebar.about">关于</string>
+  <string name="sidebar_tasks">任务</string>
+  <string name="sidebar_skills">技能</string>
+  <string name="sidebar.section_social">社交</string>
+  <string name="sidebar_inbox">讯息</string>
+  <string name="sidebar_tavern">酒馆</string>
+  <string name="sidebar_party">队伍</string>
+  <string name="sidebar_purchaseGems">宝石&amp;开通会员</string>
+  <string name="sidebar_guilds">公会</string>
+  <string name="sidebar_challenges">挑战</string>
+  <string name="sidebar.section_inventory">物品栏</string>
+  <string name="sidebar_avatar">角色形象</string>
+  <string name="sidebar_equipment">装备</string>
+  <string name="sidebar_stable">马厩</string>
+  <string name="sidebar_news">新闻</string>
+    <string name="sidebar_about">关于</string>
   <string name="sidebar_shops">商店</string>
   <string name="sidebar_stats">统计</string>
 </resources>
diff --git a/Habitica/res/values-zh/strings.tutorial.xml b/Habitica/res/values-zh/strings.tutorial.xml
index 9f44b490b..3c902da87 100644
--- a/Habitica/res/values-zh/strings.tutorial.xml
+++ b/Habitica/res/values-zh/strings.tutorial.xml
@@ -12,12 +12,8 @@
   <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_skills">技能是有强大作用的特殊能力！点击技能来释放它。使用技能需要消耗魔法值(蓝色条)，魔力可由每日签到和完成现实任务来获得。更多信息请查询FAQ！</string>
   <string name="tutorial_party">在这里，你和你的朋友可以互相督促完成目标并通过完成任务组团打小怪兽！</string>
   <string name="tutorial_tavern">欢迎来到酒馆，这里是一个公开的不分年龄的聊天室！这里，可以聊聊心得，问问问题。祝您玩的愉快！</string>
-  <string name="tutorial_classes">选择成为战士、法师、医者或者盗贼！每个职业有独特的装备和技能。点击(?)查看更多！</string>
-  <string name="tutorial_stats">按灰色按钮来一次分配你的属性，或者按箭头一次加一点。</string>
+    <string name="tutorial_stats">按灰色按钮来一次分配你的属性，或者按箭头一次加一点。</string>
 </resources>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 5f48fb730..25da83646 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -4,28 +4,23 @@
   <string name="XP_default">经验值</string>
   <string name="HP_default">生命值</string>
   <string name="MP_default">魔法值</string>
-  <string name="ERR_pb_barcode">无法从条码上读取数据</string>
-  <!--Prefs-->
+    <!--Prefs-->
   <string name="PS_settings_title">设置</string>
-  <string name="SP_address_hint">你的自定义服务器</string>
-  <string name="SP_userID_title">用户ID</string>
+    <string name="SP_userID_title">用户ID</string>
   <string name="SP_userID_summary">你的用户ID</string>
   <string name="SP_APIToken_title">API令牌</string>
   <string name="SP_APIToken_summary">你的API令牌</string>
   <string name="Language_title">语言</string>
   <string name="Language_summary">更改 Habitica的语言</string>
-  <string name="SP_user_qr_code">你的二维码</string>
-  <string name="PS_contact_title">联系我</string>
-  <string name="unknown_error">发生错误……</string>
-  <string name="pref_account_header">账号</string>
+    <string name="PS_contact_title">联系我</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_reminder_header">每日任务提醒</string>
   <string name="pref_reminder_checkbox">激活提醒</string>
   <string name="pref_reminder_picker">设置提醒时间</string>
   <string name="pref_cds_header">自定义每日起始时间</string>
-  <string name="pref_cds_picker">设置每天的起始时间（用于任务结算）</string>
-  <string name="pref_push_notifications_checkbox">用户推送通知</string>
+    <string name="pref_push_notifications_checkbox">用户推送通知</string>
   <string name="push_notifications">推送通知</string>
   <string name="push_notifications_sum">设置用户推送通知</string>
   <string name="preference_push_you_won_challenge">你赢得了一项挑战！</string>
@@ -37,14 +32,8 @@
   <string name="preference_push_your_quest_has_begun">你的冒险开始了</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>
+    <string name="action_edit">编辑</string>
+    <string name="action_cancel">取消</string>
   <string name="login_btn">登陆</string>
   <string name="register_btn">注册</string>
   <string name="username">用户名</string>
@@ -54,32 +43,23 @@
   <string name="confirmpassword">确认密码</string>
   <string name="logout">注销</string>
   <string name="logout_description">从你的账号登出</string>
-  <string name="account_details">账号信息</string>
-  <string name="LoginActivityName">欢迎</string>
-  <string name="string_revive">重生</string>
-  <string name="please_connect">在使用桌面部件前请先连接对应的应用</string>
-  <string name="about.title">关于</string>
-  <string name="about.libraries">资源库</string>
-  <string name="about.versionhistory">版本历史</string>
-  <string name="about.habitica_open_source">Habitica是一个发布在Github上的开源软件</string>
-  <string name="about.rate_our_app">评价我们的应用</string>
-  <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="LoginActivityName">欢迎</string>
+    <string name="about_title">关于</string>
+  <string name="about_libraries">资源库</string>
+    <string name="about_habitica_open_source">Habitica是一个发布在Github上的开源软件</string>
+  <string name="about_rate_our_app">评价我们的应用</string>
+  <string name="about_give_us_feedback">请给我们提交建议！</string>
+  <string name="about_bugreport">反馈漏洞</string>
+  <string name="about_source_code">源代码</string>
+    <!--Network Errors-->
+    <string name="internal_error_api">与服务器通信故障，请稍后再试。</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_title">认可错误</string>
   <string name="login_validation_error_fieldsmissing">请填写所有内容。</string>
   <string name="save_changes">保存</string>
   <string name="copy">复制</string>
   <string name="notes">注释</string>
-  <string name="text">文字</string>
-  <string name="difficulty">难度</string>
+    <string name="difficulty">难度</string>
   <string name="tags">标签</string>
   <string name="trivial">琐事</string>
   <string name="easy">简单</string>
@@ -90,19 +70,8 @@
   <string name="negative_habit_form">负面的(-)</string>
   <string name="checklist">清单</string>
   <string name="reminders">提醒</string>
-  <string name="actions">动作</string>
-  <string name="attributes">属性</string>
-  <string name="physical">力量</string>
-  <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="attributes">属性</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>
@@ -123,24 +92,15 @@
   <string name="faint_header">你失去了所有的生命值！</string>
   <string name="faint_button">补满生命值 &amp; 再次尝试</string>
   <string name="filter">筛选</string>
-  <string name="profile_image">头像</string>
-  <string name="mana_price_button">%d 魔法值</string>
-  <string name="used_skill">你在 %1$s 用了 %2$d 魔法值。</string>
-  <string name="used_skill_without_mana">你使用了 %1$s.</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="skill_progress_title">使用技能</string>
-  <string name="coming_soon">即将推出</string>
-  <string name="chat_flag_confirmation">你确认要举报这条消息吗？</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>
-  <string name="tavern.inn.checkOut">重启每日任务</string>
-  <string name="tavern.inn.rest">暂停每日任务</string>
-  <string name="reward.dialog.buy">购买</string>
-  <string name="reward.dialog.dismiss">解散</string>
+    <string name="reminder_title">记得完成你的任务</string>
+    <string name="unlock_lvl_11">11级时解锁</string>
+    <string name="forgot_pw_btn">忘记密码</string>
+  <string name="tavern.inn_checkOut">重启每日任务</string>
+  <string name="tavern.inn_rest">暂停每日任务</string>
+  <string name="reward.dialog_buy">购买</string>
+  <string name="reward.dialog_dismiss">解散</string>
   <string name="party">队伍</string>
   <string name="chat">聊天</string>
   <string name="members">成员</string>
@@ -148,24 +108,20 @@
   <string name="dailies">每日任务</string>
   <string name="todos">待办事项</string>
   <string name="rewards">奖励</string>
-  <string name="taskform.delete.title">你确定吗？</string>
-  <string name="taskform.delete.message">你确定要删除吗？</string>
-  <string name="yes">是的</string>
+    <string name="yes">是的</string>
   <string name="no">不</string>
   <string name="quest">任务</string>
   <string name="avatar_body">身体</string>
   <string name="avatar_hair">头发</string>
   <string name="avatar_shirt">上衣</string>
   <string name="avatar_skin">皮肤</string>
-  <string name="avatar_ears">兽耳装饰</string>
-  <string name="avatar_base">基础</string>
+    <string name="avatar_base">基础</string>
   <string name="avatar_color">颜色</string>
   <string name="avatar_beard">胡子</string>
   <string name="avatar_mustache">八字胡</string>
   <string name="avatar_flower">花</string>
   <string name="avatar_bangs">刘海</string>
-  <string name="avatar_nothing">没有设置</string>
-  <string name="avatar_size">尺寸</string>
+    <string name="avatar_size">尺寸</string>
   <string name="avatar_size_slim">瘦小</string>
   <string name="avatar_size_broad">强壮</string>
   <string name="avatar_background">背景</string>
@@ -174,23 +130,17 @@
   <string name="purchase_button">支付</string>
   <string name="purchase_set_title">购买礼包 %s</string>
   <string name="due_date">截止日期</string>
-  <string name="quest.accept">接受</string>
-  <string name="quest.reject">拒绝</string>
-  <string name="quest.begin">开始探索任务</string>
-  <string name="quest.cancel">取消邀请</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>
-  <string name="quest.participants">参与者</string>
-  <string name="version_info">版本%1$s (%2$d)</string>
+  <string name="quest_accept">接受</string>
+  <string name="quest_reject">拒绝</string>
+  <string name="quest_begin">开始探索任务</string>
+  <string name="quest_cancel">取消邀请</string>
+  <string name="quest_abort">放弃探索任务</string>
+    <string name="version_info">版本%1$s (%2$d)</string>
   <string name="sidebar_help">帮助 &amp; FAQ</string>
   <string name="complete_tutorial">成功！</string>
   <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_1_description">和 %s 玩家一起，用游戏战胜拖延症！你可以创建一个账户，用它来跟踪你生活中的点滴琐事。</string>
   <string name="intro_2_subtitle">游戏进度</string>
   <string name="intro_2_title">生活进度</string>
   <string name="intro_2_description">通过完成现实生活中的任务来解锁游戏内容。得到装备、宠物和更多的奖励来促使你完成你的目标吧。</string>
@@ -198,12 +148,9 @@
   <string name="intro_3_title">交些朋友</string>
   <string name="intro_3_description">和朋友们一起为目标努力吧。在生活和战斗中互相支持，共同进步！</string>
   <string name="intro_finish_button">让我们开始吧！</string>
-  <string name="previous_button">上一页</string>
-  <string name="next_button">下一页</string>
+    <string name="next_button">下一页</string>
   <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="avatar_setup_description">首先，你需要创建一个角色。之后可以随时更改。</string>
   <string name="task_setup_description">太棒了！现在开始设定你的任务，开始赚取经验和金币吧。
 
 首先，你想改善生活中的哪一部分呢？</string>
@@ -235,38 +182,20 @@
   <string name="setup_task_creativity_1">学习以成为艺术能手</string>
   <string name="setup_task_creativity_2">进行创新项目</string>
   <string name="setup_task_creativity_3">完成创新项目</string>
-  <string name="gem.purchase.support">想要帮助我们维持Habitica？通过买宝石的方式来支持开发者吧！
-\n
-\n你可以通过宝石给你的账户购买更多有趣的额外物品，包括：
-\n
-\n - 角色的酷酷的服装
-\n - 好看的背景
-\n - 能获得宠物蛋的有趣的任务
-\n - 100级之前改变职业的能力
-\n
-\n非常感谢您帮助我们使Habitica变的更好。您的支持非常重要！</string>
-  <string name="my_guilds">我的公会</string>
+    <string name="my_guilds">我的公会</string>
   <string name="public_guilds">公共公会</string>
   <string name="guild">公会</string>
   <string name="leave">离开</string>
   <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="gems">宝石</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>
-  <string name="guild_search_hint">查找公会</string>
-  <string name="todo_due">到期：%s</string>
-  <string name="daily_streak">目前连击数：%d</string>
-  <string name="todo_has_duedate">任务有截止日</string>
-  <string name="battle_gear">战斗装备</string>
+    <string name="guild_search_hint">查找公会</string>
+    <string name="battle_gear">战斗装备</string>
   <string name="costume">服装</string>
   <string name="outfit_head">头部</string>
   <string name="outfit_headAccessory">头部配件</string>
@@ -279,10 +208,8 @@
   <string name="wear_costume">穿上装扮</string>
   <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="quest_begin_message">当所有玩家加入或拒绝邀请时，任务会自动开始。只有%1$d你的%2$d团队成员加入了这个任务！你是否确定要直接开始这个探索任务？一旦开始，其他队伍成员就不能加入这个探索任务。</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>
@@ -299,13 +226,9 @@
   <string name="armoireEquipment">你在魔法衣橱里找到了一件稀有装备：%s！恭喜你！</string>
   <string name="armoireFood">你在魔法衣橱里找到了%1$s %2$s。它是用来做什么的？</string>
   <string name="armoireExp">你和大衣柜展开了殊死搏斗，并赢得了经验，尝尝这个吧！</string>
-  <string name="armoireNotesFull">拉开 魔法衣橱 来获得随机的特殊装备，经验或者食物！剩余的装备：%d</string>
-  <string name="armoireLastItem">你在魔法衣橱里找到了最后一件稀有装备。</string>
-  <string name="armoireNotesEmpty">每个月的第一个星期这里都会有新的装备，到时记得常点进来获得经验和食物！</string>
-  <string name="sell">出售 (%d金币)</string>
+    <string name="sell">出售 (%d金币)</string>
   <string name="hatch_with_potion">用孵化药水孵化</string>
-  <string name="feed_to_pet">喂养宠物</string>
-  <string name="hatch_egg">孵化宠物蛋</string>
+    <string name="hatch_egg">孵化宠物蛋</string>
   <string name="invite_party">邀请队伍</string>
   <string name="dialog_feeding">喂养%s用：</string>
   <string name="use_animal">使用</string>
@@ -316,17 +239,8 @@
   <string name="close">关闭</string>
   <string name="share">分享</string>
   <string name="notification_pet_fed">你喂食了你的%s！</string>
-  <string name="notification_purchase">你购买了%s</string>
-  <string name="notification_purchase_reward">你购买了一个奖励</string>
-  <string name="sectiondrop">基本宠物</string>
-  <string name="sectionpremium">神奇药水宠物</string>
-  <string name="sectionquest">剧情任务宠物</string>
-  <string name="sectionspecial">稀有宠物</string>
-  <string name="sectionmounts">基本坐骑</string>
-  <string name="sectionpremiumMounts">神奇药水坐骑</string>
-  <string name="sectionquestMounts">剧情任务坐骑</string>
-  <string name="sectionspecialMounts">稀有坐骑</string>
-  <string name="world_quest">世界任务</string>
+    <string name="notification_purchase_reward">你购买了一个奖励</string>
+    <string name="world_quest">世界任务</string>
   <string name="inn_description">需要休息？进入Daniel的客栈并暂停Habitica的一些困难机制吧。
 \n
 \n • 未完成的每日任务不会造成伤害
@@ -345,8 +259,7 @@
   <string name="healer_description">医师们对伤害的抗性很强，也可以保护其他的人。错过的日常任务和坏习惯无法伤害他们太多，而且他们有很多回血的技能。如果你热衷于辅助其他的队友，或者是享受那种从死神手里夺取生命的快感，那就成为一名医师吧！</string>
   <string name="select_class">选择职业</string>
   <string name="opt_out_class">退出</string>
-  <string name="opt_out_description">不知道选什么职业？想以后再选？没问题 - 你现在可以先做一个没有特殊技能的战士。我们的维基页面上有关于职业系统的介绍，之后随时可以定你的职业。</string>
-  <string name="class_confirmation">你确定想要成为%s吗？</string>
+    <string name="class_confirmation">你确定想要成为%s吗？</string>
   <string name="class_changed">你现在是 %s级了！</string>
   <string name="class_changed_description">你有新的默认战斗装备，你可以在装备栏换上它们！</string>
   <string name="choose_class">选择职业</string>
@@ -360,23 +273,18 @@
   <string name="invite_existing_users">邀请已存在的用户</string>
   <string name="send">发送</string>
   <string name="invite">邀请朋友</string>
-  <string name="invite_id_description">如果你的朋友们已经在使用Habitica 了，通过&lt;用户ID邀请他们 。</string>
-  <string name="invite_username_description">如果你已有朋友在使用Habitica，通过这里的用户名邀请他们。</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>
-  <string name="email">电子邮件</string>
-  <string name="invite_users">邀请加入队伍</string>
-  <string name="share_using">分享使用</string>
+    <string name="email">电子邮件</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！</string>
   <string name="open_in_store">在应用商店中打开</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="confirm">确认</string>
   <string name="market">市场</string>
   <string name="timeTravelers">时光旅行</string>
   <string name="seasonalShop">四季商店</string>
@@ -384,37 +292,16 @@
   <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>
-  <string name="hourglass">沙漏</string>
-  <string name="hourglasses">沙漏</string>
-  <string name="gold_singular">金币</string>
-  <string name="gold_plural">金币</string>
+    <string name="successful_purchase">购买%1$s</string>
+    <string name="gold_plural">金币</string>
   <string name="chat_message_copied">复制到剪帖板的信息</string>
-  <string name="copy_chat_message">复制到剪贴板</string>
-  <string name="edit_tag_title">编辑按钮</string>
-  <string name="edit_tag_btn_edit">编辑</string>
-  <string name="edit_tag_btn_done">完成</string>
-  <string name="edit_tag_btn_delete">删除</string>
-  <string name="confirm_delete_tag_title">你确定吗？</string>
+    <string name="edit_tag_btn_edit">编辑</string>
+    <string name="confirm_delete_tag_title">你确定吗？</string>
   <string name="confirm_delete_tag_message">你确定要删除吗？</string>
-  <string name="filter_drawer_edit_tags">编辑按钮</string>
-  <string name="filter_drawer_filter_tags">过滤按钮</string>
-  <!--QR Strings-->
-  <string name="qr_section_title">让别人通过此二维码邀请你</string>
-  <string name="qr_save_message">将二维码保存至</string>
-  <string name="qr_dialogue_title">你的二维码</string>
-  <string name="download">下载</string>
-  <string name="send_new_message">发送新消息</string>
-  <string name="choose_recipient_title">选择消息接收者</string>
+    <!--QR Strings-->
+    <string name="choose_recipient_title">选择消息接收者</string>
   <string name="action_continue">继续</string>
-  <string name="scan_qr_code">扫描二维码</string>
-  <string name="enter_recipient_uuid">输入接受者的用户ID</string>
-  <string name="invited_to_party">你被邀请加入一个队伍！</string>
+    <string name="invited_to_party">你被邀请加入一个队伍！</string>
   <string name="stats_widget_label">Habitica状态</string>
   <string name="add_task">添加任务</string>
   <string name="add_habit">添加习惯</string>
@@ -425,15 +312,14 @@
   <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="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>
@@ -447,34 +333,34 @@
   <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_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="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">商人Alexander可以按每个宝石20金币的价格向你出售宝石！
+  <string name="subscribe.listitem1_description">商人Alexander可以按每个宝石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="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应用商店里的“我的应用程序”部分找到退订选项。</string>
-  <string name="cancel_subscription_notgoogle.description">不想再继续捐助了？由于您的付款方式，您只能通过这个网站停止捐助。点击下面的按钮，在您的浏览器中打开站点！</string>
+  <string name="cancel_subscription_google_description">不想再继续捐助了？你可以在Google应用商店里的“我的应用程序”部分找到退订选项。</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>
@@ -489,57 +375,40 @@
   <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_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>
-  <string name="daily">每日任务</string>
+    <string name="daily">每日任务</string>
   <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="challenge">挑战</string>
+    <string name="not_part_of_a_challenge">你还没有加入任何挑战呢！</string>
   <string name="join_a_challenge">加入一个挑战会将它的任务加入你的任务列表，然后去完成任务战胜其他habitican赢得成就甚至钻石吧！</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="inbox">消息</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="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="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="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_fb">Facebook登录</string>
   <string name="login_btn_google">Google登录</string>
   <string name="action_back">背部</string>
   <string name="welcome_text">哦，你一定是新来的。我是Justin，你在Habitica的向导。
@@ -572,7 +441,6 @@
   <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>
@@ -580,8 +448,7 @@
   <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_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>
@@ -591,37 +458,31 @@
   <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="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="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="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_leader_header">由%s发起</string>
   <string name="quest_abort_message">你是否确定要放弃这个任务吗?如果你放弃，团队中所有人也将被终止任务，并且所有的任务进展都会丢失。而探索任务卷轴将重新返回给探索任务拥有者。</string>
-  <string name="loading">加载中…</string>
-  <string name="reloading_content">重新加载内容</string>
-  <string name="your_balance">你的余额：</string>
-  <string name="available_until" formatted="false">到%s可用</string>
-  <string name="gems_left_nomax" formatted="false">每月宝石：还剩%d 颗</string>
+    <string name="reloading_content">重新加载内容</string>
+    <string name="available_until">到%s可用</string>
+  <string name="gems_left_nomax">每月宝石：还剩%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="experience_reward">%d经验值</string>
+  <string name="gold_reward">%d金币</string>
   <string name="quest_owner_rewards">探索任务拥有者奖励</string>
   <string name="str_abbrv">力量</string>
   <string name="per_abbrv">感知</string>
@@ -635,8 +496,7 @@
   <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="resetting_account">重置账号</string>
   <string name="deleting_account">删除账号</string>
   <string name="insufficientGold">你还需要完成更多任务才能购买这个物品！</string>
   <string name="insufficientGems">你需要更多的宝石来购买这个物品！</string>
@@ -667,8 +527,7 @@
   <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_username">修改用户名</string>
   <string name="change">确定修改</string>
   <string name="character_level">角色等级</string>
   <string name="auto_allocate_points">自动分配点数</string>
@@ -689,7 +548,7 @@
   <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="points_to_allocate">%d点可以分配</string>
   <string name="distribute_evenly_help">给每项属性分配等量的属性点。</string>
   <string name="distribute_class_help">把更多属性点分配给你的职业最需要的属性。</string>
   <string name="allocating_points">分配属性点</string>
@@ -698,8 +557,7 @@
   <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="tavern_description">欢迎来到客栈！ 拉张凳子坐下聊天，或者暂停任务休息一下。</string>
+    <string name="tavern_description">欢迎来到客栈！ 拉张凳子坐下聊天，或者暂停任务休息一下。</string>
   <string name="check_into_inn">入住客栈</string>
   <string name="community_guidelines">社区守则</string>
   <string name="view_community_guidelines">查看社区守则</string>
@@ -712,13 +570,11 @@
   <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="boss_art">boss图像</string>
   <string name="world_boss_description">世界boss简介</string>
-  <string name="rage_strike_count" formatted="false">暴走：%d/%d</string>
+  <string name="rage_strike_count">暴走：%d/%d</string>
   <string name="strike_description_title">什么是暴击？</string>
-  <string name="strike_description_subtitle">Boss可以有3次暴走</string>
-  <string name="strike_active_title" formatted="false">%s被攻击了！</string>
+    <string name="strike_active_title">%s被攻击了！</string>
   <string name="questShop">用户商店</string>
   <string name="market_owner_long">商人Alex</string>
   <string name="tavern_owner_long">客栈老板Daniel</string>
@@ -727,17 +583,12 @@
   <string name="active_world_boss">活跃的世界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="chat_message">聊天信息</string>
-  <string name="world_boss_description_title">世界boss是什么？</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="report">报告</string>
-  <string name="like">赞</string>
-  <string name="reply">回复</string>
+    <string name="reply">回复</string>
   <string name="challenge_prize">挑战奖品</string>
   <string name="created_challenge">新建挑战</string>
   <string name="public_challenge">公开挑战</string>
@@ -753,36 +604,23 @@
     <string name="thousand_abbrev">千</string>
     <string name="million_abbrev">百万</string>
     <string name="billion_abbrev">十亿</string>
-    <string name="gems_left_max" formatted="false">每月宝石：剩余 %1$d/%2$d</string>
-    <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
+    <string name="gems_left_max">每月宝石：剩余 %1$d/%2$d</string>
+    <string name="quest_reward_count">%1$s x%2$d</string>
     <string name="delete_oauth_account_description">你确定吗？这个操作会永久删除你的账户，无法恢复！你需要重新注册才能再使用Habitica。剩余或者已经消费的宝石都无法退款，如果你已经下定决心，点击下方的删除按钮。</string>
     <string name="forgot_password_confirmation">如果我们的记录里有你的电子邮件地址，重设密码的邮件已经发过去啦。</string>
     <string name="ok">好的</string>
     <string name="distribute_task_help">根据你已完成任务的关联属性：力量，智力，体质和感知来分配点数。</string>
-    <string name="toogle_emojis">切换Emoji</string>
     <string name="staff_moderators">工作人员和管理员</string>
-    <string name="pending_strike_description">攻击尚未发生！
-\n世界Boss会在暴走值满值时攻击一个商人。持续完成每日任务来避免此事发生！</string>
     <string name="pending_strike_title">即将造成的攻击</string>
-    <string name="strike_description_description">如果有玩家忘了做每日任务，这个进度条就会前进，如果进度条达到上限，DysHeartener就会释放惊天动地级别的心碎攻击，还会随机攻击Habitica的一个店主，所以别忘了完成你的任务！</string>
-    <string name="pending_strike_subtitle">攻击还未发生！</string>
-    <string name="strike_active_subtitle" formatted="false">%s 心碎了！</string>
-    <string name="strike_active_description" formatted="false">我们心爱的 %s 在 %s 攻击 %s 时被彻底破坏了，快抓紧时间完成你的任务来打败怪物，帮助我们重建！</string>
+    <string name="strike_active_description">我们心爱的 %s 在 %s 攻击 %s 时被彻底破坏了，快抓紧时间完成你的任务来打败怪物，帮助我们重建！</string>
     <string name="no_party_description">和朋友一同完成任务或者独自出击。和怪物战斗，创建挑战，能力越大，责任越大。</string>
     <string name="join_party_description">把下方的用户名给一个队伍成员，这样他们就能邀请你加入了</string>
-    <string name="join_party_description_id">把你的UserID给他们，或者让他们扫你的QR码来邀请你</string>
     <string name="insufficientSubscriberGems">你已经买空了这个月所有的宝石限额！每月可购买的宝石将于当月前三天内上架，感谢你开通会员！</string>
-    <string name="world_boss_description_description">世界级Boss是全体玩家一同攻略的特别活动，团结一致，用任务来打倒这个强力Boss！
-\n完成任务就可以对Boss造成伤害
-\n如果你没有完成任务，Boss不会攻击你，但是会累计怒气值，一旦怒气值达到上限，Boss就会随机攻击一个NPC店主！
-\n你可以同时挑战一般的副本Boss，伤害对两者同时有效
-\n在酒馆可以看到Boss攻略进度和Boss的怒气攻击</string>
     <string name="world_boss_description_intro">世界Boss是一個全体玩家一同参与的特殊活动，大家一起团结一致通过完成任务来打败这个强力的怪物！</string>
     <string name="world_boss_description_2">Boss不会因为你没完成任务而攻击你，但是会积累怒气值，如果怒气值蓄满，Boss会随机攻击一个店主！</string>
     <string name="world_boss_description_3">你可以同时挑战普通任务的Boss们，伤害对两者都有效</string>
     <string name="world_boss_description_4">在酒馆可以看到Boss攻略进度和怒气伤害</string>
-    <string name="world_boss_action_prompt" formatted="false">打败Boss就能获得特殊奖励！快来从%s的手里拯救Habitica吧！</string>
-    <string name="world_boss_description_subtitle">%s 发动了攻击！</string>
+    <string name="world_boss_action_prompt">打败Boss就能获得特殊奖励！快来从%s的手里拯救Habitica吧！</string>
     <string name="seasonalShop_owner_long">季节女巫</string>
     <string name="tavern_description_world_boss">噢我亲爱的老伙计，不用担心下面的怪物，这里仍然是一个安全的避风港，来聊聊天吧。</string>
     <string name="challenge_categories">挑战类型</string>
@@ -810,16 +648,14 @@
     <string name="total_checkins">总签到数</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="usernamePromptWiki">如果你想了解更多关于变动的信息， <a href="https://habitica.wikia_com/wiki/Player_Names">访问我们的百科</a></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="welcomeNameTitle">我们应该怎么称呼你呢？</string>
diff --git a/Habitica/res/values/bools.xml b/Habitica/res/values/bools.xml
index dad6c5eeb..a6b3daec9 100644
--- a/Habitica/res/values/bools.xml
+++ b/Habitica/res/values/bools.xml
@@ -1,4 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="is_portrait_mode">true</bool>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.classes.xml b/Habitica/res/values/colors.classes.xml
index fa89e2749..a6b3daec9 100644
--- a/Habitica/res/values/colors.classes.xml
+++ b/Habitica/res/values/colors.classes.xml
@@ -1,7 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="class_healer">@color/yellow_100</color>
-    <color name="class_warrior">@color/red_100</color>
-    <color name="class_wizard">@color/blue_100</color>
-    <color name="class_rogue">@color/brand_100</color>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values/colors.contributor.xml b/Habitica/res/values/colors.contributor.xml
index c45043d68..d5d968c40 100644
--- a/Habitica/res/values/colors.contributor.xml
+++ b/Habitica/res/values/colors.contributor.xml
@@ -10,6 +10,4 @@
     <color name="contributor.7">#167e87</color>
     <color name="contributor.mod">#277eab</color>
     <color name="contributor.staff">#6133b4</color>
-    <color name="contributor.npc">#000</color>
-    <color name="contributor.npc.font">#00FF00</color>
 </resources>
diff --git a/Habitica/res/values/colors.xml b/Habitica/res/values/colors.xml
index 3e11838e2..24a4143d8 100644
--- a/Habitica/res/values/colors.xml
+++ b/Habitica/res/values/colors.xml
@@ -67,38 +67,20 @@
 
     <color name="gray_600_30">#4cedecee</color>
 
-    <color name="completed">#D9D9D9</color>
-    <color name="completed_btn">#989898</color>
-
     <color name="hpColor">@color/red_100</color>
-    <color name="hpColorBackground">#fcf0f0</color>
-    <color name="hpColorForeground">#250808</color>
     <color name="xpColor">@color/yellow_100</color>
-    <color name="xpColorBackground">#fffbf0</color>
-    <color name="xpColorForeground">#2e2200</color>
     <color name="mpColor">@color/blue_100</color>
-    <color name="mpColorBackground">#eff4fd</color>
-    <color name="mpColorForeground">#051228</color>
-
-    <color name="changelog.note">#ffcf42</color>
 
     <color name="colorPrimary">@color/brand_300</color>
     <color name="colorPrimaryDark">@color/brand_50</color>
     <!-- text -->
-    <color name="textColorDark">#FFFFFF</color>
     <color name="textColorSecondaryDark">@color/brand_500</color>
     <color name="textColorLight">#212121</color>
-    <color name="textColorSecondaryLight">#727272</color>
 
     <!-- Cards -->
-    <color name="stroke">@color/gray_500</color>
     <color name="text_light">#66000000</color>
     <color name="card_text">@color/gray_200</color>
     <color name="card_title_text">@color/gray_100</color>
-    <color name="card_light_text">@color/gray_300</color>
-    <color name="card_grid_text">@color/gray_100</color>
-    <color name="card_separator">@color/gray_600</color>
-    <color name="card_border">@color/gray_500</color>
 
     <!-- dialog -->
     <color name="primary_text_light">#000000</color>
@@ -107,13 +89,9 @@
 
     <!--  clock styled weekdays -->
     <color name="days_gray">#ffb5b5b5</color>
-    <color name="days_black">#FF000000</color>
 
-    <color name="btn_separator">@color/gray_300</color>
     <color name="white">#ffffff </color>
 
-    <color name="checkbox_tint_color">@color/gray_500</color>
-
     <color name="cell_separator">@color/gray_400</color>
     <color name="checklist_separator">@color/gray_600</color>
     <color name="task_gray">@color/gray_400</color>
@@ -127,7 +105,6 @@
     <color name="preference_fallback_accent_color">@color/colorAccent</color>
     <!-- buttons -->
     <color name="btn_success">@color/green_10</color>
-    <color name="btn_warning">@color/yellow_10</color>
     <color name="btn_danger">@color/red_10</color>
 
     <color name="widget_background">#c8432874</color>
@@ -135,7 +112,6 @@
     <color name="gem_view_background">@color/habit_inactive_gray</color>
     <color name="task_border_gray">#1a000000</color>
     <color name="task_secondary_text">#B2B2B2</color>
-    <color name="header_class_name">#CCBEED</color>
     <color name="gem_icon_color">#24cc8f</color>
     <color name="subscription_description_text">#b1000000</color>
     <color name="pill_gray">#efefef</color>
@@ -144,7 +120,6 @@
     <color name="white_75_alpha">#bfffffff</color>
     <color name="white_50_alpha">#7fffffff</color>
     <color name="white_15_alpha">#26ffffff</color>
-    <color name="black_5_alpha">#0b000000</color>
     <color name="black_10_alpha">#16000000</color>
     <color name="black_20_alpha">#33000000</color>
     <color name="black_50_alpha">#89000000</color>
@@ -165,7 +140,6 @@
     <color name="hair_blond">#CFA925</color>
     <color name="hair_red">#EC720E</color>
     <color name="hair_black">#313131</color>
-    <color name="gold">#ee9109</color>
     <color name="reward_buy_button_bg">#4cfedead</color>
     <color name="ic_launcher_background">#331960</color>
     <color name="scrollbarThumb">@color/gray_500</color>
@@ -173,8 +147,5 @@
     <color name="setup_background">#efeff4</color>
     <color name="setup_label_background">#fafaff</color>
 
-    <color name="bb_inActiveBottomBarItemColor">#747474</color>
-    <color name="bb_darkBackgroundColor">#212121</color>
-    <color name="bb_tabletRightBorderDark">#505050</color>
     <color name="dark_brown">#794b00</color>
 </resources>
diff --git a/Habitica/res/values/dimens.xml b/Habitica/res/values/dimens.xml
index ed99b9d94..3b85ecf5b 100644
--- a/Habitica/res/values/dimens.xml
+++ b/Habitica/res/values/dimens.xml
@@ -3,10 +3,8 @@
     <!-- Default screen margins, per the Android Design guidelines. -->
     <dimen name="activity_horizontal_margin">16dp</dimen>
     <dimen name="activity_vertical_margin">8dp</dimen>
-    <dimen name="card_vertical_padding">16dip</dimen>
     <dimen name="card_horizontal_padding">4dip</dimen>
 
-    <dimen name="card_large_text">25.0sp</dimen>
     <dimen name="card_medium_text">18.0sp</dimen>
     <dimen name="card_small_text">14.0sp</dimen>
     <dimen name="card_padding">12dp</dimen>
@@ -23,25 +21,10 @@
     <dimen name="avatar_height">147dp</dimen>
     <dimen name="avatar_header_width">108dp</dimen>
     <dimen name="avatar_header_height">113dp</dimen>
-    <dimen name="header_height">70dp</dimen>
-
-    <dimen name="new_task_bar_size">48dp</dimen>
-    <dimen name="new_task_bat_btn_width">48dp</dimen>
-    <dimen name="new_task_bat_btn_padding">8dp</dimen>
-    <dimen name="PB_marginBottom">-10dp</dimen>
-    <dimen name="btn_separator_margin">4dip</dimen>
-
-    <dimen name="list_preferred_item_height">48dp</dimen>
-    <dimen name="minus_plus_buttonsize">65dp</dimen>
-    <dimen name="view_layout_margin">4dp</dimen>
-    <dimen name="row_size">58dp</dimen>
-    <dimen name="btn_height_reward">50dp</dimen>
 
     <dimen name="quest_image_width">219dp</dimen>
-    <dimen name="quest_image_height">200dp</dimen>
 
     <!-- Widget -->
-    <dimen name="widget_bar_horizontal_margin">20dp</dimen>
 
     <dimen name="button_width">54dp</dimen>
     <dimen name="button_compact_width">50dp</dimen>
@@ -61,16 +44,12 @@
     <dimen name="grid_item_margin">6dp</dimen>
     <dimen name="avatar_small_width">90dp</dimen>
     <dimen name="avatar_small_height">90dp</dimen>
-    <dimen name="avatar_compact_width">114dp</dimen>
-    <dimen name="avatar_compact_height">114dp</dimen>
     <dimen name="customization_width">100dp</dimen>
     <dimen name="gear_image_size">68dp</dimen>
     <dimen name="row_padding">12dp</dimen>
     <dimen name="row_title_size">16sp</dimen>
     <dimen name="row_text_size">14sp</dimen>
     <dimen name="row_title_bottommargin">2dp</dimen>
-    <dimen name="drawer_section_item_text">12sp</dimen>
-    <dimen name="material_drawer_section_vertical_padding">4dp</dimen>
     <dimen name="pet_width">120dp</dimen>
     <dimen name="bottom_menu_padding">28dp</dimen>
     <dimen name="pet_image_width">81dp</dimen>
@@ -78,12 +57,8 @@
     <dimen name="shop_height">124dp</dimen>
     <dimen name="bar_icon_padding">10dp</dimen>
     <dimen name="task_text_padding">16dp</dimen>
-    <dimen name="task_text_compactpadding">4dp</dimen>
-    <dimen name="task_right_border_width">5dp</dimen>
     <dimen name="header_bar_spacing">7dp</dimen>
-    <dimen name="habit_circle_background_size">40dp</dimen>
     <dimen name="bar_size_slim">13dp</dimen>
-    <dimen name="widget_rounding">5dp</dimen>
 
     <dimen name="spacing_small">4dp</dimen>
     <dimen name="spacing_large">16dp</dimen>
@@ -92,15 +67,12 @@
 
     <dimen name="task_icon_space">12dp</dimen>
     <dimen name="task_icon_size">18dp</dimen>
-    <dimen name="task_info_bar_bottom_space">-8dp</dimen>
     <dimen name="pill_horizontal_padding">10dp</dimen>
     <dimen name="pill_vertical_padding">2dp</dimen>
-    <dimen name="button_padding">32dp</dimen>
     <dimen name="button_padding_small">16dp</dimen>
     <dimen name="button_padding_vertical_small">4dp</dimen>
 
     <dimen name="dialog_marginLeftRight">24dp</dimen>
-    <dimen name="dialog_marginTopBottom">24dp</dimen>
     <dimen name="login_intro_button_size">126dp</dimen>
     <dimen name="diamond_button_height">40dp</dimen>
     <dimen name="setup_customization_size">56dp</dimen>
@@ -109,7 +81,6 @@
     <dimen name="content_border">18dp</dimen>
 	<dimen name="content_section_spacing">21dp</dimen>
 	<dimen name="header_spacing">6dp</dimen>
-    <dimen name="shopitem_width">84dp</dimen>
     <dimen name="shopitem_status_size">24dp</dimen>
     <dimen name="shopitem_image_size">68dp</dimen>
     <dimen name="shop_scene_height">124dp</dimen>
@@ -120,7 +91,6 @@
 
     <!-- Per the design guidelines, navigation drawers should be between 240dp and 320dp:
          https://developer.android.com/design/patterns/navigation-drawer.html -->
-    <dimen name="navigation_drawer_width">240dp</dimen>
     <dimen name="drawer_padding">16dp</dimen>
     <dimen name="snackbar_image_size">46dp</dimen>
     <dimen name="bullet_size">6dp</dimen>
@@ -133,14 +103,9 @@
     <dimen name="customization_drawer_caret_margin">91dp</dimen>
     <dimen name="content_inset">21dp</dimen>
     <dimen name="header_border_spacing">16dp</dimen>
-    <dimen name="login_field_width">300dp</dimen>
 
-    <dimen name="bb_height">65dp</dimen>
-    <dimen name="bb_default_elevation">8dp</dimen>
-    <dimen name="bb_fake_shadow_height">4dp</dimen>
     <dimen name="button_height">38dp</dimen>
     <dimen name="button_height_small">24dp</dimen>
-    <dimen name="button_text_size">16sp</dimen>
     <dimen name="alert_side_padding">26dp</dimen>
     <dimen name="downwards_drop_shadow_height">16dp</dimen>
     <dimen name="collapsible_section_padding">12dp</dimen>
diff --git a/Habitica/res/values/ids.xml b/Habitica/res/values/ids.xml
index 3403bb0e0..a6b3daec9 100644
--- a/Habitica/res/values/ids.xml
+++ b/Habitica/res/values/ids.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="bb_bottom_bar_color_id" type="id"/>
-    <item name="bb_bottom_bar_appearance_id" type="id"/>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.constants.xml b/Habitica/res/values/strings.constants.xml
index da5e8ec19..8d1976269 100644
--- a/Habitica/res/values/strings.constants.xml
+++ b/Habitica/res/values/strings.constants.xml
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!--  Prefs -->
-    <string name="SP_address" translatable="false">ServerAddress</string>
     <string name="SP_userID" translatable="false">UserID</string>
     <string name="SP_APIToken" translatable="false">APIToken</string>
-    <string name="SP_username" translatable="false">Username</string>
-    <string name="SP_email" translatable="false">E-mail</string>
     <string name="base_url" translatable="false">https://habitica.com</string>
 
     <!-- Local notification actions -->
@@ -18,8 +15,6 @@
     <string name="group_message_reply" translatable="false">GROUP_MESSAGE_REPLY</string>
     <string name="inbox_message_reply" translatable="false">INBOX_MESSAGE_REPLY</string>
 
-    <string name="qr_album_name" translatable="false">habitica</string>
-    <string name="qr_file_name" translatable="false"> habitrpg-qr-code.jpg</string>
     <string name="habitica_user_count" translatable="false">2,000,000</string>
     <string name="brand_name" translatable="false">Habitica</string>
 
diff --git a/Habitica/res/values/strings.profile.xml b/Habitica/res/values/strings.profile.xml
index 426adfe57..0c2734e1c 100644
--- a/Habitica/res/values/strings.profile.xml
+++ b/Habitica/res/values/strings.profile.xml
@@ -9,10 +9,7 @@
     <string name="profile_level">Level:</string>
     <string name="profile_class_bonus">Class-Bonus:</string>
     <string name="profile_allocated">Allocated:</string>
-    <string name="profile_boosts">Boosts:</string>
     <string name="profile_private_message">Private Message</string>
     <string name="profile_achievements">Achievements</string>
-    <string name="profile_achievement_ok">OK</string>
-    <string name="profile_qrcode_close">Close</string>
 
 </resources>
diff --git a/Habitica/res/values/strings.sidebar.xml b/Habitica/res/values/strings.sidebar.xml
index ce47d1527..c7d4e9691 100644
--- a/Habitica/res/values/strings.sidebar.xml
+++ b/Habitica/res/values/strings.sidebar.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="sidebar.tasks">Tasks</string>
-    <string name="sidebar.skills">Skills</string>
-    <string name="sidebar.section.social">Social</string>
-    <string name="sidebar.inbox">Messages</string>
-    <string name="sidebar.tavern">Tavern</string>
-    <string name="sidebar.party">Party</string>
-    <string name="sidebar.purchaseGems">Gems &amp; Subscription</string>
-    <string name="sidebar.guilds">Guilds</string>
-    <string name="sidebar.challenges">Challenges</string>
-    <string name="sidebar.section.inventory">Inventory</string>
-    <string name="sidebar.avatar">Avatar</string>
-    <string name="sidebar.equipment">Equipment</string>
-    <string name="sidebar.stable">Stable</string>
-    <string name="sidebar.news">News</string>
-    <string name="sidebar.settings">Settings</string>
-    <string name="sidebar.about">About</string>
+    <string name="sidebar_tasks">Tasks</string>
+    <string name="sidebar_skills">Skills</string>
+    <string name="sidebar_section_social">Social</string>
+    <string name="sidebar_inbox">Messages</string>
+    <string name="sidebar_tavern">Tavern</string>
+    <string name="sidebar_party">Party</string>
+    <string name="sidebar_purchaseGems">Gems &amp; Subscription</string>
+    <string name="sidebar_guilds">Guilds</string>
+    <string name="sidebar_challenges">Challenges</string>
+    <string name="sidebar.section_inventory">Inventory</string>
+    <string name="sidebar_avatar">Avatar</string>
+    <string name="sidebar_equipment">Equipment</string>
+    <string name="sidebar_stable">Stable</string>
+    <string name="sidebar_news">News</string>
+    <string name="sidebar_about">About</string>
     <string name="sidebar_shops">Shops</string>
     <string name="sidebar_stats">Stats</string>
 </resources>
diff --git a/Habitica/res/values/strings.tutorial.xml b/Habitica/res/values/strings.tutorial.xml
index fe1e06ca3..42566a9d1 100644
--- a/Habitica/res/values/strings.tutorial.xml
+++ b/Habitica/res/values/strings.tutorial.xml
@@ -13,12 +13,8 @@
     <string name="tutorial_rewards_2">You can also make real-world Custom Rewards based on what motivates you.</string>
     <string name="tutorial_tasks_complete">That\'s all for now. If you need a reminder, check the FAQ section.</string>
 
-    <string name="tutorial_equipment">When you buy equipment, it appears here. Your Battle Gear affects your stats, and your Costume (if enabled) affects what your avatar wears.</string>
-    <string name="tutorial_items">Earn items by completing tasks and leveling up. Tap on an item to use it!</string>
-    <string name="tutorial_pets">As you complete real-world tasks, you now have a random chance of finding eggs and potions. Combine them to hatch pets</string>
     <string name="tutorial_skills">Skills are special abilities that have powerful effects! Tap on a skill to use it. It will cost Mana (the blue bar), which you earn by checking in every day and by completing your real-life tasks. Check out the FAQ in the menu for more info!</string>
     <string name="tutorial_party">This is where you and your friends can hold each other accountable to your goals and fight monsters with your tasks!</string>
     <string name="tutorial_tavern">Welcome to the Tavern, a public, all-ages chatroom! Here you can chat about productivity and ask questions. Have fun!</string>
-    <string name="tutorial_classes">Choose to become a Warrior, Mage, Healer, or Rogue! Each class has unique equipment and skills. Tap the (?) to learn more!</string>
     <string name="tutorial_stats">Tap the gray button to allocate lots of your stats at once, or tap the arrows to add them one point at a time.</string>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 8492448ca..7b4d1b27f 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -5,31 +5,25 @@
     <string name="XP_default">Experience</string>
     <string name="HP_default">Health</string>
     <string name="MP_default">Mana</string>
-    <string name="ERR_pb_barcode">Prefs couldn\'t be loaded from the barcode</string>
 
     <!--  Prefs -->
     <string name="PS_settings_title">Settings</string>
-    <string name="SP_address_hint">Your custom server</string>
     <string name="SP_userID_title">User ID</string>
     <string name="SP_userID_summary">Your User ID</string>
     <string name="SP_APIToken_title">API Token</string>
     <string name="SP_APIToken_summary">Your API Token</string>
     <string name="Language_title">Language</string>
     <string name="Language_summary">Change Habitica\'s language</string>
-    <string name="SP_user_qr_code">Your QR Code</string>
     <string name="PS_contact_title">Contact me</string>
-    <string name="unknown_error">An error occurred…</string>
     <string name="pref_account_header">Account</string>
     <string name="pref_first_day_of_the_week_title">First Day of the Week</string>
     <string name="pref_first_day_of_the_week_summary">First day of the week in all calendars</string>
-    <string name="pref_first_day_of_the_week_default_value" translatable="false">1</string>
     <string name="pref_first_day_of_the_week_key" translatable="false">FirstDayOfTheWeek</string>
     <string name="pref_reminder_header">Daily Reminder</string>
     <string name="pref_reminder_checkbox">Activate Reminder</string>
     <string name="pref_reminder_picker">Set Reminder Time</string>
 
     <string name="pref_cds_header">Custom Day Start</string>
-    <string name="pref_cds_picker">Set Custom Day Start Time</string>
 
     <string name="pref_push_notifications_checkbox">User Push Notifications</string>
     <string name="push_notifications">Push Notifications</string>
@@ -44,13 +38,7 @@
     <string name="preference_push_invited_to_quest">Invited to Quest</string>
 
     <!-- Adding tasks -->
-    <string name="task_value">Value</string>
-    <string name="new_todo">New To-Do</string>
-    <string name="new_reward">New Reward</string>
-    <string name="new_daily">New Daily</string>
-    <string name="new_habit">New Habit</string>
     <string name="action_edit">Edit</string>
-    <string name="action_delete">Delete</string>
     <string name="action_cancel">Cancel</string>
     <string name="login_btn">Login</string>
     <string name="register_btn">Register</string>
@@ -62,30 +50,24 @@
 
     <string name="logout">Logout</string>
     <string name="logout_description">Log out of your account</string>
-    <string name="account_details">Account Details</string>
-    <string name="LoginActivityName">Welcome</string>
+    <string name="LoginActivityName">Welcome</string><![CDATA[
+
 
-    <string name="string_revive">Revive</string>
-    <string name="please_connect">Please connect through the application before using a widget</string>
         
-    <string name="about.title">About</string>
-    <string name="about.libraries">Libraries</string>
-    <string name="about.versionhistory">Version history</string>
-    <string name="about.habitica_open_source">Habitica is available as open source software on Github</string>
-    <string name="about.rate_our_app">Rate our App</string>
-    <string name="about.give_us_feedback">Send us Feedback!</string>
-    <string name="about.bugreport">Report a Bug</string>
-    <string name="about.source_code">Source Code</string>
-
-    <string name="repeatEvery">Repeat Every</string>
+    ]]>
+    <string name="about_title">About</string>
+    <string name="about_libraries">Libraries</string>
+    <string name="about_habitica_open_source">Habitica is available as open source software on Github</string>
+    <string name="about_rate_our_app">Rate our App</string>
+    <string name="about_give_us_feedback">Send us Feedback!</string>
+    <string name="about_bugreport">Report a Bug</string>
+    <string name="about_source_code">Source Code</string>
 
 
     <!-- Network Errors -->
-    <string name="network_error_no_network_body">You are not connected to the internet.</string>
     <string name="internal_error_api">Server connection lost</string>
 
     <string name="authentication_error_title">Authentication Error</string>
-    <string name="authentication_error_body">Your Username and/or Password was incorrect.</string>
 
     <string name="login_validation_error_title">Validation Error</string>
     <string name="login_validation_error_fieldsmissing">You have to fill out all fields.</string>
@@ -93,7 +75,6 @@
     <string name="save_changes">Save</string>
     <string name="copy">Copy</string>
     <string name="notes">Notes</string>
-    <string name="text">Text</string>
     <string name="difficulty">Difficulty</string>
     <string name="tags">Tags</string>
     <string name="trivial">Trivial</string>
@@ -105,21 +86,9 @@
     <string name="negative_habit_form">Negative</string>
     <string name="checklist">Checklist</string>
     <string name="reminders">Reminders</string>
-    <string name="actions">Actions</string>
 
     <string name="attributes">Attributes</string>
-    <string name="physical">Strength</string>
-    <string name="mental">Intelligence</string>
-    <string name="social">Constitution</string>
-    <string name="other">Perception</string>
 
-    <string name="frequency">Frequency</string>
-    <string name="frequency_weekly">On Certain Days of the Week</string>
-    <string name="frequency_daily">Every X Days</string>
-
-    <string name="repeatables_summary_title">Summary</string>
-    <string name="repeatables_title">Repeats</string>
-    <string name="repeatables_on_title">Repeats On</string>
     <string name="repeatables_frequency_daily">Daily</string>
     <string name="repeatables_frequency_weekly">Weekly</string>
     <string name="repeatables_frequency_monthly">Monthly</string>
@@ -146,26 +115,17 @@
     <string name="faint_button">Refill Health &amp; Try Again</string>
 
     <string name="filter">Filter</string>
-    <string name="profile_image">Profile Image</string>
 
-    <string name="mana_price_button">%d MP</string>
-    <string name="used_skill">You used %1$s for %2$d mana.</string>
     <string name="used_skill_without_mana">You used %1$s.</string>
     <string name="new_checklist_item">New checklist entry</string>
-    <string name="add_checklist_item">Add</string>
 
     <string name="reminder_title">Remember to check off your tasks</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>
-    <string name="flag_confirm">Flag Message</string>
     <string name="unlock_lvl_11">Unlock at lvl 11</string>
-    <string name="no_party_message">You are not in a party. To join a party, please visit the website.</string>
     <string name="forgot_pw_btn">Forgot Password</string>
-    <string name="tavern.inn.checkOut">Reactivate your Dailies</string>
-    <string name="tavern.inn.rest">Pause your Dailies</string>
-    <string name="reward.dialog.buy">Buy</string>
-    <string name="reward.dialog.dismiss">Dismiss</string>
+    <string name="tavern_inn_checkOut">Reactivate your Dailies</string>
+    <string name="tavern.inn_rest">Pause your Dailies</string>
+    <string name="reward.dialog_buy">Buy</string>
+    <string name="reward.dialog_dismiss">Dismiss</string>
     <string name="party">Party</string>
     <string name="chat">Chat</string>
     <string name="members">Members</string>
@@ -173,8 +133,6 @@
     <string name="dailies">Dailies</string>
     <string name="todos">To-Dos</string>
     <string name="rewards">Rewards</string>
-    <string name="taskform.delete.title">Are you sure?</string>
-    <string name="taskform.delete.message">Do you really want to delete?</string>
     <string name="yes">Yes</string>
     <string name="no">No</string>
     <string name="quest">Quest</string>
@@ -182,14 +140,12 @@
     <string name="avatar_hair">Hair</string>
     <string name="avatar_shirt">Shirt</string>
     <string name="avatar_skin">Skin</string>
-    <string name="avatar_ears">Animal Ears</string>
     <string name="avatar_base">Base</string>
     <string name="avatar_color">Color</string>
     <string name="avatar_beard">Beard</string>
     <string name="avatar_mustache">Mustache</string>
     <string name="avatar_flower">Flower</string>
     <string name="avatar_bangs">Bangs</string>
-    <string name="avatar_nothing">Nothing set</string>
     <string name="avatar_size">Size</string>
     <string name="avatar_size_slim">Slim</string>
     <string name="avatar_size_broad">Broad</string>
@@ -199,23 +155,17 @@
     <string name="purchase_button">Purchase</string>
     <string name="purchase_set_title">Purchase set %s</string>
     <string name="due_date">Due Date</string>
-    <string name="quest.accept">Accept</string>
-    <string name="quest.reject">Reject</string>
-    <string name="quest.begin">Begin Quest</string>
-    <string name="quest.cancel">Cancel Invitation</string>
-    <string name="quest.abort">Abort Quest</string>
-    <string name="quest.leave">Leave Quest</string>
-    <string name="quest.pending">Pending</string>
-    <string name="quest.accepted">Accepted</string>
-    <string name="quest.rejected">Rejected</string>
-    <string name="quest.participants">Participants</string>
+    <string name="quest_accept">Accept</string>
+    <string name="quest_reject">Reject</string>
+    <string name="quest_begin">Begin Quest</string>
+    <string name="quest_cancel">Cancel Invitation</string>
+    <string name="quest_abort">Abort Quest</string>
     <string name="version_info">Version %1$s (%2$d)</string>
 
     <string name="sidebar_help">Help &amp; FAQ</string>
     <string name="complete_tutorial">Got it!</string>
     <string name="dismiss_tutorial">Remind me again</string>
     <string name="intro_1_subtitle">Welcome to</string>
-    <string name="intro_1_title">Habitica</string>
     <string name="intro_1_description">It’s time to have fun while you get things done. Join over %s others improving their life one task at a time.</string>
     <string name="intro_2_subtitle">Progress in the game</string>
     <string name="intro_2_title">Progress in life</string>
@@ -224,11 +174,8 @@
     <string name="intro_3_title">Get social</string>
     <string name="intro_3_description">Keep your goals on track with help from your friends. Support each other in life and in battle as you improve together!</string>
     <string name="intro_finish_button">Let\'s start!</string>
-    <string name="previous_button">Previous</string>
     <string name="next_button">Next</string>
     <string name="skip_button">Skip</string>
-    <string name="setup_welcome_description">Welcome to Habitica, where advancing in the game will improve your real life! As you accomplish real-world goals, you\'ll unlock equipment, pets, quests, and more.</string>
-    <string name="setup_welcome_title">Welcome</string>
     <string name="avatar_setup_description">So, how would you like to look? Don\'t worry, you can change this later.</string>
     <string name="task_setup_description">Great! Now, what are you interested in working on throughout this journey?</string>
     <string name="setup_group_work">Work</string>
@@ -260,29 +207,20 @@
     <string name="setup_task_creativity_2">Work on creative project</string>
     <string name="setup_task_creativity_3">Finish creative project</string>
 
-    <string name="gem.purchase.support">Want to help us keep Habitica running? You can support the developers by buying gems!\n\nGems allow you to buy fun extras for your account, including: \n\n - Cool costumes for your avatar\n - Awesome backgrounds\n - Fun quests that reward you with pet eggs\n - The ability to change your class before level 100\n\nThank you so much for helping us make Habitica the best it can be. Your support means a lot to us!</string>
     <string name="my_guilds">My Guilds</string>
     <string name="public_guilds">Public Guilds</string>
     <string name="guild">Guild</string>
     <string name="leave">Leave</string>
     <string name="join">Join</string>
-    <string name="leader">Leader</string>
     <string name="gems">Gems</string>
-    <string name="copy_as_todo">Copy as To-Do</string>
-    <string name="send_pm">Send PM</string>
-    <string name="flag">Flag</string>
     <string name="delete">Delete</string>
     <string name="name">Name</string>
     <string name="description">Description</string>
     <string name="add_tag">Add new Tag</string>
     <string name="privacy">Privacy</string>
     <string name="write_message">Write Message</string>
-    <string name="post">Post</string>
     <string name="guild_search_hint">Search for guilds</string>
 
-    <string name="todo_due">Due: %s</string>
-    <string name="daily_streak">current streak: %d</string>
-    <string name="todo_has_duedate">Task has Due Date</string>
     <string name="battle_gear">Battle Gear</string>
     <string name="costume">Costume</string>
     <string name="outfit_head">Head</string>
@@ -296,9 +234,7 @@
     <string name="wear_costume">Wear Costume</string>
     <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">1d ago</string>
     <string name="ago_days">%dd ago</string>
     <string name="ago_1Minute">1m ago</string>
@@ -317,12 +253,8 @@
     <string name="armoireEquipment">You found %s in the Armoire</string>
     <string name="armoireFood">You rummage in the Armoire and find %1$s %2$s. What\'s that doing in here?</string>
     <string name="armoireExp">You wrestle with the Armoire and gain Experience. Take that!</string>
-    <string name="armoireNotesFull">Open the Armoire to randomly receive special Equipment, Experience, or food! Equipment pieces remaining: %d</string>
-    <string name="armoireLastItem">You\'ve found the last piece of rare Equipment in the Enchanted Armoire.</string>
-    <string name="armoireNotesEmpty">The Armoire will have new Equipment in the first week of every month. Until then, keep clicking for Experience and Food!</string>
     <string name="sell">Sell (%d Gold)</string>
     <string name="hatch_with_potion">Hatch with potion</string>
-    <string name="feed_to_pet">Feed to pet</string>
     <string name="hatch_egg">Hatch with egg</string>
     <string name="invite_party">Invite party</string>
     <string name="dialog_feeding">Feed %s with:</string>
@@ -334,13 +266,7 @@
     <string name="close">Close</string>
     <string name="share">Share</string>
     <string name="notification_pet_fed" >You fed your %s!</string>
-    <string name="notification_purchase" >You purchased %s</string>
     <string name="notification_purchase_reward" >You purchased a reward</string>
-    <string name="sectiondrop">Standard</string>
-    <string name="sectionpremium">Magic Potion</string>
-    <string name="sectionquest">Quest</string>
-    <string name="sectionspecial">Special</string>
-    <string name="sectionwacky">Wacky</string>
     <string name="world_quest">World Quest</string>
     <string name="inn_description">Need a break? Check into Daniel’s Inn to pause some of Habitica’s more difficult game mechanics:\n\n
 &#8226; Missed Dailies won’t damage you\n
@@ -360,7 +286,6 @@
     <string name="healer_description">Healers learn Skills that can heal and protect themselves and their Party. Play a Healer if you enjoy assisting others or avoiding damage! Healers benefit from a high Constitution stat.</string>
     <string name="select_class">Select Class</string>
     <string name="opt_out_class">Opt Out</string>
-    <string name="opt_out_description">Can\'t be bothered with classes? Want to choose later? Opt out - you\'ll be a warrior with no special abilities. You can read about the class system later on the wiki and enable classes at any time.</string>
     <string name="opting_out_progress">Opting Out</string>
     <string name="class_confirmation">Are you sure you want to be a %s?</string>
     <string name="class_changed">You are now a %s!</string>
@@ -376,13 +301,10 @@
     <string name="invite_existing_users">Invite Existing Users</string>
     <string name="send">Send</string>
     <string name="invite">Invite Friends</string>
-    <string name="invite_id_description">If you have friends already using Habitica, invite them by User ID here.</string>
     <string name="invite_username_description">If you have friends already using Habitica, invite them by username here.</string>
     <string name="invite_email_description">If a friend joins Habitica via your email, they\'ll automatically be invited to your party!</string>
     <string name="add_invites">Add Invites</string>
-    <string name="user_id">User ID</string>
     <string name="email">Email</string>
-    <string name="invite_users">Invite to Party</string>
     <string name="share_using">Share using</string>o
     <string name="share_levelup">I got to level %d in Habitica by improving my real-life habits!</string>
     <string name="share_hatched">I just hatched a %1$s %2$s pet in Habitica by completing my real-life tasks!</string>
@@ -390,8 +312,6 @@
     <string name="open_in_store">Open in play store</string>
     <string name="change_class_confirmation">Are you sure you want to change your class? This will cost 3 gems.</string>
     <string name="change_class_equipment_warning">Warning: You will no longer be able to buy equipment from the %s class.</string>
-    <string name="leaderMessage">Message from %1$s</string>
-    <string name="leaderName">Leader: %1$s</string>
     <string name="confirm">Confirm</string>
     <string name="market">Market</string>
     <string name="timeTravelers">Time Travelers</string>
@@ -400,37 +320,16 @@
     <string name="party_invite">Unlock by inviting friends</string>
     <string name="login_incentive">Unlock by logging into Habitica regularly</string>
     <string name="create_account">Unlock by creating an account</string>
-    <string name="no_gold">Not enough Gold</string>
-    <string name="no_potion">You don\'t need to buy an health potion</string>
     <string name="successful_purchase">Purchased %1$s</string>
-    <string name="purchase_confirmation_title">Confirm purchase</string>
-    <string name="confirm_purchase_text">Purchase %1$s for %2$s %3$s</string>
-    <string name="gem">gem</string>
-    <string name="hourglass">hourglass</string>
-    <string name="hourglasses">hourglasses</string>
-    <string name="gold_singular">gold</string>
     <string name="gold_plural">gold</string>
     <string name="chat_message_copied">Message copied to Clipboard</string>
-    <string name="copy_chat_message">Copy to clipboard</string>
-    <string name="edit_tag_title">Edit Tag</string>
     <string name="edit_tag_btn_edit">Edit</string>
-    <string name="edit_tag_btn_done">Done</string>
-    <string name="edit_tag_btn_delete">Delete</string>
     <string name="confirm_delete_tag_title">Are you sure?</string>
     <string name="confirm_delete_tag_message">Do you really want to delete?</string>
-    <string name="filter_drawer_edit_tags">Edit Tags</string>
-    <string name="filter_drawer_filter_tags">Filter by Tags</string>
 
     <!-- QR Strings -->
-    <string name="qr_section_title">Have someone invite you with this QR Code</string>
-    <string name="qr_save_message">QR code saved at </string>
-    <string name="qr_dialogue_title">Your QR Code</string>
-    <string name="download">Download</string>
-    <string name="send_new_message">Send new message</string>
     <string name="choose_recipient_title">Choose Message Recipient</string>
     <string name="action_continue">Continue</string>
-    <string name="scan_qr_code">Scan QR Code</string>
-    <string name="enter_recipient_uuid">Enter Recipient\'s User ID</string>
     <string name="invited_to_party">You were invited to join a party!</string>
     <string name="stats_widget_label">Habitica Stats</string>
     <string name="add_task">Add Task</string>
@@ -442,15 +341,14 @@
     <string name="widget_habit_button">Habitica Do Habit</string>
     <string name="widget_dailies">Habitica Dailies</string>
     <string name="widget_todo_list">Habitica To-Do List</string>
-    <string name="widget_add_task">Habitica Add Task</string>
     <string name="google_services_missing">Google play services could not be found.</string>
-    <string name="gem.purchase.toolbartitle">Purchase</string>
-    <string name="gem.purchase.title">Buying gems supports the developers and helps keep Habitica running</string>
-    <string name="gem.purchase.subtitle">Gems allow you to buy fun extras for you account, including:</string>
-    <string name="gem.purchase.listitem1">Cool costumes for your avatar</string>
-    <string name="gem.purchase.listitem2">Awesome backgrounds</string>
-    <string name="gem.purchase.listitem3">Quests that reward you with pet eggs</string>
-    <string name="gem.purchase.listitem4">The ability to change your class before level 100</string>
+    <string name="gem.purchase_toolbartitle">Purchase</string>
+    <string name="gem.purchase_title">Buying gems supports the developers and helps keep Habitica running</string>
+    <string name="gem.purchase_subtitle">Gems allow you to buy fun extras for you account, including:</string>
+    <string name="gem.purchase_listitem1">Cool costumes for your avatar</string>
+    <string name="gem.purchase_listitem2">Awesome backgrounds</string>
+    <string name="gem.purchase_listitem3">Quests that reward you with pet eggs</string>
+    <string name="gem.purchase_listitem4">The ability to change your class before level 100</string>
     <string name="support_habitica">Support Habitica</string>
     <string name="skill_transformation_use">use</string>
     <string name="hatching_market_info">Not getting the right drops? Check out the Market!</string>
@@ -466,32 +364,32 @@
     <string name="belongs_to_challenge">Belongs to Challenge</string>
     <string name="has_reminder">Has Reminder</string>
     <string name="has_tag">Has Tag</string>
-    <string name="subscribe.title">Subscribing supports the developers and helps keep Habitica running</string>
+    <string name="subscribe_title">Subscribing supports the developers and helps keep Habitica running</string>
     <string name="subscribe_prompt">Become a subscriber and you’ll get these useful benefits:</string>
-    <string name="subscribe.listitem1">Buy gems with gold</string>
-    <string name="subscribe.listitem2">Exclusive monthly items</string>
-    <string name="subscribe.listitem3">Retain additional history entries</string>
-    <string name="subscribe.listitem4">Daily drop-caps doubled</string>
+    <string name="subscribe_listitem1">Buy gems with gold</string>
+    <string name="subscribe_listitem2">Exclusive monthly items</string>
+    <string name="subscribe_listitem3">Retain additional history entries</string>
+    <string name="subscribe_listitem4">Daily drop-caps doubled</string>
     <string name="subscriptions">Subscriptions</string>
     <string name="subscription_duration">Recurring every %s</string>
     <string name="subscription_duration_norenew">For %s</string>
     <string name="subscribe">Subscribe</string>
-    <string name="subscribe.listitem1.description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
-    <string name="subscribe.listitem2.description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</string>
-    <string name="subscribe.listitem3.description">Makes completed To-Dos and task history available for longer.</string>
-    <string name="subscribe.listitem4.description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
-    <string name="subscribe1month.gemcap">25 Gem cap</string>
-    <string name="subscribe3month.gemcap">30 Gem cap</string>
-    <string name="subscribe6month.gemcap">35 Gem cap</string>
-    <string name="subscribe12month.gemcap">45 Gem cap</string>
+    <string name="subscribe.listitem1_description">Alexander the Merchant will now sell you gems for 20 gold each!\n\nHis monthly shipments are initially capped at 25 Gems per month, but can increase based on your subscription length.\n\nThe cap increases by 5 Gems for every three months of consecutive subscription, up to a maximum of 50 Gems per month!</string>
+    <string name="subscribe.listitem2_description">Each month you will receive a unique cosmetic item for your avatar!\n\nPlus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.</string>
+    <string name="subscribe.listitem3_description">Makes completed To-Dos and task history available for longer.</string>
+    <string name="subscribe.listitem4_description">Double drop caps will let you receive more items from your completed tasks every day, helping you complete your stable faster!</string>
+    <string name="subscribe1month_gemcap">25 Gem cap</string>
+    <string name="subscribe3month_gemcap">30 Gem cap</string>
+    <string name="subscribe6month_gemcap">35 Gem cap</string>
+    <string name="subscribe12month_gemcap">45 Gem cap</string>
     <string name="subscription_hourglasses">+%d Mystic Hourglass</string>
     <string name="payment_method">Payment method</string>
     <string name="subscription">Subscription</string>
     <string name="active">Active</string>
     <string name="due">Due</string>
     <string name="cancel_subscription">Cancel Subscription</string>
-    <string name="cancel_subscription_google.description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store.</string>
-    <string name="cancel_subscription_notgoogle.description">No longer want to subscribe? Due to your payment method, you can only unsubscribe through the website. Click the button below, to open the site in your browser!</string>
+    <string name="cancel_subscription_google_description">No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store.</string>
+    <string name="cancel_subscription_notgoogle_description">No longer want to subscribe? Due to your payment method, you can only unsubscribe through the website. Click the button below, to open the site in your browser!</string>
     <string name="visit_habitica_website">Visit Habitica Website</string>
     <string name="current_bonuses">Current Bonuses</string>
     <string name="months_subscribed">Months subscribed</string>
@@ -507,8 +405,6 @@
     <string name="subscribe_prompt_thanks">For Subscribing you are receiving these useful benefits:</string>
     <string name="subscription_status">Subscription Status</string>
 
-    <string name="byLeader">by %s</string>
-    <string name="challenge_details">Challenge Details</string>
     <string name="challenge_leave_title">Leave Challenge</string>
     <string name="challenge_leave_text">Are you sure you want to leave the Challenge “%s”?</string>
     <string name="challenge_remove_tasks_title">Remove tasks</string>
@@ -516,47 +412,33 @@
     <string name="remove_tasks">Remove</string>
     <string name="keep_tasks">Keep</string>
     <string name="my_challenges">My Challenges</string>
-    <string name="public_challenges">Public</string>
-    <string name="challenges">Challenges</string>
     <string name="daily">Daily</string>
     <string name="habit">Habit</string>
     <string name="reward">Reward</string>
     <string name="todo">To-Do</string>
     <string name="official">Official</string>
-    <string name="participating">Participating</string>
     <string name="challenge">Challenge</string>
-    <string name="go_to_challenge">Go to Challenge</string>
     <string name="not_part_of_a_challenge">You’re not part of any Challenges right now!</string>
     <string name="join_a_challenge">Join a Challenge to add a curated set of tasks to your list, then compete against other Habiticans to win achievements and even gems!</string>
     <string name="check_the_public_challenge_tab">Tap the “Public” tab to find the user-created Challenges that are the best fit for you!</string>
-    <string name="add_reminder">Add Reminder</string>
-    <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">Messages</string>
     <string name="notifications">Notifications</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>
-    <string name="limited_count">%d left</string>
     <string name="gem_shop">Gem</string>
     <string name="mystery_item">Mystery Item</string>
     <string name="myster_item_notes">Each month, subscribers will receive a mystery item. This is usually released about one week before the end of the month.</string>
     <string name="open">Open</string>
-    <string name="notification_mystery_item">You open the box and find %s!</string>
     <string name="checkInRewardEarned">You earned a %1$s as a reward for your devotion to improving your life.</string>
     <string name="nextPrizeUnlocks" tools:ignore="PluralsCandidate">Next prize in %1$d Check-Ins</string>
     <string name="pending_approval">pending approval</string>
     <string name="filters">Filters</string>
     <string name="done">Done</string>
-    <string name="group_tasks_edit_description">Group tasks can not be edited.</string>
-    <string name="group_tasks_edit_title">Can\'t edit this task</string>
     <string name="groups">Groups</string>
     <string name="all">All</string>
     <string name="none">None</string>
     <string name="owned">Owned</string>
     <string name="not_owned">Not owned</string>
-    <string name="new_game">New\nGame</string>
     <string name="login_btn_fb">Login with Facebook</string>
     <string name="login_btn_google">Login with Google</string>
     <string name="action_back">Back</string>
@@ -598,7 +480,6 @@
     <string name="gem_reward">Gem prize</string>
     <string name="tasks">Tasks</string>
     <string name="create_challenge">Create Challenge</string>
-    <string name="edit_challenge">Edit</string>
     <string name="challenge_create_error_tavern_one_gem">You need at least 1 gem to create a public challenge.</string>
     <string name="challenge_create_error_enough_gems">You don\'t have enough gems to create a challenge.</string>
     <string name="identify_your_challenge_with_a_tag">Identify your challenge with a short name</string>
@@ -609,42 +490,36 @@
     <string name="new_challenge_title">New challenge title</string>
     <string name="ownership">Ownership</string>
     <string name="inn">Inn</string>
-    <string name="system">System</string>
     <string name="start_quest">Start a new Quest</string>
     <string name="leave_party">Leave Party</string>
     <string name="party_description">Party Description</string>
-    <string name="abort_confirmation">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="leave_quest_confirmation">Are you sure you want to leave the active quest? All your quest progress will be lost.</string>
     <string name="number_participants">%1$d Participants</string>
     <string name="welcome_back">Welcome Back</string>
     <string name="yesterdaililes_prompt">Check off any Dailies you did yesterday:</string>
     <string name="start_day">Start My Day</string>
     <string name="leave_party_confirmation">Are you sure you want to leave the Party?</string>
-    <string name="nextPrizeUnlocksIn" formatted="false">Next Prize in %d Check-ins</string>
     <string name="pending">Pending</string>
     <string name="accepted">Accepted</string>
     <string name="declined">Declined</string>
     <string name="participants">Participants</string>
     <string name="invitations">Invitations</string>
-    <string name="quest_leader_header" formatted="false">Started by %s</string>
+    <string name="quest_leader_header">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>
     <string name="billion_abbrev">b</string>
-    <string name="your_balance">Your balance:</string>
-    <string name="available_until" formatted="false">Available until %s</string>
-    <string name="gems_left_max" formatted="false">Monthly Gems: %1$d/%2$d Remaining</string>
-    <string name="gems_left_nomax" formatted="false">Monthly Gems: %d Remaining</string>
+    <string name="available_until">Available until %s</string>
+    <string name="gems_left_max">Monthly Gems: %1$d/%2$d Remaining</string>
+    <string name="gems_left_nomax">Monthly Gems: %d Remaining</string>
     <string name="health">Health</string>
     <string name="collect">Collect</string>
     <string name="rage_meter">Rage Meter</string>
     <string name="boss_quest">Boss Quest</string>
     <string name="collection_quest">Collection Quest</string>
-    <string name="quest_reward_count" formatted="false">%1$s x%2$d</string>
-    <string name="experience_reward" formatted="false">%d Experience points</string>
-    <string name="gold_reward" formatted="false">%d Gold</string>
+    <string name="quest_reward_count">%1$s x%2$d</string>
+    <string name="experience_reward">%d Experience points</string>
+    <string name="gold_reward">%d Gold</string>
     <string name="quest_owner_rewards">Quest Owner Rewards</string>
     <string name="str_abbrv">Str</string>
     <string name="per_abbrv">Per</string>
@@ -658,7 +533,6 @@
     <string name="reset_account_confirmation">Reset my Account</string>
     <string name="delete_account_confirmation">Delete my Account</string>
     <string name="danger_zone">Danger Zone</string>
-    <string name="nevermind">Nevermind</string>
     <string name="resetting_account">Resetting Account</string>
     <string name="deleting_account">Deleting Account</string>
     <string name="insufficientGold">You need to complete more tasks before you can afford this item!</string>
@@ -693,7 +567,6 @@
     <string name="authentication_summary">Change your authentication options.</string>
     <string name="change_password">Change Password</string>
     <string name="change_email">Change Email Address</string>
-    <string name="change_login_name">Change Login Name</string>
     <string name="change_username">Change Username</string>
     <string name="change">Change</string>
     <string name="character_level">Character Level</string>
@@ -715,7 +588,7 @@
     <string name="distribute_class">Distribute based on class</string>
     <string name="distribute_task">Distribute based on task activity</string>
     <string name="no_points_to_allocate">No Points to Allocate</string>
-    <string name="points_to_allocate" formatted="false">%d Points to Allocate</string>
+    <string name="points_to_allocate">%d Points to Allocate</string>
     <string name="distribute_evenly_help">Assigns the same number of points to each attribute.</string>
     <string name="distribute_class_help">Assigns more points to the attributes important to your Class.</string>
     <string name="distribute_task_help">Assigns points based on the Strength, Intelligence, Constitution, and Perception categories associated with the tasks you complete.</string>
@@ -725,8 +598,6 @@
     <string name="classless">Classless</string>
     <string name="class_equipment_shop_dialog">This item is only available to a specific class.\nYou can change your class from Settings.</string>
     <string name="class_gear_disclaimer">You can only purchase gear for your current class</string>
-    <string name="available_stats" formatted="false">%d points</string>
-    <string name="toogle_emojis">Toogle Emojis</string>
     <string name="tavern_description">Welcome to the Inn! Pull up a chair to chat, or take a break from your tasks.</string>
     <string name="check_into_inn">Check into Inn</string>
     <string name="community_guidelines">Community Guidelines</string>
@@ -741,19 +612,13 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="world_boss">World  Boss</string>
-    <string name="world_boss_art">Boss Art</string>
     <string name="boss_art">Boss Art</string>
     <string name="world_boss_description">World Boss Description</string>
-    <string name="rage_strike_count" formatted="false">Rage Strikes: %d/%d</string>
-    <string name="pending_strike_description">This Strike hasn’t happened yet!\nThe World Boss will lash out and attack one of our friendly shopkeepers once its rage bar fills. Keep up with your Dailies to try and prevent it from happening!</string>
+    <string name="rage_strike_count">Rage Strikes: %d/%d</string>
     <string name="pending_strike_title">Pending Strike</string>
     <string name="strike_description_title">What’s a Rage Strike?</string>
-    <string name="strike_description_subtitle">There are 3 potential Rage Strikes</string>
-    <string name="strike_description_description">This gauge fills when Habiticans miss their Dailies. If it fills up, the DysHeartener will unleash its Shattering Heartbreak attack on one of Habitica\'s shopkeepers, so be sure to do your tasks!</string>
-    <string name="pending_strike_subtitle">This Strike hasn’t happened yet!</string>
-    <string name="strike_active_title" formatted="false">The %s was Attacked!</string>
-    <string name="strike_active_subtitle" formatted="false">%s is Heartbroken!</string>
-    <string name="strike_active_description" formatted="false">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
+    <string name="strike_active_title">The %s was Attacked!</string>
+    <string name="strike_active_description">Our beloved %s was devastated when the %s shattered the %s. Quickly, tackle your tasks to defeat the monster and help rebuild!!</string>
     <string name="questShop">Quest Shop</string>
     <string name="market_owner_long">Alex the Merchant</string>
     <string name="tavern_owner_long">Daniel the inn keeper</string>
@@ -764,28 +629,20 @@
     <string name="no_party_title">Play Habitica in a Party</string>
     <string name="join_party_description">Give a Party member the username found below and they can send you an invite</string>
     <string name="join_party_description_guild">Give the username below to a friend or head to the %s to meet potential comrades!</string>
-    <string name="join_party_description_id">Give them your User ID or have them scan your QR code while inviting</string>
     <string name="join_party_title">Want to join a party?</string>
-    <string name="create_party_website">Open website to create party</string>
-    <string name="id_copied">ID copied to clipboard</string>
     <string name="insufficientSubscriberGems">You have bought all the Gems you can this month. More become available within the first three days of each month. Thanks for subscribing!</string>
-    <string name="insufficientSubscriberGemsTitle">Monthly Gem Cap Reached</string>
-    <string name="chat_message">Chat Message</string>
     <string name="world_boss_description_title">What’s a World Boss?</string>
-    <string name="world_boss_description_description">A World Boss is a special event where the whole community works together to take down a powerful monster with their tasks!\nComplete tasks to damage the Boss\nThe Boss won’t damage you for missed tasks, but its Rage meter will go up. If the bar fills up, the Boss will attack one of the shopkeepers!\nYou can continue with normal Quest Bosses, damage will apply to both\nCheck the Tavern to see Boss progress and Rage attacks</string>
     <string name="world_boss_description_intro">A World Boss is a special event where the whole community works together to take down a powerful monster with their tasks!</string>
     <string name="world_boss_description_1">Complete tasks to damage the Boss</string>
     <string name="world_boss_description_2">The Boss won’t damage you for missed tasks, but its Rage meter will go up. If the bar fills up, the Boss will attack one of the shopkeepers!</string>
     <string name="world_boss_description_3">You can continue with normal Quest Bosses, damage will apply to both</string>
     <string name="world_boss_description_4">Check the Tavern to see Boss progress and Rage attacks</string>
-    <string name="world_boss_action_prompt" formatted="false">Defeat the Boss to earn special rewards and save Habitica from %s’s Terror!</string>
-    <string name="world_boss_description_subtitle">%s attacks!</string>
+    <string name="world_boss_action_prompt">Defeat the Boss to earn special rewards and save Habitica from %s’s Terror!</string>
     <string name="questShop_owner_long">Ian the Quest Guide</string>
     <string name="seasonalShop_owner_long">Seasonal Sorceress</string>
     <string name="rage_attack">Rage attack:</string>
     <string name="tavern_description_world_boss">Oh dear, pay no heed to the monster below — this is still a safe haven to chat on your breaks.</string>
     <string name="report">Report</string>
-    <string name="like">Like</string>
     <string name="reply">Reply</string>
     <string name="challenge_prize">Challenge Prize</string>
     <string name="challenge_categories">Challenge Categories</string>
@@ -820,16 +677,14 @@
     <string name="two_handed">Two-Handed</string>
     <string name="usernamePromptTitle">It’s time to set your username!</string>
     <string name="usernamePromptBody">Login names are now unique usernames that will be visible beside your display name and used for invitations, chat @mentions, and messaging.</string>
-    <string name="usernamePromptWiki">If you’d like to learn more about this change, <a href="https://habitica.wikia.com/wiki/Player_Names">visit our wiki.</a></string>
-    <string name="confirmUsername">Confirm Username</string>
-    <string name="usernamePromptDisclaimer">Usernames should conform to our <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica.com/static/community-guidelines">Community Guidelines</a>. If you didn’t previously set a login name, your username was auto-generated.</string>
+    <string name="usernamePromptWiki">If you’d like to learn more about this change, <a href="https://habitica.wikia_com/wiki/Player_Names">visit our wiki.</a></string>
+    <string name="usernamePromptDisclaimer">Usernames should conform to our <a href="https://habitica.com/static/terms">Terms of Service</a> and <a href="https://habitica_com/static/community-guidelines">Community Guidelines</a>. If you didn’t previously set a login name, your username was auto-generated.</string>
     <string name="confirm_username_title">Are you sure you want to confirm your current username?</string>
     <string name="confirm_username_description">Confirming your username will make it public for invitations, @mentions and messaging. You can change your username from settings at any time.</string>
     <string name="cancel">Cancel</string>
     <string name="confirm_username">Confirm Username</string>
     <string name="username_not_confirmed">Username not confirmed</string>
     <string name="username_confirmed">Username Confirmed</string>
-    <string name="username_level">\@%s ・Lvl %d</string>
     <string name="enter_recipient_username">Enter a Recipient\'s @ username</string>
     <string name="username_copied">Username copied to clipboard</string>
     <string name="verification_pet">One of these Veteran Pets will be waiting for you after you’ve finished confirming!</string>
@@ -945,7 +800,6 @@
     <string name="share_challenge_with">Share Challenge with</string>
     <string name="app_theme">App Theme</string>
     <string name="sent_card">You sent a %s</string>
-    <string name="group_activity_summary_notif">New messages in %s</string>
     <string name="inbox_messages_title">You received %d messages from %s</string>
     <string name="remove">Remove</string>
     <string name="transfer_ownership">Transfer Ownership</string>
@@ -957,4 +811,5 @@
     <string name="transfer">Transfer</string>
     <string name="removed_member">%s was removed from the group</string>
     <string name="mystery_item_received">You open the box and receive a %s</string>
+    <string name="see_what_s_new">See what\'s new</string>
 </resources>
diff --git a/Habitica/res/values/styles.challenges.xml b/Habitica/res/values/styles.challenges.xml
index fe7d268a1..d4f01eadb 100644
--- a/Habitica/res/values/styles.challenges.xml
+++ b/Habitica/res/values/styles.challenges.xml
@@ -9,15 +9,6 @@
         <item name="android:textColor">#000</item>
     </style>
 
-    <style name="ChallengeByGroup">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_regular
-        </item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:height">20dp</item>
-        <item name="android:textColor">#8a000000</item>
-        <item name="android:maxLines">1</item>
-    </style>
-
     <style name="ChallengeTaskDetails">
         <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_regular
         </item>
@@ -27,17 +18,4 @@
         <item name="android:maxLines">1</item>
     </style>
 
-    <style name="OfficialChallenge">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_medium
-        </item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">#8a000000</item>
-    </style>
-
-    <style name="ParticipatingChallenge">
-        <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/font_family_medium
-        </item>
-        <item name="android:textSize">12sp</item>
-        <item name="android:textColor">#1ca372</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/styles.habitica.xml b/Habitica/res/values/styles.habitica.xml
index 9db6ed00a..95326d2df 100644
--- a/Habitica/res/values/styles.habitica.xml
+++ b/Habitica/res/values/styles.habitica.xml
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- All possible font familys -->
-    <string name="font_family_light">sans-serif-light</string>
     <string name="font_family_medium">sans-serif-medium</string>
     <string name="font_family_regular">sans-serif</string>
     <string name="font_family_condensed">sans-serif-condensed</string>
-    <string name="font_family_black">sans-serif-black</string>
-    <string name="font_family_thin">sans-serif-thin</string>
 
     <!-- Titles -->
     <style name="Title1">
@@ -16,10 +13,6 @@
         <item name="android:textColor">?textColorPrimary</item>
     </style>
 
-    <style name="Title1_WideLetterSpacing"  parent="@style/Title1">
-        <item name="android:letterSpacing">0.133</item>
-    </style>
-
     <style name="Title2"  parent="@style/Title1">
         <item name="android:fontFamily">@string/font_family_regular</item>
         <item name="android:textSize">28sp</item>
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 6c30cb9db..f81c07ba1 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -191,12 +191,6 @@
         <item name="android:popupBackground">@android:color/white</item>
     </style>
 
-    <style name="MyCustomTabLayout" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
-        <item name="android:singleLine">true</item>
-        <item name="android:lines">1</item>
-        <item name="android:ellipsize">end</item>
-    </style>
-
     <style name="CardText">
         <item name="android:textSize">@dimen/card_small_text</item>
         <item name="android:textColor">@color/card_text</item>
@@ -297,11 +291,6 @@
         <item name="android:paddingTop">@dimen/section_top_padding</item>
     </style>
 
-    <style name="MenuSectionTitle">
-        <item name="android:background">@color/brand</item>
-        <item name="android:textColor">@color/white</item>
-    </style>
-
     <style name="BottomMenu">
         <item name="android:divider">?android:listDivider</item>
         <item name="android:showDividers">middle</item>
@@ -327,12 +316,6 @@
         <item name="android:visibility">gone</item>
     </style>
 
-    <style name="LoginRow">
-        <item name="android:layout_marginLeft">8dp</item>
-        <item name="android:layout_marginRight">8dp</item>
-        <item name="android:layout_gravity">center</item>
-    </style>
-
     <style name="GemPurchaseListItem">
         <item name="android:textColor">@color/brand_300</item>
         <item name="android:gravity">center_horizontal</item>
@@ -420,10 +403,6 @@
         <item name="android:textColor">@color/gray_50</item>
     </style>
 
-    <style name="subscriptionBoxText.Title.Red">
-        <item name="android:textColor">@color/red_50</item>
-    </style>
-
     <style name="SubscriptionListDescription" parent="GemPurchaseListItemDescription">
         <item name="android:layout_marginBottom">24dp</item>
         <item name="android:fontFamily" tools:targetApi="jelly_bean">
@@ -470,13 +449,6 @@
         <item name="android:paddingRight">32dp</item>
     </style>
 
-    <style name="welcome_floating_icon">
-        <item name="android:layout_width">50dp</item>
-        <item name="android:layout_height">50dp</item>
-        <item name="android:background">@drawable/welcome_diamond_background</item>
-        <item name="android:padding">16dp</item>
-    </style>
-
     <style name="DiamondButton" parent="@style/Widget.AppCompat.Button.Borderless">
         <item name="android:layout_height">36dp</item>
         <item name="android:background">@drawable/diamond_button</item>
@@ -585,13 +557,6 @@
         <item name="android:background">@drawable/layout_rounded_bg_yellow</item>
     </style>
 
-    <style name="HabiticaButton.Yellow.Small" parent="HabiticaButton.Yellow">
-        <item name="android:paddingLeft">@dimen/button_padding_small</item>
-        <item name="android:paddingRight">@dimen/button_padding_small</item>
-        <item name="android:paddingTop">@dimen/button_padding_vertical_small</item>
-        <item name="android:paddingBottom">@dimen/button_padding_vertical_small</item>
-    </style>
-
     <style name="CurrencyTextView">
         <item name="android:textSize">14sp</item>
         <item name="android:layout_marginLeft">16dp</item>
@@ -605,10 +570,6 @@
         <item name="android:maxHeight">12dip</item>
     </style>
 
-    <style name="TableHeader" parent="Title1">
-        <item name="android:layout_marginTop">@dimen/content_section_spacing</item>
-    </style>
-
     <style name="RedTextLabel" parent="TextAppearance.AppCompat">
         <item name="android:textColor">@color/red_10</item>
     </style>
@@ -622,48 +583,6 @@
         <item name="android:textColor">@color/brand_300</item>
     </style>
 
-    <style name="BB_BottomBarItem">
-        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
-        <item name="android:layout_width">wrap_content</item>
-        <!-- layout_height is ignored since the height is set programmatically in BottomBar
-        .updateItems() -->
-        <item name="android:layout_height">@dimen/bb_height</item>
-    </style>
-
-    <style name="BB_BottomBarItem_TitleStyle">
-        <!-- Material spec: "Avoid long text labels as these labels do not truncate or wrap." -->
-        <item name="android:singleLine">true</item>
-        <item name="android:maxLines">1</item>
-        <item name="android:gravity">center_horizontal</item>
-    </style>
-
-    <style name="BB_BottomBarItem_Fixed.TitleAppearance" parent="TextAppearance.AppCompat.Body1">
-        <item name="android:textSize">14sp</item>
-    </style>
-
-    <style name="BB_BottomBarItem_Shifting.TitleAppearance" parent="BB_BottomBarItem_Fixed.TitleAppearance">
-        <item name="android:textColor">#FFFFFF</item>
-    </style>
-
-    <style name="BB_BottomBarItem_Tablet">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">wrap_content</item>
-    </style>
-
-    <style name="BB_BottomBarBadge_Text" parent="TextAppearance.AppCompat.Body2">
-        <item name="android:textColor">#FFFFFF</item>
-    </style>
-
-    <style name="ErrorText" parent="TextAppearance.AppCompat">
-        <item name="android:textColor">@color/red_100</item>
-        <item name="android:textSize">16sp</item>
-    </style>
-
-    <style name="HintText" parent="TextAppearance.AppCompat">
-        <item name="android:textColor">@color/white</item>
-        <item name="android:textSize">14sp</item>
-    </style>
-
     <style name="TaskFormTextInputLayoutAppearance" parent="Widget.MaterialComponents.TextInputLayout.FilledBox">
         <!-- reference our hint & error styles -->
         <item name="boxBackgroundColor">@color/white_75_alpha</item>
@@ -729,7 +648,4 @@
 
     <color name="taskform_gray">#99edecee</color>
 
-    <style name="AlertDialogContainer">
-        <item name="android:layout_width">320dp</item>
-    </style>
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values/values.xml b/Habitica/res/values/values.xml
index 51ed98f4b..2572ea591 100644
--- a/Habitica/res/values/values.xml
+++ b/Habitica/res/values/values.xml
@@ -1,24 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string-array name="task_difficulties">
-        <item>@string/trivial</item>
-        <item>@string/easy</item>
-        <item>@string/medium</item>
-        <item>@string/hard</item>
-    </string-array>
-
-    <string-array name="task_attributes">
-        <item>@string/physical</item>
-        <item>@string/mental</item>
-        <item>@string/social</item>
-        <item>@string/other</item>
-    </string-array>
-
-    <string-array name="task_reset_frequencies">
-        <item>@string/repeatables_frequency_daily</item>
-        <item>@string/repeatables_frequency_weekly</item>
-        <item>@string/repeatables_frequency_monthly</item>
-    </string-array>
 
     <string-array name="repeatables_frequencies">
         <item>@string/repeatables_frequency_daily</item>
@@ -27,11 +8,6 @@
         <item>@string/repeatables_frequency_yearly</item>
     </string-array>
 
-    <string-array name="repeatables_on">
-        <item>@string/repeatables_frequency_day_of_month</item>
-        <item>@string/repeatables_frequency_day_of_week</item>
-    </string-array>
-
     <string-array name="weekdays">
         <item>@string/monday</item>
         <item>@string/tuesday</item>
@@ -155,5 +131,4 @@
         <item>https://habitrpg-delta.herokuapp.com</item>
     </string-array>
 
-    <string name="frequency_monthly">Monthly</string>
 </resources>
diff --git a/Habitica/res/xml/add_task_widget_info.xml b/Habitica/res/xml/add_task_widget_info.xml
deleted file mode 100644
index acf11d318..000000000
--- a/Habitica/res/xml/add_task_widget_info.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/widget_add_task"
-    android:minHeight="40dp"
-    android:minWidth="40dp"
-    android:configure="com.habitrpg.android.habitica.ui.activities.AddTaskWidgetActivity">
-
-</appwidget-provider>
diff --git a/Habitica/res/xml/main_menu_tasks.xml b/Habitica/res/xml/main_menu_tasks.xml
deleted file mode 100644
index 1b58769d0..000000000
--- a/Habitica/res/xml/main_menu_tasks.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<tabs>
-    <tab
-            id="@+id/tab_habits"
-            icon="@drawable/icon_habits_selected"
-            title="@string/habits" />
-    <tab
-            id="@+id/tab_dailies"
-            icon="@drawable/icon_dailies_selected"
-            title="@string/dailies" />
-    <tab
-            id="@+id/tab_todos"
-            icon="@drawable/icon_todos_selected"
-            title="@string/todos" />
-    <tab
-            id="@+id/tab_rewards"
-            icon="@drawable/icon_rewards_selected"
-            title="@string/rewards" />
-</tabs>
\ No newline at end of file
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 db8f8f7a7..1914e4be4 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -8,11 +8,11 @@ import android.content.pm.PackageManager
 import android.content.res.Resources
 import android.database.DatabaseErrorHandler
 import android.database.sqlite.SQLiteDatabase
-import android.preference.PreferenceManager
 import android.util.Log
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.content.edit
 import androidx.multidex.MultiDexApplication
+import androidx.preference.PreferenceManager
 import com.amplitude.api.Amplitude
 import com.amplitude.api.Identify
 import com.facebook.drawee.backends.pipeline.Fresco
@@ -191,10 +191,9 @@ abstract class HabiticaBaseApplication : MultiDexApplication() {
     private fun setupRemoteConfig() {
         val remoteConfig = FirebaseRemoteConfig.getInstance()
         val configSettings = FirebaseRemoteConfigSettings.Builder()
-                .setDeveloperModeEnabled(BuildConfig.DEBUG)
                 .setMinimumFetchIntervalInSeconds(if (BuildConfig.DEBUG) 0 else 3600)
                 .build()
-        remoteConfig.setConfigSettings(configSettings)
+        remoteConfig.setConfigSettingsAsync(configSettings)
         remoteConfig.setDefaults(R.xml.remote_config_defaults)
         remoteConfig.fetchAndActivate()
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
index 3bb62df07..58aba1888 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaPurchaseVerifier.java
@@ -2,7 +2,7 @@ package com.habitrpg.android.habitica;
 
 import android.content.Context;
 import android.content.SharedPreferences;
-import android.preference.PreferenceManager;
+import androidx.preference.PreferenceManager;
 
 import androidx.annotation.NonNull;
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
index f1da145a4..c4e9a51ff 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/TaskAlarmManager.kt
@@ -174,9 +174,7 @@ class TaskAlarmManager(private var context: Context, private var taskRepository:
                 return
             }
 
-            if (SDK_INT < Build.VERSION_CODES.KITKAT) {
-                alarmManager?.set(AlarmManager.RTC_WAKEUP, time, pendingIntent)
-            } else if (Build.VERSION_CODES.KITKAT <= SDK_INT && SDK_INT < Build.VERSION_CODES.M) {
+            if (Build.VERSION_CODES.KITKAT <= SDK_INT && SDK_INT < Build.VERSION_CODES.M) {
                 alarmManager?.setWindow(AlarmManager.RTC_WAKEUP, time, time + 60000, pendingIntent)
             } else if (SDK_INT >= Build.VERSION_CODES.M) {
                 alarmManager?.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, time, pendingIntent)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
index 94210da93..0ddeb1960 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/NotificationPublisher.kt
@@ -134,11 +134,7 @@ class NotificationPublisher : BroadcastReceiver() {
             builder.color = ContextCompat.getColor(thisContext, R.color.brand_300)
         }
 
-        notification = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
-            builder.build()
-        } else {
-            builder.notification
-        }
+        notification = builder.build()
         notification.defaults = notification.defaults or Notification.DEFAULT_LIGHTS
 
         notification.flags = notification.flags or (Notification.FLAG_AUTO_CANCEL or Notification.FLAG_SHOW_LIGHTS)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt
index bc6d7bd58..73fec6b99 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/RoundedFrameLayout.kt
@@ -3,9 +3,10 @@ package com.habitrpg.android.habitica.ui
 import android.content.Context
 import android.graphics.Canvas
 import android.graphics.Path
-import android.graphics.RectF
+import android.graphics.Rect
 import android.util.AttributeSet
 import android.widget.FrameLayout
+import androidx.core.graphics.toRectF
 
 
 class RoundedFrameLayout @JvmOverloads constructor(
@@ -14,11 +15,14 @@ class RoundedFrameLayout @JvmOverloads constructor(
 
     var radius = 4f
     var isCirclular = true
+    val clipPath = Path()
+    val bounds = Rect()
 
     override fun onDraw(canvas: Canvas) {
-        val clipPath = Path()
+        clipPath.reset()
         val radius = if (isCirclular) (canvas.height/2).toFloat() else radius
-        clipPath.addRoundRect(RectF(canvas.clipBounds), radius, radius, Path.Direction.CW)
+        canvas.getClipBounds(bounds)
+        clipPath.addRoundRect(bounds.toRectF(), radius, radius, Path.Direction.CW)
         canvas.clipPath(clipPath)
         super.onDraw(canvas)
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
index 992c85853..9ac6af5b6 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/BaseActivity.kt
@@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.activities
 import android.content.SharedPreferences
 import android.content.res.Configuration
 import android.os.Bundle
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.widget.Toolbar
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
index b82f16098..29fd8a46c 100755
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt
@@ -11,7 +11,7 @@ import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.os.Bundle
 import android.os.Handler
-import android.preference.PreferenceManager
+import androidx.preference.PreferenceManager
 import android.util.Log
 import android.view.*
 import android.widget.FrameLayout
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
index 5d6853c97..b5cc6a7af 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.kt
@@ -32,8 +32,6 @@ import com.habitrpg.android.habitica.ui.fragments.setup.TaskSetupFragment
 import com.habitrpg.android.habitica.ui.fragments.setup.WelcomeFragment
 import com.habitrpg.android.habitica.ui.helpers.bindView
 import com.habitrpg.android.habitica.ui.views.FadingViewPager
-import com.habitrpg.shared.habitica.LogLevel
-import com.habitrpg.shared.habitica.Logger
 import com.viewpagerindicator.IconPageIndicator
 import com.viewpagerindicator.IconPagerAdapter
 import io.reactivex.BackpressureStrategy
@@ -74,7 +72,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        compositeSubscription.add(userRepository.getUser().subscribe({ this.onUserReceived(it) }, { Logger.log(LogLevel.DEBUG, "USERERROR", it.localizedMessage) }))
+        compositeSubscription.add(userRepository.getUser().subscribeWithErrorHandler(Consumer { this.onUserReceived(it) }))
         compositeSubscription.add(userRepository.retrieveUser().subscribeWithErrorHandler(Consumer {}))
         val additionalData = HashMap<String, Any>()
         additionalData["status"] = "displayed"
@@ -174,9 +172,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         nextButton.setCompoundDrawablesWithIntrinsicBounds(null, null, rightDrawable, null)
     }
 
-    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
-
-    }
+    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) = Unit
 
     override fun onPageSelected(position: Int) {
         when {
@@ -195,9 +191,7 @@ class SetupActivity : BaseActivity(), ViewPager.OnPageChangeListener {
         }
     }
 
-    override fun onPageScrollStateChanged(state: Int) {
-
-    }
+    override fun onPageScrollStateChanged(state: Int) = Unit
 
     private fun onUserReceived(user: User?) {
         if (completedSetup) {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt
index 9c86f505d..d13d7b5d5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaAutocompleteTextView.kt
@@ -1,13 +1,12 @@
 package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
-import android.util.AttributeSet
-import android.widget.MultiAutoCompleteTextView
 import android.text.InputType
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatMultiAutoCompleteTextView
 
 
-
-class HabiticaAutocompleteTextView(context: Context?, attrs: AttributeSet?) : MultiAutoCompleteTextView(context, attrs) {
+class HabiticaAutocompleteTextView(context: Context?, attrs: AttributeSet?) : AppCompatMultiAutoCompleteTextView(context, attrs) {
 
     init {
         val removed = this.inputType and (this.inputType xor InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE)
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
index e357bfe89..949c6d712 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/HabiticaEmojiTextView.kt
@@ -2,9 +2,9 @@ package com.habitrpg.android.habitica.ui.views
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.TextView
+import androidx.appcompat.widget.AppCompatTextView
 
-open class HabiticaEmojiTextView : TextView {
+open class HabiticaEmojiTextView : AppCompatTextView {
 
     constructor(context: Context) : super(context)
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
index 6143ff7e5..d87021c85 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/stats/StatsView.kt
@@ -2,10 +2,10 @@ package com.habitrpg.android.habitica.ui.views.stats
 
 import android.content.Context
 import android.graphics.PorterDuff
-import androidx.core.content.ContextCompat
 import android.util.AttributeSet
 import android.view.View
 import android.widget.LinearLayout
+import androidx.core.content.ContextCompat
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.ui.views.HabiticaIconsHelper
 import kotlinx.android.synthetic.main.stats_view.view.*
@@ -75,12 +75,7 @@ class StatsView(context: Context?, attrs: AttributeSet?) : LinearLayout(context,
                 backgroundDrawable?.setColorFilter(attributes.getColor(R.styleable.StatsView_titleBackgroundColor, 0), PorterDuff.Mode.MULTIPLY)
                 titleTextView.text = attributes.getString(R.styleable.StatsView_statsTitle)
             }
-            if(android.os.Build.VERSION.SDK_INT < android.os.Build.VERSION_CODES.JELLY_BEAN) {
-                @Suppress("DEPRECATION")
-                titleWrapper.setBackgroundDrawable(backgroundDrawable)
-            } else {
-                titleWrapper.background = backgroundDrawable
-            }
+            titleWrapper.background = backgroundDrawable
         }
 
         allocateButton.setOnClickListener {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt
index 95a5cfad9..803c9f6d5 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/AddTaskWidgetProvider.kt
@@ -3,8 +3,8 @@ package com.habitrpg.android.habitica.widget
 import android.appwidget.AppWidgetManager
 import android.content.ComponentName
 import android.content.Context
-import android.preference.PreferenceManager
 import android.widget.RemoteViews
+import androidx.preference.PreferenceManager
 import com.habitrpg.android.habitica.R
 import com.habitrpg.android.habitica.models.tasks.Task
 
diff --git a/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionProcessor.java b/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionProcessor.java
index c3d9e3191..38b2779fb 100755
--- a/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionProcessor.java
+++ b/seeds-sdk/src/main/java/com/playseeds/android/sdk/ConnectionProcessor.java
@@ -21,7 +21,6 @@ THE SOFTWARE.
 */
 package com.playseeds.android.sdk;
 
-import android.os.Build;
 import android.util.Log;
 
 import org.json.JSONObject;
@@ -65,9 +64,7 @@ public class ConnectionProcessor implements Runnable {
         sslContext_ = sslContext;
 
         // HTTP connection reuse which was buggy pre-froyo
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.FROYO) {
-            System.setProperty("http.keepAlive", "false");
-        }
+        System.setProperty("http.keepAlive", "false");
     }
 
     public URLConnection urlConnectionForEventData(final String eventData) throws IOException {
diff --git a/seeds-sdk/src/main/res/drawable/bar.png b/seeds-sdk/src/main/res/drawable/bar.png
deleted file mode 100755
index aafb7af6f37c6e0ca7a890659414696a9d12caa1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2773
zcmeHJO=wd=5T3->`bb+EkXkAt@8&_lfS@^~^hFXi2tle~MMD#5l7lo&G&L=XT|5Y0
z^!mj52ZAS~kdr@zmxC6e)MHVp2GV0RVv7}O)tCBacM3~G(1VBWA^CQ8c6R2QpXA!n
z@SzUZHWvVNgboM#0aOdZqS|VGb{=^(V14yug9F)PBZ+J-b}kP7p^-CjEi@cU#{1*3
zq4CV?xDUXU3kCeg$KF-vN{^KN?JfStCEvt+IJo$rbg=85GM4hK{Iu5c=DKxjc|Q&A
z{DXikD>eeR=i{j)ir?=>vCa^IGcntVoAm7#gsM@yiI`QS7n^xR=xW?5dwXNAy)lQk
zqFB=rfy0SVbtBTv>Qs-tDer4Tv0FpLz=2R%Wxl@CqTed*wm5xD1S!li`xL+_d~Hmg
z(ACfYYbGvZZWO)oriu@_jmjk+1!2L6^r411Dj16vlbosR1=IjX;Vj2_B3|g-g7Wkv
zz7DDp*~G=94g^K!kIQ`%sA6UoKAgwP-kENc%M&sE`5Ah+J;@^@OqY2k)hB3*=Kl*m
z1xmevRu=<)$sLs$_0)P#pe`w4vzp&!i_MH+(L@i|Ji+ZM-}$*yw1fF#=`^ZP>bb5;
zGd#n^q%=*z9f?9b!FcGT3)mhz0?>%x(-+@#+48bikfWilRhkhQBMcS5N$O5eqw{k|
z5g}z?<3cuGdx}BQOeb=Y^=XnP81I0beTMHg_IpjWqK81z5WO(FK6fyPujx&sM2sLE
zuY=>ia;ES+kDg7PL`0`(!>S?^_pckBj2n5I5*m3LRb%Ontfl3;WaLU4@*mz3(J;V8
zrk;i}O1HFPM5r4kb%wOj-|7u6n<yfqwlaycHAVg!{A%++_t(4kU$$P|Q71VR3<vTD
HqE~(cUODON

diff --git a/seeds-sdk/src/main/res/drawable/browser_back.png b/seeds-sdk/src/main/res/drawable/browser_back.png
deleted file mode 100755
index 5ef58954b615f75c17f223458138ff3719e6c069..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1032
zcmV+j1o!)iP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#s!2paRCwC#onM4hVHn1zKO$mSVu_*b
znoKs6-J8v%Y^IyCDP^xp5#2<QQlxC8lu{x}DRmR2SalOcO5JQqDW!<$Dk35x)AQ*a
z9nG$0cFvsl{l4#cdF<8BOz+S0&G~JdGp$yu<v6L%EMy;2K~}Z;%hS2PRA&fziHst%
zr}6>>lFoD^SCRWjv7HwpkoIQ>@)p^Y#*5A5KBqio<Ra3a=8Li+txp~~jf|%agAHkY
zMg&H8r`~`-nwuWv98&G{8}Z2czf&BPOWA4`Z^(vBK2>Q&PnK`WhD_`f*O7Z!!yu5!
zonl1m1MtZDGyUQeW$h0VdqbR4oE4`iTlhdRH>BfEK_JadQCd;8_~BwYvfQ7;N3(Pa
zHpG}yupx~zPtz#~<nPQtc4|8Xk1S(O5qm@O@;x!`D~ymD;{N;eBr@0ce~9luiqeXq
zP-^b$k(G3cU|{&#kkw+^^FzEm^r<1vDQ+NlLWSWAkfc*=2>nkA){m?~<UG=si)5@e
zBrhPI#00}?LxOP%-+`3GDVFCV9t%g7bBd$L^VnfnXh_gb;Zs8j$gR+w!UrJEDfS?*
zk#$_Z?vWLpQ&??CSFBE9u_0T;DZ037T_7cCMTINYJ+kH`oPscv8!{|TQQ%s2ffNM9
zFxRPjWF?(~Fq9iokuU8MSE$<%clml5c|;icK%7&&m!BNPBdbr2r$Meuw;|3cj*C+e
zhH^vb6owj7lFM1bFaqQavJBaZeC3Mle1}{?dXY<9lby?6*N|<<QsfoaWyeFFB1@3H
z$ak*Ih8X@rP9TerF|JM@NPRvbYb77KLVY0h8I!ggLw<6V`as<LK=#Y`%VVxn9|+yW
zD3GMPEI=-BwKjmb`G#z#yVwCjcQFd&Uw669b?XC3y32ZG4c)~Ckow%EyVwFkcQFWL
zB6s;h6#77t?$S$lu>*weVh{-3#VC-ZyDUU*5{RAojBJd}U3|D3P*m>X%l)#F?(&d8
z?2L1l70BjL-Nn~?E?x`OU3|W8Z;<X1!i|*c?y@@scM0Xr*3Ml{h2Sos-HhLRcM0|B
z2;RC&$j=X{yUSwa0fE?=cgRX#+$E-GP<i1lu|3By=`Jq_#Fo1ZAiJ!&OUzIDbnbG-
zn!E7f#Kzo(KpNfUh^D&`NTa(P&~z69G3G7=V$59#q<ME4$iiI+r1^Q4g}V@lF?S)5
z_TA+Jf!J~vcZqyBEq5W1bll}oTJAz1#@yw%00RI8g|xCr58K@U0000<MNUMnLSTXd
CKkbA7

diff --git a/seeds-sdk/src/main/res/drawable/browser_external.png b/seeds-sdk/src/main/res/drawable/browser_external.png
deleted file mode 100755
index 5a0c074f200c58ef45ff175ec60aa6321efc341c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1640
zcmV-u2ABDXP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU&3Q0skRCwC#oN0^{MHI(tRsoL<!9|UL
zA<-b3RgB_I&=q5XM^FKERWyi5RN?{A^@tjRACwR^MvZ>(Salb?a04D7q945V1B#j@
z9z+Zp5zV5&8eA0G_fNky<7C;HuI{dSGxh$-Ka(A%YMT0WRlTZuJ%uQWjOssKLf%0B
z$kzqbDTDv%2=c4sqZNn@Z6gmQFDD<PK>Vw~uOk@BSOp?S!^m%tk5?dabPz*1QGv+O
zf#lc8Co2#+I)MBdd7J`~qx~7mg$hKD8ptn`Z&Dz#^bmQj0+FQ$$u}zyS-PKmz5<b@
zcJf&YBp>atC{s^<g?vsH7qDlb4L^XqA4g3?$oug7jh6MH{1S3AhsM?_MDh+q){yTY
zznM{edyq$&c=z^L@=@eNO}tlyh8&pTwf{xFl)SVSfOM1RaY(r<WnH-I$MZ09DtUCq
z4PS291C)+x2GT}uA#X}q&jb^n`T@kjp68-zJd9P<9D)m<O@1mx9rX<1YVt`!dOLdK
zVjeDEtQH`f$&<<NS(e|MJd=DQ`7oh@LpwuREFB0Y?kVK;mgTX*cen9)_MM=8pX234
zyHp@ZBDk2`V^J2-(gO0-DhjdDL!K>q6}2#Yl!qxB7}HIho>NUQire{V@(f8)7S<JK
zTa+72et;+KY8Tr2cJe~sKsNJm^Si|mg(zjLsVzN0zJ>vLnL}n+z(BSK_J~HB+S4o^
z#%7g5anVCoo8+l9<9PBPYHC}pJQVM8IjP^4@bgHySr!0{-jSn~Bd}CGq>$4EV$bPa
z6X!#Pq(vM>?v%9sjvlcjKp4<89<63d0aD;a(-;%3utWT#loP|d$mg1{g`Mu@66O$W
znXf9I*aFl#6YuSP<r~Og4vR+x3}ZFJ*x)Mc?N9Rqhw(OfVlNEeVefI|PfWOp7B7*n
zByTT%(`OG^7%+^-IjY)T`VYQ<oJT$*P#E`^_}IG7L=GQA7NV(7dB_S$Xy-ZPhx_}G
zk0E1ffG~bD@goe+m%Y;+_mI8FUmBT733-OKII{k}k`KG?A(I5b*ka=6(((E?-(<s0
z{P<dyVJ%XWx+*Q;8pySt8o!Hs=I7+k$ZN?P$$xUBvy*|`O1>}8uvQX~Bgv;Z{5~}L
zN;W|JTEV2-lhJoSM!vyVq{O-e((K^-(C8gJc_KsQA5UTJJd1M3c3k8N$N-aX`p!CD
zY~i41lkua7BdJF$$~N$g)Z_{X9s_91q26yeu5aTBI<0K8?(rDHRh5LbeF#Y$_+f%E
zE{Cj18Q1rRiF368V{3->+5qX|ZID$KWdUJ@iGS?I*&KrCWnzZ)AxCyT4^zH{o^b*B
z1B<dv+%xKn-*mB;b%@C(DH>tw<>V`Jgb^j|rBf_nTt<GY6oxAx$gvufvJTuyr|_hm
zrz#z?elqcsw<|2ZqlNz;1AT?PO)1MGogW!~JB$o<a?kiSVL5E7;&Hv}`}<JdJp}ci
zkYf12%6Ym&80C5hhNm+vVBq1R7s|nK(L)eDjJ7DZjkg^-9N+!@0a?cLSJLphfy<7U
zuu^a2yCaFPu)B!-zLBFR$=6w|{73TSeYljZlcc}w`2&ZMUwB+?m+D^fotE|CATCiR
zX5K)O{8r&RJS1%N*b|C}te<)Hy)s38iPK{91X7n^{`k<udtF<E3{h+OdcJo3#d!ij
z^7QZu!^p`(VBkdaV-9P7@o@op9^qnjzNXA)F)W-;{!U2Gz^($$zq>uG{B!RiBg(+Q
zK2WnD7|?p(7m(+|u-vnOvyI(8P)(~Y=N_^<;Si@)o8K*vVY_)BlV*!Hy?Y>irPE-`
z8hcYc+Vt*$H1zS_Tw#-VP(X&1{Ec6Peny+zACTfrMWpA<(dL!|<Q858syqVeJ)*?s
zT$?s^Wy*8wq?>mF@aREjpzRw;>LL4@IB%*`?|T_N1PegqV{Hw%eIrRgaE2WEUX>^y
zDq(YoN?6#dQXmRMr9c#jN`WX4l>$*I5Cx)2D%;G(NSjW3hyqb55Cx)5pg>d#M1iOj
mhyqb55Cx)AAYtoY0R{khpi0>%H6%s=0000<MNUMnLSTY6{}Q?Y

diff --git a/seeds-sdk/src/main/res/drawable/browser_forward.png b/seeds-sdk/src/main/res/drawable/browser_forward.png
deleted file mode 100755
index 15ef62a275fc3d54971e9174013c658c8e84c9d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmV+b1poVqP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#qDe$SRCwC#onK^@Q5?sgo)QreUB!q}
zmR?P}DWw$M#E34sDWw!KP18h_5=)69Qliw=lv3K&t0_&pX_}^2ucn9?5fKr2`#$zN
znzwE5zvp?*@0|1f^0k}&Iq&)So#%YKw#}<lDp3=8g|0?>(fbjTTH+SIb{TpPeJ*eq
z%Ro%Fqwmmj=pt^ZeIQ8|qGtrmE^e!RASNr(XXpcTIk(q75R*OV2lO~PpWAF7NRq|q
zRrC$Ifm>}Kh{<|^auZ#`Ew>NE<Ouo^-N$X$0fg?N5J<JVT%fz?0Ak$bH2R+Iq63J@
z3c8CfAaoa{K&stkBZ25i;x4a4beCB9`hs(p*nu?$<u0*9Yc=lD@3Xtaj;%Lwms38w
zOYG>ny>*w^@%0;bIpK@D#2&nc#9gkSZ+&o=*rRD*=YzZW1jGw>@e#;$cX@%f6NsK{
zm1m1H?&3QT=iDU(AWpeUNI<IH<)lV;2@!~KmrEMmB~&14-6eD&)$VeDKy<mwooMQp
zk=hAFPd3|h7Xne{E(B7ayF5bM2t-eI%d}+fE(D^?T?j;(yAVig?(!*ZcOj70vNUaX
zArNKmLLk|=OBaFYa+fF4HUiO;u4deYK$N))f#mBhx8-I=AWCv5s`0)Hfhcnq0<n`X
z=w-A-Aa?UdK&(Zd&h!ZjxJS8V1U-t5^Pz4x-_e8UrdluvB>UV&SINh^!Xqo2l;n6C
zZuAQ|A?fBP+J_dJfx!t$H_5H3TduTChd|PCitgF2u{^T!%Ww4JTu#9W$uGn5&@QF@
zjX5FBImMPNU=T=Sxz(ss@W{$0<8nNW<nhBeA+?>NBQF@7klFJX?P=912&DCV7N;1r
zwE!Mj|2xH?&4qA6qUa@hEURlQC#3#-L-(WGw7>`%h;a&a|6wk)BP&;@;DpTW6g_!6
z1t(<YJQNsTU0AHoK&(3jkF0-AabAN{a6+PJNSvbV>I?8?LX1=Fa2bX#KyGMtiqMX%
zG4wDx>eHF);)EEd==2SSixV<{_PXK}J_DJM+f&hZi`9N)8K)?O07LtP6ved5Q9#i+
zA(QA{bZ2NVGy=Jfu91g#kkN8vdFd1`PRI{=PIM54{RtTm!J8xoyFh|*3hhVMFZ66Q
z^*#k*Se}rgOvMDZ-0p--cM8I=2qgIv64yd^3N1(0s5r$Kx7Y537^mnY4Eqz3ynWh7
ur?3yCEVrj2Zl&EL%Q!`WFw)Im0R{l7)4mk85B&T90000<MNUMnLSTXg>f{js

diff --git a/seeds-sdk/src/main/res/drawable/browser_reload.png b/seeds-sdk/src/main/res/drawable/browser_reload.png
deleted file mode 100755
index b159c757e08e2a43ddf68b57d0caa19241307acc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2054
zcmV+h2>JJkP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU(s7XXYRCwC#U3;)rQxsp9n@V96qY_gd
zrAQJDB9A<pn38uMjVKwJ8VrN+m{i6yNg7FY^$;aJNF>paN>NH`=!J?zRMPA6S-;t<
znfnK~@0_#FclO@jUNgU$duQ(5d!O?=d+)W@UTf`=TrNjJ?2-K(8Rt`s9~h4_4)vLk
z5(j2T31bDLk^H`r(U&nQ%#iG4SB0OCW4y|k$v7(zVvn?C%x1jEs2>QiLrNKUFg|D8
z$v7YoVu#dayukQ`(Jl~TkF;V;XN+Mq4usevH!$Wi9$_3D2(d#BVf10lV_Y2wu}7LP
z#xtfdP78$CBkdWVGM;4|5eSJda3%b$)K*o--HZi{?u`8dA^A&9#u<#>j3brXK8o=&
z<738oHa)a$zN}h|^BEl&Z5Ry-Gy}^Rk1^H;LX5O#+$coU%V-S0k?|@IX8cu*gkZVs
zNXF%Hfkm@)3FBeL)M6q8GvR*5nHKM1lf<z6+Gj#eA#;{-nIo$5pJaSw&oDOoL<rQ)
z2N?G<4s_6lSuIxoC?5#HtiYLt4~Iz~%KkFfRYJNl29jeAzI{kJ;}*tfmkh%aS$9Wx
zMg|0jVhz)5Tw7`|Mv_Aw)(Em$KD2?ZELm`Qzsb1JLo&)lLtO33rVcWuFwXUih&hZ$
zWkYvH?X4zcT<j4M>lpnQ!(}5c*aoE`BRnEwH)9CnNyg7vXbedOUeeB<kntWFcgcdR
z29R{gx`Hv$10q()hczzifg~ZMp?pcT9VTL{sIUVVTWm3M;s}mDhZTqncw2EsQcJnr
zaWX4b*z|?OwbXAX6I+|6%$6k)ks{wKw!4sVDdT$E$cQ^b>WhJt=6Vjjf4s8t@eAV#
z(V%wOx`xJiP>_*U(#&&Y+}st{^OA&ZmWwUXpYfyZn_5&tuzcK<!Z?0q^kBTD-0nwY
z+~spz(K4bE@(}6AGJQ+N5xGRM%~fJ$BeBP+B+4j+v?Tqb*JZN7YHiwx78xv7_GWTW
zq7c$cd3LN3g0;w)B3AYia#-?Jdyf_sRMQ~CGPPErt)()y%UvfU$_%-NOlYT;^kjUI
zunjCpPcsHlhJkHa5Q1e&(|L%Ec1*<osq!Cf^p(xqE6HccI+4*_sXw^0?~C|9(319^
z(tSoI%JF6&$;fwxv{&5B`-#OIRS><>luUj{Ie9Gkczb7&iAYZ>-!V>R?4%&Emn>u&
zovPH=pg=})LYk2YUPvm?h~5aVJ2@dOl=?x!<)-kulM|w)UA-M%wGJT~)eyFkL*7=~
z38|yd$8yGo@TzqP(KyFm8eX#=A=MT7_$It&Jwi$p`dA-cvmPND@_TsAb`cV+bIS<v
zO;AoSmk^V)B&51WWMEINs?g5vED7<c@G<gW4pL}mdt5^PQRuwBM})x9su9opM_fX7
zD0JS`BSIRGPFC^8xP)lLHZ}8z5Upp~5SI{*l&%vzTDHzsYG-X+LNvnl5kAz~12Uj3
zwo%&9*Tf~{E2W3&=m8<ENT<RbA~k=COUNRnhe6~@9mfgLiuy-JSb1DR;5ygvML}J3
zIa3$G9-Wlhs<e{Oz6ilN_?JopK`Fl)juL_tK8>>>*mbj$5CVB$>7kBc+~yz|SZaGI
zwT0NUWl0Hnm-Gr5qpDn8#|Y^|dKtjDxnXxwLY6BoTZfa$33o*<Vsuk%Z_>X0ARj`o
z?!BfssOuQFIzR?Ko}r}YfL%s;lm^VVvk7Fvd9>ttvb#hqg3!xIw{jdx0`AcwWWA80
zCD68zhu+9iLI#WNq$No6&a0wnl<7E#bW;J~-$F#=@s^Q+J+6mxn`0`o&f^jSH_Bw?
zfntWtV4Q9N5xC*)6~<l4?IPVS?;4F!H?01opD@#a@d26IBUuT?FfAoz0|h}>=Ka@5
z*olatx%A{E#$hqWlmwj_>r#52O^kX`#uMiO>Pkmx$tp${Mrq1KG-pi6r7OLojw|lN
zbkC(P^W^KTp-e;z#xTZ?l*d1pQ6=j5;#QPHILtfBs^R|$*58Suku9QlIqAoe$&<X6
z%oRtaDUTVk2&i?xIP!~4P~s2wIHAN}A#XfGdh|je29__*rV+uhQ#=aLlxm8V4Rsm`
zN2t+)WYa?4%5YCy7g5q8m?#`Gm9mY1+$k0?9t7#zRSPf!Dic)pj$LM5qmc50q7DZ!
zr-A2CC2?1UAOwO!%3X_`jE%BCB?=7DBBY8;)ec2U##T{q66aECt^Iq%(w<R-WZ<5v
zt4JxaRdX{&ywR1S4i}4HujnMMAF_>*ieJm<A|L}5PTMhNYBrjNx{8{(T`1k!zF7;B
zc2Fj2zIMZDUkZlfS{(M&_K1u!GEpeo(r7$wgYI?F%V&8&1Tq1-iF&^+txgJIVIykg
z5;9k<ZgG?hC@KgTAD(tcg}!>V37I%2S8i}ak!ReXFt$(~W_39+u17-c#kQ6bf%~V1
z2nsr@v%XIq)@@HAsML}fF;bSMOzL~ta>0E|vGieNH7s!7+ePUZD|^NEEMJ5zgzOch
z93xAqgJ@@sQ&K!o85QR$(*@R)oVAURih{!?Wbn3<8FUhv=#Xj=+rhyVJhAY?E*7J1
k5m{Pt&}Kr4QvMZS0F+w3x5OJp(EtDd07*qoM6N<$g8wGJlmGw#

diff --git a/seeds-sdk/src/main/res/drawable/close_button_normal.png b/seeds-sdk/src/main/res/drawable/close_button_normal.png
deleted file mode 100755
index 595384f2c9db5745ae3f00e2c9698992b4b941a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4730
zcmV-=5{2!FP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000VnX+uL$Nkc;*
zP;zf(X>4Tx0C)k_mUmQB$sWh&-t-26K<E&9?;WJqPz0%hsDvbh8bYXILquG`wICt_
z>WZ$2D7Y5dS`bkzECLF4H^?HOtcwLvQF%A;U_Ix({qOzr=A8M>=l<q5znMGboG$?6
zPL@EB0#gA<<!1^*eB2q!qoNtO$AAD-0TsvtI*Xkla0?C&0RLD%3<5~pdDmE+>mS4Z
zdxsQ<o52PE3P!r)I2r6zgwG-TjV%yn0sxD-Hz!koFscw?86mPjge%0%o9B~aj+^K9
zxtOpJ4<zOu0C+NsCFB7>5+Qy@Hk*g!AtMOP_?$#O!e$6NvlCbxgars2rKYBdxf)@;
zxbO1tzGD_EZZRi|#arb0e?dkf6MH6R2vS&U=05(HCN(7s*{``GjaV{2WoZD?(vdpG
zVR`y5upnjb%;x-Det77DpC7k0Xo2H}-XRMt$aMdXgTog5c?lj%7nqyjwU{S~<tIL~
zx%|Scknjc0$PV>d;Jk#e$OYzbJs17)iQdcwe_|$cajxVv|HU<cFpvPU03UDw7YIQd
zNCPPVIlWA7E@A=jNE56PCh`(88E(j};~FuTe71=Z!@|tmT-^PCQ^fCWezEW9bMFYE
z-}>8^-VT6$G4dwFSN-2{EKLAfUjRV+@V8I%Epioh0dTRGoh8hk&xaN_7(fJ)Kn5rv
z?^zS*0b^hRY=9$h1zx}p1R=W|1y%tzve&7|F6V%CU=t_;C14lW3o5}Oa0DC&r@$G|
z3@(5x;5xVsdcgpA3`AfAyaJQp1DJsz2nSIh8l(WJLE4ZZWC7Vh&X5-r0EIwNP%OlQ
z_)r$K4%!TrK&4P6bQr3Get}w{E6`1-4|)g<LF3R{=rfFh$*>Hp0_(u0upR6M`@>=I
zN|*<y!+CHayaTR)Yv7Y`6MO}}4G+K~_!T^b0w@xSj#5V%qwG)~s324{Djp?7Z9o;H
z%273_22>lW3w0MILQSAPp|NNhnt?V(JEDEj;b=BG9lZg)9bJh&j&4GCqVJ-I(39wI
z7z#!iV~BCUFfq$9JWLLz2vd$ZhB=S9h8e(&U_M~6SUOf0Ym4>8Mq!h%Yq8t02e6IU
zc5EMZ7(0c-;S_L&I44{Xj)lv_72)>dPU0@(`f($;k9ZPZ4R3+>#z*7%_yT-6{sjIK
zz8^n|pCM2Q+5`te5P?HjL)b|;N@ye8A&d}ah*Csdq7yNUm_*z}tROZJuMwXR-;qcp
z4U#=+87YyJPpTlDCfy(nkv@^7$p&N(att|(yn|dzZYMt^zoSqnIuut*G$oU=gHlJi
zN_j^4C_$4jkzh)2BsNM^Ni<3HOT3mONNP*ENv@L2lPs4!D|tt9f=Zz3P(7$D>IP~R
zwUv6GIweJuGM5UHN|o9!bwcW<)R;6*T1VPTnj>8(eMI`I^e_!Y)1-OO*tE^GqqJ+Z
z5gDwEt_)KqNv1^RluVDzq^z{8m28A;u56X;MOhIYMc1J-=_&M`^fUB9`e!*6IX5}3
z+%~xexqi86c_n#Qd9Hl1e53q;{AUG*f|o+F!fu6Tg{O*WMFYiUiaCl06|X5yD9I=}
zDzTM{mCh(VQihccltYx)Dj!kqR-RH(Rq;^~sO(p{sxqNUS9MiQQY}-xq&lufQ*%~J
zR4Y@vtoD*2%Wz|)Fe(_Gj7fE6bzk)?^~35t>N6U;8sQoR8jTuHHHn&bn(>-tnjM;x
zT54K>TI;mxwH|2`wC%JLwD)OuX;16u>O|^n)oIol)0Nj{>gMUz>psz==(*^n>(%Jp
z)5q%D=_l(S(C;;X4Xh0k45|$77{Z1&hKYs;4Eu~QM)pR0qZ*_8#$;nR<80%4;~^8e
zNq|X#NwdjoQ!UeI)7_?Brr*r0%~H&cnmsm`Hup0xFmE$|Yhhr)wy3hWXGyX2w%lmh
zV)@3((28qy(CUFT%{tI}t96I<R~uU!p-qF$xUH6LtZlXJeLESuV7u*hH|#O??)Dq)
zFW7%_uyM$AIOFh_qp@SM;|a&HCAv$vOO7rXcG7TSIURNqIWwGNoquu`xv0CaTxwjN
zyK1^}T#vbqy6L+mxt(--?QZ5SbU*Jt?cw0D-lN?U<>}*D?AhZb?G^4->GjN8!<*+_
z?>*^b?X%XW-52BQ@4MUgK2wFsX4Ww${cQc#`*r%0{X_jL{htRI1PBA#0^vZvz&(La
zmTE8MFKrG2LCl~%K~IBqgVTe5U4~s2ysT>3ixBgWbs=4$w9wU|Cqh4jxrglxdmOG8
zo)z8^AsG=9Q5P{C=^0rXDOzs2eEss<QHoKCQ7zH9=!ocJ(NinDR_t9d5@Q`x6f?L|
zcV+I%o2wL8rL4NRT5>gO_1RcVY-H?-*e|RgRt;+^ju}@SH_7&3?_<B>xN^!k<6I|h
zDR(s9DZVs*jOWDL!y8X<NhnX4Nc2doOnj5%n{+5?Iyor0HhDHBGNmyUpBkIm%9rLR
z^E=a2({j`L1crhlfhgS}eQ)}t&|i2g1Ik#L(UK{H2%GLKy{s)+L)p&RRoNeNB67~=
zO6Br%yVn@3*|ugh&pYquwdl3%wH@o!*KJxiwBBv~;SJD+xD6c}H8&P+9Le{|KfZ~$
zDS6Xx1!e`M1@AXUZf+}7Da<b%-r}>RzDS}-Sag4@<JLnzpnpjGp=X=rw*A|_6?2Mj
zm6(;3mwegI-hS&x^B*gIoZS(>qi3hh&V#$KyZE~Xcf0I9UMf|ZS30~Wa8FYiqpY~>
z{od7kZ<bq?AKFLUm$gq+5m3>xUu*xa{a-2*DhI0Es~W47tG888AK)D5Kj?a};gHIq
zl0%<=O8n`;VV}cIH99rrN3ch-kGwb<akT4ayPxZhDIP01_O+H@D>@!>ytB@>uI_~L
ziJkRueOCSW$(WP9r#w%!G#ED=ZlpJsoCc?}PQUym_Lspk{%1PQ+MR7Ur+u#aJnejO
z6V$Y(X|g$?S=18M(%0(O+R^6NcK%nBUu!R@U#Pk$dvWI_;-$h%vzPNOPqho$C$8|W
z40o*VczkvF)q9=GI(x49U%PSL`})-`x30@KoNipW>2S04mffx9+cvkGx~;p<|7QK$
z`5v2|raQKGT6*n!+xnLDUFvt~zjD{}?)7`jd$$Lc4)hI%4?egbb6@m;^I+^@%ELF0
zvLDSn&VPb=Qv8(qwEUU!vzp)ae{U4oh%OF!4s|~deg1fuJ^bpAj6c4N6uzLmC?8cD
ztsAo#yD;uO-urUJ%aK=tS2Ghue@gvX{aWw!xxZZh>YiLaIr2vMX7=s&cM9)n-&?)!
zm<pbH_96Ad%yjWbg^$NS*?sEz9Qk>4Cg%(8OT}0HuWjG_zde~vot+i1gseF&fI=)B
z9}mFWS^y|fh<4}&fG9Dqhvy=oc@2-SSj*4p`Tyj3%{&)x13;}S0O9!n1hfNi5UJV-
zlaW>|3&UIiY-zbz5s$cJ#9La-0Ynxe(&Xdp>^l_zaBTp570%Ai9GIQ`dKA&^4*_UT
zpV#5yXe<?gQe9asS?;Z^s`+!{zcc>=0<-FCPF=rx00009a7bBm000XU000XU0RWnu
z7ytkVq)9|UR9Fe6m`R9~R}jbF^r$oAHlmIWD(;HlLCHZBy(HwK1{94OB#fSO@T3qA
zqlSct2M?l%5R_4H#eG4+fCi#?^Pph{L0oWOaGT89U+4d;?s|OPcH>AMyncJt|5eqi
zs;{eZxm>7Js#LUIrS-)3?BBnC@|rbkCL~Ex+u7MUsHUc-Zoq&6{aEkr?(S9T)Ukgx
z-*xuv*(WPjtoX;zs?BWOx;1RsvPEPoFlN3&H86#9)t4_{ZhH3Y*&i=ozHHT8pUU&+
z&!0Yg`0&t$3m1M8n0g(m#4FCnPRZtsj}II;@Xh`E_y2BhZ%>2B_Vo1hN<!Ikl{Iaq
zTIuNM$hEe$w(i-p=huY`7uM|9v7_$Tv18RpOw!7z<?@EbI+{oqHkgWT+_=#^bLPyS
zhYlTDt2v1GzIgGXTDPt`ckW!cd-rY-GgM{grMgg8R~Kf?m=P8&S`@~QAD<gNdURHc
z(5&w2>I(Pn-D|&f>(&oa`{}D!uhw3>cCCB!=FQkm-gX>Wp^cJx^5n^05EM#}Kx7Xd
zJebU$JsYrns<URzN;o44C!*7%nuXq@N00tmzI^#gb-88a$vCaDxbW`XyA~}{Fw$Nb
zXEJ~O{0O44u`wAjVni}><jAs>HAyD!pEGApa{Bb?M5+W>7ld!$zWqTL`%2w_`e>;R
zDC#gJ8MBeyyLU&z6DCYZ1`QgN=oQ7ea?)a*%HD|+C&s-yckWDNa}iWqTic&HUjq<q
z$pC2rFb3%Q_3O>*Qw+@Z?c0sms8OR#65L#N5*d^Olb-9}zrUSpXlO{F!P>TM+Y;HG
zt1u@!{Z0H34DO|hjv?bUNmU&ho1S*<+GPYLO`4QI7@`p5<^u-~{46LLcT!zlZTmRO
zMO<1)O6oIv63_NShYrmXTf<^16QgRLHeghG&^OG-j2UBKh71{EV>!79#OK&oS_cmv
z9OqW8T4jCqb1|0`Jm3Yx2M-=xQIp3)2d7u?Gl>?nbLY-AA{=(ftY5!A(UVUwZ~({^
zSS<$z)iQtL#EInf>(|MK4I4h8hoQp@K=0qb&t184WffQq6&{!cm9CbS7CSs;$`pG^
z5ayPzUcKT*R!^QhX?wUez#J5k89sctjgKBZ8uv>rNmEmk&2vFl9lYQP;{t{d_U+p@
zS>d3K$)``BW~Wb|ZU<q6h%=dtjnAJy9~o$?-5wyrh7C&q#*4xYFn8q0k)plQfX%a3
zTU#4#aN4wK$useUw=mq5&zg#-{hA4t?9H1u?VvntG|0387xW&PxuozpW5<rQvuVkQ
zW^(c3#R$f2i-+NU3ZB|$VMZ?D+aTLn2pZzgrcImdFvL0Jsz|Hm)TvVu5DXdnJ~_Ce
zH3d~$<Av4N*T;SAcRPb;A@=3oym|9okkNe)AcEwwWy|c)xN+l(4nqJH0*rpCq>djy
zo*X`WxCo3(reD8)rd9{-tv?oc!W#_2vNC-9`0+;vw0QC2ihvvxHbei+nKMNIL?ezJ
zjB=u~U^wr9;OT($+L|&FrzKa~6eK#DAaz+=`lACOo6QF4KP*|YB*=zri@>-)3uFOA
zdcC$F0}gNBzAYtFG*+mLW9`q77JN}rrWm9KJL72w13*!HP8SXA{nC;l?es%>=GJxM
zKJTqwiRC+wA3r8Sht;cB+Y%C$d$7LJiXcM|@+(21Bgpprc-hu3$0ArVN}4)+r*!V!
zPg)st;MQ`GK~Fm<jKn>t2@qbEE?sKsL|t62EU3IdLz<^y>C3anfA}*kb$b4^1?Ce&
zCv-5+L*SLt_v-Z0&mJrl9iw|_qP7z$b$Sj4;v{YCD|HF(JXyn=)8gYAN9Xq!9HTvZ
zob;!mV_H6RaG216AAtzBmH1;NlrWDc$LZmt+$EGcPY=lK#}&BuCv*_5M3>OfN*F5&
zu6h;S%8QH<*`bS-;7ZhXKrR_Pu!DeECFl9!!-r(;+O<ZP3?dy|;R&D^T-7g1KS<^m
zELdQNabE7gHg4RQ5VbE|x@2nv$ut-MIVcYkND(m2&CL;v(@Uiv38@b$5Ln!Q6eVbS
zH4zX}@Sx}^1dN@j14*}O19r(k16t)0G?GJ|w?rR6Wm8zvOqd{E2>H#JbAV|OrF}PG
z<^cf>R~5ARni20DX*20F(gBP1S5ERt$ep0852IwRFV!T{kk2|@GSDo<E(28fumDU<
z@@-H+h=<*)KE=K~Tv7nwhP;q;YElUpd)VtzVIQ>8U<#jH@Q)aLKx?XFQ9-mtEd|N;
z;#)96XHIg(3-k}ghLJLURUfnF2^eSmLlIiggs@Zv59c3w`-Hb~A@#w?`5qE-a^R^`
zr$%57uu{uj&J>b)`@(=&iDV*AE#?1p5W#f8uwWX>{n?<uSnSUR<wK#hwKebuf-Y|7
z36#Vp{%jyU@jn}+KGK6KNxt*WojbqJn>X(lJCOeq!gv+N@l)C*<ZVR#KmLv}4~#_c
zGd%6oYl2VYfn>bKj!&doKCh{OPyb<MUnrXYY~gDL4~)};h7Q0l(k+aOFgU{~v2;hG
zw!@l>V*T7-dZZBY;_V8~oyxNxtXsG4UW#TWPcnbY)O_sz2ayXZ+4hm;)Bpeg07*qo
IM6N<$f_HKJg8%>k

diff --git a/seeds-sdk/src/main/res/drawable/close_button_pressed.png b/seeds-sdk/src/main/res/drawable/close_button_pressed.png
deleted file mode 100755
index 2669d879537dd34348848a66b19590bcdd6f9f29..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5091
zcmV<96CCV`P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ000VnX+uL$Nkc;*
zP;zf(X>4Tx0C)k_mUmQB$sWh&-t-26K<E&9?;WJqPz0%hsDvbh8bYXILquG`wICt_
z>WZ$2D7Y5dS`bkzECLF4H^?HOtcwLvQF%A;U_Ix({qOzr=A8M>=l<q5znMGboG$?6
zPL@EB0#gA<<!1^*eB2q!qoNtO$AAD-0TsvtI*Xkla0?C&0RLD%3<5~pdDmE+>mS4Z
zdxsQ<o52PE3P!r)I2r6zgwG-TjV%yn0sxD-Hz!koFscw?86mPjge%0%o9B~aj+^K9
zxtOpJ4<zOu0C+NsCFB7>5+Qy@Hk*g!AtMOP_?$#O!e$6NvlCbxgars2rKYBdxf)@;
zxbO1tzGD_EZZRi|#arb0e?dkf6MH6R2vS&U=05(HCN(7s*{``GjaV{2WoZD?(vdpG
zVR`y5upnjb%;x-Det77DpC7k0Xo2H}-XRMt$aMdXgTog5c?lj%7nqyjwU{S~<tIL~
zx%|Scknjc0$PV>d;Jk#e$OYzbJs17)iQdcwe_|$cajxVv|HU<cFpvPU03UDw7YIQd
zNCPPVIlWA7E@A=jNE56PCh`(88E(j};~FuTe71=Z!@|tmT-^PCQ^fCWezEW9bMFYE
z-}>8^-VT6$G4dwFSN-2{EKLAfUjRV+@V8I%Epioh0dTRGoh8hk&xaN_7(fJ)Kn5rv
z?^zS*0b^hRY=9$h1zx}p1R=W|1y%tzve&7|F6V%CU=t_;C14lW3o5}Oa0DC&r@$G|
z3@(5x;5xVsdcgpA3`AfAyaJQp1DJsz2nSIh8l(WJLE4ZZWC7Vh&X5-r0EIwNP%OlQ
z_)r$K4%!TrK&4P6bQr3Get}w{E6`1-4|)g<LF3R{=rfFh$*>Hp0_(u0upR6M`@>=I
zN|*<y!+CHayaTR)Yv7Y`6MO}}4G+K~_!T^b0w@xSj#5V%qwG)~s324{Djp?7Z9o;H
z%273_22>lW3w0MILQSAPp|NNhnt?V(JEDEj;b=BG9lZg)9bJh&j&4GCqVJ-I(39wI
z7z#!iV~BCUFfq$9JWLLz2vd$ZhB=S9h8e(&U_M~6SUOf0Ym4>8Mq!h%Yq8t02e6IU
zc5EMZ7(0c-;S_L&I44{Xj)lv_72)>dPU0@(`f($;k9ZPZ4R3+>#z*7%_yT-6{sjIK
zz8^n|pCM2Q+5`te5P?HjL)b|;N@ye8A&d}ah*Csdq7yNUm_*z}tROZJuMwXR-;qcp
z4U#=+87YyJPpTlDCfy(nkv@^7$p&N(att|(yn|dzZYMt^zoSqnIuut*G$oU=gHlJi
zN_j^4C_$4jkzh)2BsNM^Ni<3HOT3mONNP*ENv@L2lPs4!D|tt9f=Zz3P(7$D>IP~R
zwUv6GIweJuGM5UHN|o9!bwcW<)R;6*T1VPTnj>8(eMI`I^e_!Y)1-OO*tE^GqqJ+Z
z5gDwEt_)KqNv1^RluVDzq^z{8m28A;u56X;MOhIYMc1J-=_&M`^fUB9`e!*6IX5}3
z+%~xexqi86c_n#Qd9Hl1e53q;{AUG*f|o+F!fu6Tg{O*WMFYiUiaCl06|X5yD9I=}
zDzTM{mCh(VQihccltYx)Dj!kqR-RH(Rq;^~sO(p{sxqNUS9MiQQY}-xq&lufQ*%~J
zR4Y@vtoD*2%Wz|)Fe(_Gj7fE6bzk)?^~35t>N6U;8sQoR8jTuHHHn&bn(>-tnjM;x
zT54K>TI;mxwH|2`wC%JLwD)OuX;16u>O|^n)oIol)0Nj{>gMUz>psz==(*^n>(%Jp
z)5q%D=_l(S(C;;X4Xh0k45|$77{Z1&hKYs;4Eu~QM)pR0qZ*_8#$;nR<80%4;~^8e
zNq|X#NwdjoQ!UeI)7_?Brr*r0%~H&cnmsm`Hup0xFmE$|Yhhr)wy3hWXGyX2w%lmh
zV)@3((28qy(CUFT%{tI}t96I<R~uU!p-qF$xUH6LtZlXJeLESuV7u*hH|#O??)Dq)
zFW7%_uyM$AIOFh_qp@SM;|a&HCAv$vOO7rXcG7TSIURNqIWwGNoquu`xv0CaTxwjN
zyK1^}T#vbqy6L+mxt(--?QZ5SbU*Jt?cw0D-lN?U<>}*D?AhZb?G^4->GjN8!<*+_
z?>*^b?X%XW-52BQ@4MUgK2wFsX4Ww${cQc#`*r%0{X_jL{htRI1PBA#0^vZvz&(La
zmTE8MFKrG2LCl~%K~IBqgVTe5U4~s2ysT>3ixBgWbs=4$w9wU|Cqh4jxrglxdmOG8
zo)z8^AsG=9Q5P{C=^0rXDOzs2eEss<QHoKCQ7zH9=!ocJ(NinDR_t9d5@Q`x6f?L|
zcV+I%o2wL8rL4NRT5>gO_1RcVY-H?-*e|RgRt;+^ju}@SH_7&3?_<B>xN^!k<6I|h
zDR(s9DZVs*jOWDL!y8X<NhnX4Nc2doOnj5%n{+5?Iyor0HhDHBGNmyUpBkIm%9rLR
z^E=a2({j`L1crhlfhgS}eQ)}t&|i2g1Ik#L(UK{H2%GLKy{s)+L)p&RRoNeNB67~=
zO6Br%yVn@3*|ugh&pYquwdl3%wH@o!*KJxiwBBv~;SJD+xD6c}H8&P+9Le{|KfZ~$
zDS6Xx1!e`M1@AXUZf+}7Da<b%-r}>RzDS}-Sag4@<JLnzpnpjGp=X=rw*A|_6?2Mj
zm6(;3mwegI-hS&x^B*gIoZS(>qi3hh&V#$KyZE~Xcf0I9UMf|ZS30~Wa8FYiqpY~>
z{od7kZ<bq?AKFLUm$gq+5m3>xUu*xa{a-2*DhI0Es~W47tG888AK)D5Kj?a};gHIq
zl0%<=O8n`;VV}cIH99rrN3ch-kGwb<akT4ayPxZhDIP01_O+H@D>@!>ytB@>uI_~L
ziJkRueOCSW$(WP9r#w%!G#ED=ZlpJsoCc?}PQUym_Lspk{%1PQ+MR7Ur+u#aJnejO
z6V$Y(X|g$?S=18M(%0(O+R^6NcK%nBUu!R@U#Pk$dvWI_;-$h%vzPNOPqho$C$8|W
z40o*VczkvF)q9=GI(x49U%PSL`})-`x30@KoNipW>2S04mffx9+cvkGx~;p<|7QK$
z`5v2|raQKGT6*n!+xnLDUFvt~zjD{}?)7`jd$$Lc4)hI%4?egbb6@m;^I+^@%ELF0
zvLDSn&VPb=Qv8(qwEUU!vzp)ae{U4oh%OF!4s|~deg1fuJ^bpAj6c4N6uzLmC?8cD
ztsAo#yD;uO-urUJ%aK=tS2Ghue@gvX{aWw!xxZZh>YiLaIr2vMX7=s&cM9)n-&?)!
zm<pbH_96Ad%yjWbg^$NS*?sEz9Qk>4Cg%(8OT}0HuWjG_zde~vot+i1gseF&fI=)B
z9}mFWS^y|fh<4}&fG9Dqhvy=oc@2-SSj*4p`Tyj3%{&)x13;}S0O9!n1hfNi5UJV-
zlaW>|3&UIiY-zbz5s$cJ#9La-0Ynxe(&Xdp>^l_zaBTp570%Ai9GIQ`dKA&^4*_UT
zpV#5yXe<?gQe9asS?;Z^s`+!{zcc>=0<-FCPF=rx00009a7bBm000XU000XU0RWnu
z7ytkX4M{{nR9Fd(m|JL7*%`;z-upxo6BRGfG&R;lyhIZp>J=I<wV*R)u*GXBrC=Xy
z%h1wFQK*T=)aygFFny@=P$>*vp$J8)Q&Jt#kj6{tn8bLQ2os~CPBbRwdd}JX|JFI{
z7~)AX3-;N2uk~I2-~ap8WgjmLLo-72_U_&5?b)*@?&S1d6pzQhr7KJN*}m^*Ys@!+
z=?kM_r~12tAZY9C?5sa><VZJqn>TL`&YU@ejbR;n!vT_G-vQaVb7%hO(W8GNXLICi
zxt?cvo@dhO3!v%l?(UWBzcl`zSS)tp;K75<0F%u~Wo2bd{b_-v1tdqFlq@UTw{OqN
z$;tUpwtktJnOT&Pkzsm!d%5H<j!_Rst^rb47>Psz$s2(&Jv}|G3gSl!?y8d;7_95#
zo(>QWEc)HMcbCfe$1=W51_2R$^X5(X>eVa%{{8#@ix)3Ue}BJ;Mx)lI<jkm1qs*j9
zlg#Ydv%~S@$H%j?vyIq{^!4=_1@Ku`R@N?!*KOOjtv?;8!GKa=6wMZS`Lm2omeaUE
z#2-F<7}V9(nI})4SO6paOr4r%mMvRq3JVKk6DCZEU_3h~$8>dd{;|A#_wUdj3@Qak
zOjzp4ZB<p(hl={BqRkL1{SO{I2x_j?cwe@BX)y>S(Wb2*E1)0D!5%F?Ki@20zC09b
zan+Y?a-*2{R56Zk{PG;AR=CsYU%GTD6ynXw`^Tykz(jA|x)nKh?wr^Dy4{Fw3xpH_
zXrzlYqtn*bW*QnAJU#n)d3hm-r2E|~SFSu+wQAK(eCuujS%w^KyLRm=k&%CknOqfO
zw6?Z3sIIOy6tZi8Ne1J(hP=y>p{{7?pu2kYYNc^mTm>J9!43g?Z{NOsH4X!SY~841
zlm@FMSk~3m)qms0jmU)y7Ys$IcWc<CKml5IhD4%)fieWdY$MfL4$RuMYt7=ti(^@t
znUS8}-rF4=9V?C=J^D&&o-ZJ_cBHUP?38IX#5IEgz%XqAL!^M2J9n<dK&nW`P>nHU
zXy~{=R01}zix)4Nd-v`IVl1X?l#UxW&K0;9P&Zoi#){fw0+6ez91|E{sBM%)N_2|I
ztXZ?h6ciLt4;Cb2gVX1L(!X)zMzeJ3QVXu7rNx3FIKaMq`O?gsIWw*`&KKZ<^XJe1
z{lI|(?LJWm$WKM<Jkc3rYPYtw8lkp|j+vD!SK7Yf;$pLD(<VDMm?;N_05)vcVCK!6
zXU2{lYgVjSVM<C$QcO|kj~_oa&CSgL6G!ibW5$g6F<2}h8D2tqwD-hoYHDos<Ql`Y
zrluzI=+UDTi23v9TTrmT1rRQxM`!)|^#&PQsKuNB@7%d#-x=@g?X%BUuU<7Qw8=?R
zLT4Z&Jp4g|+0ULm^R8XH=7~nTJ>blxrM|x2OqnvpOr0{-8sj-PH`k_*nFJu%1PpAT
z$JKPV$(%TGA_W{)vCE1s0$>q;Os)x92L9=*u%?NfDJtfen6L$oN0ewTEg08sZ5kR?
zKgoVr&@OI)P_U#4Ff`bLm6In=+IK)Z#_4eO@riHEzye{(_cbsnIq0!BrE3_%!CO#`
zCJ;axbwcsFG$8|9r1{jTQ&t8rtU>7-J_(wpdlpu|2_P;vJ?-eApLC!Ai7{ANuwa4J
zpbszunHdTU3Q3<fGtwR73;p;cLqkU4usKi^A?dq)`?i=0Y$_Oona0LO3x?<6m>Fo(
zJ<Dze3?=w-y<g)F3p7B8+mr@@(MKb7F3^;~2oGZ0i%6->IUu6p8c`$5*@gn9s7aaA
z1B{ztFzD*ZflOx`n*&;pFX6{H;YzLt1IFJzIz{TifpHE=6U%~=q0om~Jl|SOJSBaG
z_?PXjh#tO50tzQjp6uPddv~x-$`O&e*@O^!6!7WOr>zd}^93d**4)B)_Uu`kI>4r5
zN<LxIV@xt#zUKc!9W}ntLKSEuOq@w%7~?cpK$y#|GmaUz&fttl6YJF5B>_;5DfH2E
z&DodFxG=DveXe`6UtV7Rg@miwUvvhJftVE(Wt6B98f%S<nts68bw;?I96AmZI_RRa
zWeca_#5=MCKpjq;I1!(mjR?3_=dl(GSps!{(Ag(aR#v7uPb}@OSUExz78cs##c2wR
zoJ4}eq9=nEm;*&!@yvy8X=$ki1(R$WH2K1(uM7dQo<0jmtbC$q{-+(+n=xZXeERh1
z_8>(x7@$s)8zJYIAy?qRpwQzyrTx*aS;+#nw)4M{Z;FbFV#-V)wwiQ(0w6Y5f5(m;
z(aV=FhXVD11UUPKnl&0qq>MY~nb)sh8=aqQkq))!!7i+DXXdrHx0~zNuc!KON-E#~
z{`;J*C{zmiqy78$U*s5@I>K(<x;1m!v}vCypG!ES=yNCFWJhhWagukpweSoZ!!<zR
zm<BV*t7ub4*d;o`j@A)Y%+$+%*`Y&++9m3dGQKqY<HwKpNNERP<S?>u;llW89mqKs
zVVs6xo<{<MEMQ=kdf|>9wy=rqNJd6PzIwIx{2DM|kXmTJI;3FdIMu9yDjBH|^0=<>
z=FOWvOwnLVeP0U@@-PV?fY3PHFIu!Hroh~m@LPSG{YgU>0{$%^E3Ho5?K&h-f05G9
zS(SA~Rmi>$PoDc?#ffy2YUyvp2zZ+NP@FYu7Ki!_7#4#S`XJqx)K2+M<RZ~)Q^%uF
z|3Ym3URd6!rXo5=`&vt4>(;FcSvzn<Jq>pugRFEo#KmO8(=5)A&Q}WNXAX=@RT9{{
ze>NZ>K(-pSP<>mp?^m?%kuIp$deyI)6KIR^o<DzXLAjbDMbsIK>zp}rjK1fi0^#f8
zFb^wN6y&coqdrdpNHH@cASWnb_U{;yTUlB80~z~`#=fJkhzP*sfNADx&)y~KwjTbD
z@f8HeQy6W~*hf#FKK<*lW5?{j9<oWvyp#8VHRM31?#X|>QuDi_qGF?Ld{0dLP|orc
zt*s?y6irU;Y=S9PUorO&&8|-c{%?m5AMQYAU<P;}+=c~|6!sijPFdgL#d0`XK#Il0
z5&_|4&!>2+K-8*E{;MyEX7$}r`fX(=fxyT+tT?;e{|`o)>cKNk?Vtbv002ovPDHLk
FV1j*xwG#jU

diff --git a/seeds-sdk/src/main/res/drawable/skip.png b/seeds-sdk/src/main/res/drawable/skip.png
deleted file mode 100755
index d58493e4a1207108303e2a0334abf265e593e4bc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4152
zcmV-85XbL{P)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU>+DSw~RCwC#T@6eW*A|`ymgQeS1^Gu5
zMT|u2GgwX0XG~vxv9`uGPo%YOXrWOdDu$xgqP~J?#Gr_+T1$;meX)(LnxJj{DJ`$D
z#{TfCC?bL^AU_I<{3`O!C$nTlVD8K=yR$1NIq@g=&dmM3ow?_nd+xc4&dyFw<`P0W
zhBSyYkkpsdi*y*NE2%T7if`LS+DO_!T1Q$%sv#{UEg>x;y(;IyDr828f;60T3h89h
ziKJot{~JOu*aFf&NH39IB)!1@{~#f}C`tcLI+HYlbh?r6pHG@cdY<$g>BHxhkO`!7
zNMGRzk%NGcQ>3}1|9f5t0r>Mt=aB};^iy6&dYtqaPm)CvGK=(Iq;HbCapocQq(@2r
zLweRy2$@9s7Ox(hc}flGAzptsS3+QpMw6;}OUV)h7Fssxe%`z`8$w_)#gZ=MEK`n<
z?%^#nSrY<(VHvL>25}td`EJ~}(Nt1W(nNo@+`M_SwY0Rft)il$y{f9}VSRo5qX!Qj
zJVsk5Cnqa6H#ZwEFE6E!kB@C&V4!N`$dPuVMvbx$3JP+hKOGecL%B3h9Ly|UJLO2o
zNYWLg@p_v$Wo6C3{r20v3l}cj|K*oo8uRk<9vI>QBO)T4UVQOI=kV}wmls}mVMstg
zfP(=pyOT77^roB$nMS&rH)kbDb#--Het!PlAAb0u{=|tB4H}K6eIUO%zP`S;ufF=K
z>+IRH-KI~U?(XU7snX+eFpsy9{#Oo!%q2~d>S15Ga^-$*Ztk70zy7+8-i9VqObGPW
zI4)SQVAz~FbB2b7hPvqC@u!iVG$kSME7tK|w<x)M`SSg5zWJu+i!Z*YEiNu@lfz6s
zdh}@3k|j%qzyA8`9^=Q4mqHA@`xM@9F*+epq{*bgVmeh;R<?Zg)mPPf_wKDGQd;C_
zLJ=AEF)=ZoZ@lq_r?<Day~ys@NjH+_7?TjZ8UGeb#>tZ>tM~2OS9SdO@dk6SZRgFK
z=lb4z?|IFgJJ(YJDeI-YDN+c*oRKQ#Ger}0%Yg$2D$>%@Dzzr6xd=?@q@*P8ciwr&
zhYSHRZwo$OYsJnfVhMpYwN=anP80Rr%*;&9;lqdTnzJVu85!vw7Z>MC27tTBi9S(`
z^(BT7_!;S9Oxt6}j@{n8d2{*2ix-<X3y>*OrZ}!yv&L`!{P`n9n#2jLehMog3f}o)
zcKWijv&+}5TXzfIv?aw%5Cup{N%2>!)qWzK#}zCdJu4y0Ni$jRzI*rXvV??$vewqt
z$D9R<ot>RkdU|@m(xpqqtmnj$?h<Nb#c-jSd~AxDjQIHYQcEQRg0W$Y7^{eG%XlpH
zA_O6HL~WS@h4@V2&FJXp=;SP1Fh-0OV`l6U!ei;I4<T63U<#pQ0>_+T$!|t)ZwkhY
zu`_mA$YUyr5Ulj6SxsA5Q<gS?vk1nFu>%9fE@~cI(S%^hRdA&bP9OXXOEGPw2*wT!
zfCWSIFdkb`gv{!%ldix6*VpMAH*TDr9DtoVb*iJ(zQ6!jFgAaS$M_ks-mqaqZ~u>Q
zdW6tb5t~}Ma%E|IdwZuoWSl#9ZsLd$Bdq@V>#yd<#>U5{A|p39ccPn{o8r$u|7>b*
zZWjF<zyA8`gRrnLyD?+NI0-Zb@ol|@ReF0vkT><F(9IFGMW9fh*p!wGPft%fB6j54
zZ@)dvlw`QNx+=-H@LRB8fxDFJ01IFOY#5rq$@P*T*xMVjigX5piCeK_$Bx^EAVce<
zjvYJJ!N$hs@s%rATF8RwG&ULdw@Rh5o-kp8BRPMacn%U#Ke%hxuC)dP1SrG9!(9cM
zB2ams>&lYslMqC35zFuQVpv>Svt~_cZEfu%1ChZY`C!P9A<CCuetDQusqFav`|s}=
zn+&bs-?L}W9!j6j)}Ma*Np!kTd3kx;j2SarJUl#vmW2@$JHvJ5ef9duLawb~H~=es
zQWuv(Lqne-qo+hhMtZ;h{`(%LAmb?~EIQgptyYWvi~<{A#LzT=$Gq2A79Q+0Cy@Az
zHSpJ7d+oB6Wml{%l$DiDb$55S6>3YLijGe|{q)wBEn6z9tE(Rxn+&Zydi3ZqSx}XW
z7cVXra}O*BfBWsX;~CcIkvsekj?cQc>M@xMW}zb?LFyX#OE10T?Be30WNB+}Z*LtN
z8|$}l;liP&A_GEmniWmf9b)eTjDQtG)2DFPB}6drg;X76he!nj32s?gS*5J)9UL5N
z5)%^xXrA+-Pn^=&WI#@wIB}aSFG)F9zzUc#G@aR#5Cx0hfxIbwQgsRo3tLyOUVSSr
zF0PO!zGjv_NHR!HP7bC%o~9sU-n@B|x4;1_V8+lig6E){5Nsn8T$V)=o4&tN`X+bo
z+O?~i%;ril{m4i0UbbwRhq;g;60_+%2i=5B5$b{TPGl4s>RV0|c6CZhN^w<HRVzz-
ze}8`mA~G~1BO{Q2wKfMb_-i!)JBFrHbP1U()Ec?AhD`57l=Q<7Kh%&Fb(8FUW`BmP
z9q*{9sA1+n1_YP^JBFr{bqSd$)EbG;1K|&lNqOh<&p$73Z*OPvh~3=WY-vsj+O}<*
zKg};nIg=q0yNOytu#(kpm>s?fvd{;DkeZsBM=MsWz_RaE#_%;aeE4uxLPA0iIc>w`
zP6j`@H!|cdfP)YaGKLe_2af$2hT0O)m+aZIrzR&Shk2sM0Apfed{?bnH3AN&T*-g{
zJ76f#3>=KXK!SuWh|My_2=u`#PfAL<#$pm9_JxT)Jv}{y{1iW>QmK$586q(Zvf;YQ
zRd51th*6TF>+9<~h!m8=;6DEN<6wBnEd3TOTI7XiOifJ<mLnM=Fbu?ieT7<K8yROr
zIe743U1nxx*}Z%Bm||F7US4)Y<QTb<Ap%2R5aPuW@-QYLm6eqbX>KT6w{G2a#?S-j
z?CfkKS29Fk=mkOqZF+35<V+xB4%dD8<(HL)yrwD05P{(^5F)g)#hEI-2di~!*RCxm
zv$*iqty|6dZoe}X86q%r1tHE1lkFqUM1o|r9XobZ@87?_LZ2<orX)iIhRz^FaQCSk
zHragk*=IF0uSf#){Q2{BrX)iIhAJ!0Oav4C(W6Ht<$q;oXWurLae@%R*<aTaHkH8X
zD<~-Vo0Puf(~L?>OY`e5_BGJLh+!KV3C5^UuENx0@JVd8Qu_P(`PqN)!3U#aVq#2I
zjffG$Mi3&n#(`Z!rY1v-)7O`%)oP#k_;^p1N~JLNI2bW(03m{F<S67~?qom^`yz{N
z+~&=j{T&@0jrtj8#IOzzRV5f;2@F)3I~lqX6&2;ZWXTevrmZq!SOr2fLak8ZNbY37
z&mhy1$zMW7Ax-q7w{PDbV62Ir5kn0KDHUpkdQ);I1AazgVqy`Q$4r4xy1s2(TwLJd
z#fyg<V_b|FmV%HHp;jpVC3iCL_kH{J)gC^4xQex}jg5_B>C&aXM5Gs4LDmB~Hbx9f
zKnTijcM7oUh~i&zCIf;Lqm3IkY7!C>uCm6y$Ru{yvSrIyGK;+jYHYv`7z#AQ!xn)M
z45*;LmWUyt5}TaK=r-gV8#`!jxV?ApUX7U87bg1H*w_K_Q-B@Avw(xETGQ_jq1Gsi
zCwDS>giC7E)6+}p>gt%*Q&3ojOyZD?jEn%9^bP6=Gh+9LHgp2HB-9!;3Q-o%9LRtm
z_Jy?74I4I;+_`gyX+4J=Myu%PXurtFNP{JK12bU9(DafnAs2;OqhKUz6q*AWx{{NV
zQ+MdlA=b^9h&ds_d*r4~n|uusp#Wx##WpYM5`rTe@`ZY!V5B*b@gx?}(9p4R<;t?<
z%a=b{<YMVVzKPxX_3KB|oZ_kPSQ#<P=Q-#m1T%b|P%l*PM8QaX9&p;UX->vY)q%B@
zm6cU};J^V<%fV{3`bmPfwY9aR*cY$@W(-a9w3e=JJm<VnFO*V6^-ih4AW8c4>C-05
zn*u5HDJo{%CEK0gO`pABDfa_bjOAy$vDYQ!9LI1p14^l4yOzXXjFXsOo1vFou{AC^
zIa#xH>(<id=4R$)X^loBI_m})0V{^4PvNdh2o~W_3H8RFIh0bB0!UF&Q7f61r7YEg
z267D?3Et$@Yg$`dI~dwlkhNAO_8!29u?FxdPUlpgp4+04rTtG%AQNTi(4jUz{`g~q
z*lp3sOgwYu%zgUBHHC$RIrg>SG|&kNO-)UYPn|l|aQE)r)=85lIXOE!EBhj2(V|7y
z#a<s}X2~cBWY`uBqBn8<Y>P%E&EpI=bU|HPsemBg3RxtkAVXI^`Q(!tGKs4UNd^Si
zFcxAy&h<E2skcfFh?e3wB71=tkgB-2xCxaDq&#$CVPOlIq^-fh!S*N^U~DqFy|GJ|
z9^g$02?=q~K8HSJpw=%os`mBP>3%S{t|ASkLWH0JGUEH)RfQXpDhR~8Qi{)@xXaH!
z|J+F5@rMx+5w72T_g$?iQgu+mBR@a?0eR`2vu4e5KXT+qrBpJI$dH<v8aR3KWEKbd
zAlFMB%f6}s!GS`Bfqs1sRJ|b^|KZuQXC?2hLe8tLt!-y?bo33*go0#fg+kFm&R~hu
zYkc(4M?UYq`>sDj(;EKmcxJnGe^p6Qqjwd9N!UWK=yh{1l&r6y&@!3R!Hm_fw{u;!
ze4mm27W#1jRslos%pMh=QDpdeB?Dsz28?7B@Yr%<3BhS(*^CaKJ1Rb#GF`}2f-z(4
zB1({FbN!t3CX@<;)5wmn+y&*gQSli?hMyNQFjkCNMCtJ(Jf@sfLXg#n)5w^tAC%ul
z#b>F(ICBz=5n~lma{MZfWurcXXaiqatPhIv+dFse47B7o1!Kb)MV1=R;ur$BRw6F8
zQw%A)ckdo)iE|3Zgt3VvV<+p6nw1dP#yB0}80!<@RnE%F8f8h=7si4yi98wM7>^y>
zF%*Lby0H5hay!sPD}zTKv58TRJkrYGp<w-sQ4a;v%HXkieUoAIWAk+1l)-}~pZ-jl
z>|jaVIc4zZRhb;Us%w1>9!@Ni!-=&rczm}3WblA{=_30B?sa7**L48aLe4S;QQJK%
zu_?I_0>OR~9Ds#0m%=QB2rMpPJp&>10jWVbkc4Oj2VlL$tB08qfi>_$y#79rH!=nx
zTA9WBEjU@m%}j_us?Jf~uQ+Rr8yb@kt^A!gkCFQoAX6fcQFxp;XU`e)#-<=dEAZ}-
zYV-=na7>1g1mGjrHka#>QTRL%q7@}i2rRP*sUE)`0uMWnx0pbPNe{=A10g;A7@QJ-
z!t}_ToXA^fhH@S{c}oc!EU~8#+sG~$(vPq-LV6Q8n5e#u^wvPGtE??5sbb@hD{o$F
z!yawCIg0Q;is~Sd8l^)@xvl~UMI2+ohN<NL0t^7e-!tVf_+0h?0000<MNUMnLSTZ#
CD#&*L

diff --git a/seeds-sdk/src/main/res/drawable/video_pause.png b/seeds-sdk/src/main/res/drawable/video_pause.png
deleted file mode 100755
index ac38f65bd793fcec763bc6fd390a09090ef0905f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$`B3k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*D5XZhE>nhE&{ob8#algMk3kfgS%Zq_yZXHMVTN=A@T<eZs~9
wP0Ks>AC(;%7#NvYI0O`i0HcomCKC_CG_KDcH`agK3-ly|r>mdKI;Vst0Hf_f5&!@I

diff --git a/seeds-sdk/src/main/res/drawable/video_play.png b/seeds-sdk/src/main/res/drawable/video_play.png
deleted file mode 100755
index 15ef62a275fc3d54971e9174013c658c8e84c9d4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmV+b1poVqP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#qDe$SRCwC#onK^@Q5?sgo)QreUB!q}
zmR?P}DWw$M#E34sDWw!KP18h_5=)69Qliw=lv3K&t0_&pX_}^2ucn9?5fKr2`#$zN
znzwE5zvp?*@0|1f^0k}&Iq&)So#%YKw#}<lDp3=8g|0?>(fbjTTH+SIb{TpPeJ*eq
z%Ro%Fqwmmj=pt^ZeIQ8|qGtrmE^e!RASNr(XXpcTIk(q75R*OV2lO~PpWAF7NRq|q
zRrC$Ifm>}Kh{<|^auZ#`Ew>NE<Ouo^-N$X$0fg?N5J<JVT%fz?0Ak$bH2R+Iq63J@
z3c8CfAaoa{K&stkBZ25i;x4a4beCB9`hs(p*nu?$<u0*9Yc=lD@3Xtaj;%Lwms38w
zOYG>ny>*w^@%0;bIpK@D#2&nc#9gkSZ+&o=*rRD*=YzZW1jGw>@e#;$cX@%f6NsK{
zm1m1H?&3QT=iDU(AWpeUNI<IH<)lV;2@!~KmrEMmB~&14-6eD&)$VeDKy<mwooMQp
zk=hAFPd3|h7Xne{E(B7ayF5bM2t-eI%d}+fE(D^?T?j;(yAVig?(!*ZcOj70vNUaX
zArNKmLLk|=OBaFYa+fF4HUiO;u4deYK$N))f#mBhx8-I=AWCv5s`0)Hfhcnq0<n`X
z=w-A-Aa?UdK&(Zd&h!ZjxJS8V1U-t5^Pz4x-_e8UrdluvB>UV&SINh^!Xqo2l;n6C
zZuAQ|A?fBP+J_dJfx!t$H_5H3TduTChd|PCitgF2u{^T!%Ww4JTu#9W$uGn5&@QF@
zjX5FBImMPNU=T=Sxz(ss@W{$0<8nNW<nhBeA+?>NBQF@7klFJX?P=912&DCV7N;1r
zwE!Mj|2xH?&4qA6qUa@hEURlQC#3#-L-(WGw7>`%h;a&a|6wk)BP&;@;DpTW6g_!6
z1t(<YJQNsTU0AHoK&(3jkF0-AabAN{a6+PJNSvbV>I?8?LX1=Fa2bX#KyGMtiqMX%
zG4wDx>eHF);)EEd==2SSixV<{_PXK}J_DJM+f&hZi`9N)8K)?O07LtP6ved5Q9#i+
zA(QA{bZ2NVGy=Jfu91g#kkN8vdFd1`PRI{=PIM54{RtTm!J8xoyFh|*3hhVMFZ66Q
z^*#k*Se}rgOvMDZ-0p--cM8I=2qgIv64yd^3N1(0s5r$Kx7Y537^mnY4Eqz3ynWh7
ur?3yCEVrj2Zl&EL%Q!`WFw)Im0R{l7)4mk85B&T90000<MNUMnLSTXg>f{js

diff --git a/seeds-sdk/src/main/res/drawable/video_replay.png b/seeds-sdk/src/main/res/drawable/video_replay.png
deleted file mode 100755
index b159c757e08e2a43ddf68b57d0caa19241307acc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2054
zcmV+h2>JJkP)<h;3K|Lk000e1NJLTq003kF003kN1^@s6aN?Cz0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU(s7XXYRCwC#U3;)rQxsp9n@V96qY_gd
zrAQJDB9A<pn38uMjVKwJ8VrN+m{i6yNg7FY^$;aJNF>paN>NH`=!J?zRMPA6S-;t<
znfnK~@0_#FclO@jUNgU$duQ(5d!O?=d+)W@UTf`=TrNjJ?2-K(8Rt`s9~h4_4)vLk
z5(j2T31bDLk^H`r(U&nQ%#iG4SB0OCW4y|k$v7(zVvn?C%x1jEs2>QiLrNKUFg|D8
z$v7YoVu#dayukQ`(Jl~TkF;V;XN+Mq4usevH!$Wi9$_3D2(d#BVf10lV_Y2wu}7LP
z#xtfdP78$CBkdWVGM;4|5eSJda3%b$)K*o--HZi{?u`8dA^A&9#u<#>j3brXK8o=&
z<738oHa)a$zN}h|^BEl&Z5Ry-Gy}^Rk1^H;LX5O#+$coU%V-S0k?|@IX8cu*gkZVs
zNXF%Hfkm@)3FBeL)M6q8GvR*5nHKM1lf<z6+Gj#eA#;{-nIo$5pJaSw&oDOoL<rQ)
z2N?G<4s_6lSuIxoC?5#HtiYLt4~Iz~%KkFfRYJNl29jeAzI{kJ;}*tfmkh%aS$9Wx
zMg|0jVhz)5Tw7`|Mv_Aw)(Em$KD2?ZELm`Qzsb1JLo&)lLtO33rVcWuFwXUih&hZ$
zWkYvH?X4zcT<j4M>lpnQ!(}5c*aoE`BRnEwH)9CnNyg7vXbedOUeeB<kntWFcgcdR
z29R{gx`Hv$10q()hczzifg~ZMp?pcT9VTL{sIUVVTWm3M;s}mDhZTqncw2EsQcJnr
zaWX4b*z|?OwbXAX6I+|6%$6k)ks{wKw!4sVDdT$E$cQ^b>WhJt=6Vjjf4s8t@eAV#
z(V%wOx`xJiP>_*U(#&&Y+}st{^OA&ZmWwUXpYfyZn_5&tuzcK<!Z?0q^kBTD-0nwY
z+~spz(K4bE@(}6AGJQ+N5xGRM%~fJ$BeBP+B+4j+v?Tqb*JZN7YHiwx78xv7_GWTW
zq7c$cd3LN3g0;w)B3AYia#-?Jdyf_sRMQ~CGPPErt)()y%UvfU$_%-NOlYT;^kjUI
zunjCpPcsHlhJkHa5Q1e&(|L%Ec1*<osq!Cf^p(xqE6HccI+4*_sXw^0?~C|9(319^
z(tSoI%JF6&$;fwxv{&5B`-#OIRS><>luUj{Ie9Gkczb7&iAYZ>-!V>R?4%&Emn>u&
zovPH=pg=})LYk2YUPvm?h~5aVJ2@dOl=?x!<)-kulM|w)UA-M%wGJT~)eyFkL*7=~
z38|yd$8yGo@TzqP(KyFm8eX#=A=MT7_$It&Jwi$p`dA-cvmPND@_TsAb`cV+bIS<v
zO;AoSmk^V)B&51WWMEINs?g5vED7<c@G<gW4pL}mdt5^PQRuwBM})x9su9opM_fX7
zD0JS`BSIRGPFC^8xP)lLHZ}8z5Upp~5SI{*l&%vzTDHzsYG-X+LNvnl5kAz~12Uj3
zwo%&9*Tf~{E2W3&=m8<ENT<RbA~k=COUNRnhe6~@9mfgLiuy-JSb1DR;5ygvML}J3
zIa3$G9-Wlhs<e{Oz6ilN_?JopK`Fl)juL_tK8>>>*mbj$5CVB$>7kBc+~yz|SZaGI
zwT0NUWl0Hnm-Gr5qpDn8#|Y^|dKtjDxnXxwLY6BoTZfa$33o*<Vsuk%Z_>X0ARj`o
z?!BfssOuQFIzR?Ko}r}YfL%s;lm^VVvk7Fvd9>ttvb#hqg3!xIw{jdx0`AcwWWA80
zCD68zhu+9iLI#WNq$No6&a0wnl<7E#bW;J~-$F#=@s^Q+J+6mxn`0`o&f^jSH_Bw?
zfntWtV4Q9N5xC*)6~<l4?IPVS?;4F!H?01opD@#a@d26IBUuT?FfAoz0|h}>=Ka@5
z*olatx%A{E#$hqWlmwj_>r#52O^kX`#uMiO>Pkmx$tp${Mrq1KG-pi6r7OLojw|lN
zbkC(P^W^KTp-e;z#xTZ?l*d1pQ6=j5;#QPHILtfBs^R|$*58Suku9QlIqAoe$&<X6
z%oRtaDUTVk2&i?xIP!~4P~s2wIHAN}A#XfGdh|je29__*rV+uhQ#=aLlxm8V4Rsm`
zN2t+)WYa?4%5YCy7g5q8m?#`Gm9mY1+$k0?9t7#zRSPf!Dic)pj$LM5qmc50q7DZ!
zr-A2CC2?1UAOwO!%3X_`jE%BCB?=7DBBY8;)ec2U##T{q66aECt^Iq%(w<R-WZ<5v
zt4JxaRdX{&ywR1S4i}4HujnMMAF_>*ieJm<A|L}5PTMhNYBrjNx{8{(T`1k!zF7;B
zc2Fj2zIMZDUkZlfS{(M&_K1u!GEpeo(r7$wgYI?F%V&8&1Tq1-iF&^+txgJIVIykg
z5;9k<ZgG?hC@KgTAD(tcg}!>V37I%2S8i}ak!ReXFt$(~W_39+u17-c#kQ6bf%~V1
z2nsr@v%XIq)@@HAsML}fF;bSMOzL~ta>0E|vGieNH7s!7+ePUZD|^NEEMJ5zgzOch
z93xAqgJ@@sQ&K!o85QR$(*@R)oVAURih{!?Wbn3<8FUhv=#Xj=+rhyVJhAY?E*7J1
k5m{Pt&}Kr4QvMZS0F+w3x5OJp(EtDd07*qoM6N<$g8wGJlmGw#