diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index c7db8b785..641dbead0 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Хабитика</string>
   <string name="action_refresh">Опресняване</string>
   <string name="XP_default">Опит</string>
   <string name="HP_default">Здраве</string>
@@ -355,8 +354,22 @@
   <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="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>
+  <string name="action_continue">Продължаване</string>
+  <string name="scan_qr_code">Сканиране на QR-код</string>
+  <string name="invited_to_party">Получихте покана да се присъедините към група!</string>
 </resources>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 305d514b8..ee2f77ec0 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Aktualisieren</string>
   <string name="XP_default">Erfahrung</string>
   <string name="HP_default">Gesundheit</string>
@@ -281,7 +280,7 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</string>
   <string name="invite_party">Gruppe einladen</string>
   <string name="dialog_feeding" formatted="false">Füttere %1$s %2$s mit:</string>
   <string name="use_animal">Nutzen</string>
-  <string name="feed">Verfüttern</string>
+  <string name="feed">Füttern</string>
   <string name="hatch_with" formatted="false">Haustier mit %s ausbrüten</string>
   <string name="hatched_pet_title" formatted="false">Du hast ein %1$s %2$s ausgebrütet!</string>
   <string name="close">Schließen</string>
@@ -355,8 +354,22 @@ Für den Anfang: Welche Bereiche Deines Lebens möchtest Du verbessern?</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="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>
+  <string name="action_continue">Weiter</string>
+  <string name="scan_qr_code">QR Code scannen</string>
+  <string name="invited_to_party">Du wurdest in eine Gruppe eingeladen!</string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.sidebar.xml b/Habitica/res/values-en-rGB/strings.sidebar.xml
index 4a18afa1b..bb164e0dd 100644
--- a/Habitica/res/values-en-rGB/strings.sidebar.xml
+++ b/Habitica/res/values-en-rGB/strings.sidebar.xml
@@ -16,4 +16,5 @@
   <string name="sidebar.news">News</string>
   <string name="sidebar.settings">Settings</string>
   <string name="sidebar.about">About</string>
+  <string name="sidebar_shops">Shops </string>
 </resources>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index 54aef8cd0..5d56552dd 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Refresh</string>
   <string name="XP_default">Experience</string>
   <string name="HP_default">Health</string>
@@ -13,12 +12,23 @@
   <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="SP_user_qr_code">Your QR Code</string>
   <string name="PS_contact_title">Contact me</string>
   <string name="unknown_error">An error happened…</string>
   <string name="pref_account_header">Account</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_push_notifications_checkbox">User Push Notifications</string>
+  <string name="push_notifications">Push Notifications</string>
+  <string name="preference_push_you_won_challenge">You won a Challenge!</string>
+  <string name="preference_push_received_a_private_message">Received a Private Message</string>
+  <string name="preference_push_gifted_gems">Gifted Gems</string>
+  <string name="preference_push_gifted_subscription">Gifted Subscription</string>
+  <string name="preference_push_invited_to_party">Invited to Party</string>
+  <string name="preference_push_invited_to_guild">Invited to Guild</string>
+  <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>
@@ -223,6 +233,7 @@ To start, which parts of your life do you want to improve?</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" formatted="false">Due: %s</string>
   <string name="daily_streak" formatted="false">current streak: %d</string>
   <string name="todo_has_duedate">Task has Due Date</string>
@@ -325,5 +336,39 @@ To start, which parts of your life do you want to improve?</string>
   <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="leaderMessage" formatted="false">Message from %1$s</string>
+  <string name="confirm">Confirm</string>
+  <string name="market">Market</string>
+  <string name="timeTravelers">Time Travelers</string>
+  <string name="seasonalShop">Seasonal Shop</string>
+  <string name="empty_inbox">You don\'t have any Inbox messages. You can send a user a new message from their public chat messages!</string>
+  <string name="party_invite">Unlock by inviting friends</string>
+  <string name="no_gold">Not enough Gold</string>
+  <string name="no_potion">You don\'t need to buy a health potion</string>
+  <string name="successful_purchase" formatted="false">%1$s successfully purchased</string>
+  <string name="purchase_confirmation_title">Confirm purchase</string>
+  <string name="confirm_purchase_text" formatted="false">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>
 </resources>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index d5098c8a5..cb9780f91 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Actualizar</string>
   <string name="XP_default">Experiencia</string>
   <string name="HP_default">Salud</string>
@@ -13,12 +12,23 @@
   <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="SP_user_qr_code">Tu código QR</string>
   <string name="PS_contact_title">Contactar</string>
   <string name="unknown_error">Se produjo un error...</string>
   <string name="pref_account_header">Cuenta</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_push_notifications_checkbox">Notificaciones push del usuario</string>
+  <string name="push_notifications">Notificaciones push</string>
+  <string name="preference_push_you_won_challenge">¡Has ganado un desafío!</string>
+  <string name="preference_push_received_a_private_message">Has recibido un mensaje privado</string>
+  <string name="preference_push_gifted_gems">Gemas regaladas</string>
+  <string name="preference_push_gifted_subscription">Suscripción regalada</string>
+  <string name="preference_push_invited_to_party">Invitado a un grupo</string>
+  <string name="preference_push_invited_to_guild">Invitado a un gremio</string>
+  <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 tarea</string>
@@ -223,6 +233,7 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</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" formatted="false">Para: %s</string>
   <string name="daily_streak" formatted="false">racha actual: %d</string>
   <string name="todo_has_duedate">La tarea tiene fecha límite</string>
@@ -256,12 +267,12 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="quests">Misiones</string>
   <string name="pets">Mascotas</string>
   <string name="mounts">Monturas</string>
-  <string name="armoireEquipment" formatted="false">¡Genial! Has encontrado una prenda insólita en el ropero: %s.</string>
-  <string name="armoireFood" formatted="false">Rebuscando en el ropero, encuentras esto: %1$s %2$s. ¿Qué hace aquí?</string>
-  <string name="armoireExp">Te peleas con el ropero y ganas experiencia. ¡Ahí lo llevas!</string>
-  <string name="armoireNotesFull" formatted="false">Abre el ropero 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 ropero encantado.</string>
-  <string name="armoireNotesEmpty">El ropero dispone de nuevas prendas la primera semana de cada mes. Hasta entonces, sigue haciendo clic en él para ganar experiencia y comida.</string>
+  <string name="armoireEquipment" formatted="false">¡Genial! Has encontrado una prenda insólita en el Armario: %s.</string>
+  <string name="armoireFood" formatted="false">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" formatted="false">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 dispone 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" formatted="false">Vender (%s de oro)</string>
   <string name="hatch_with_potion">Mezclar con poción</string>
   <string name="feed_to_pet">Alimentar a mascota</string>
@@ -330,5 +341,35 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="timeTravelers">Viajeros del tiempo</string>
   <string name="seasonalShop">Tienda estacional</string>
   <string name="empty_inbox">No tienes ningún mensaje en la bandeja de entrada. Puedes enviar un mensaje a un usuario desde los mensajes de chat públicos que hayan enviado.</string>
+  <string name="party_invite">Desbloquéala invitando a tus amigos</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" formatted="false">Has comprado %1$s</string>
+  <string name="purchase_confirmation_title">Confirmar la compra</string>
+  <string name="confirm_purchase_text" formatted="false">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="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="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>
+  <string name="action_continue">Continuar</string>
+  <string name="scan_qr_code">Leer código QR</string>
+  <string name="invited_to_party">¡Te han invitado a un grupo!</string>
 </resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index a24f57921..56701c88b 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Actualiser</string>
   <string name="XP_default">Expérience</string>
   <string name="HP_default">Santé</string>
@@ -13,6 +12,7 @@
   <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="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>
@@ -351,8 +351,25 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</string>
   <string name="hourglass">sablier</string>
   <string name="hourglasses">sabliers</string>
   <string name="gold_singular">pièce d\'or</string>
-  <string name="gold_plural">or</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">Êtes-vous sûr•e?</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é à</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>
+  <string name="action_continue">Continuer</string>
+  <string name="scan_qr_code">Scannez le QR code</string>
+  <string name="invited_to_party">Vous avez été invité·e à rejoindre une équipe !</string>
 </resources>
diff --git a/Habitica/res/values-he/strings.xml b/Habitica/res/values-he/strings.xml
index 505ec6d7f..fbd02c5eb 100644
--- a/Habitica/res/values-he/strings.xml
+++ b/Habitica/res/values-he/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">האביטיקה</string>
   <string name="action_refresh">ריענון</string>
   <string name="XP_default">ניסיון</string>
   <string name="HP_default">בריאות</string>
@@ -355,8 +354,20 @@
   <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_delete">מחיקה</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>
+  <string name="action_continue">המשך</string>
+  <string name="scan_qr_code">סריקת קוד QR</string>
 </resources>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 352397d19..4f28a4e3c 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Osvježi</string>
   <string name="XP_default">Iskustvo</string>
   <string name="HP_default">Život</string>
diff --git a/Habitica/res/values-id/strings.sidebar.xml b/Habitica/res/values-id/strings.sidebar.xml
index 8d77c497b..956903413 100644
--- a/Habitica/res/values-id/strings.sidebar.xml
+++ b/Habitica/res/values-id/strings.sidebar.xml
@@ -3,6 +3,7 @@
   <string name="sidebar.tasks">Tugas</string>
   <string name="sidebar.skills">Keahlian</string>
   <string name="sidebar.section.social">Sosial</string>
+  <string name="sidebar.inbox">Kotak Pesan</string>
   <string name="sidebar.tavern">Kedai</string>
   <string name="sidebar.party">Teman</string>
   <string name="sidebar.purchaseGems">Beli Permata</string>
@@ -11,7 +12,7 @@
   <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.stable">Kandang</string>
   <string name="sidebar.news">Berita</string>
   <string name="sidebar.settings">Pengaturan</string>
   <string name="sidebar.about">Tentang Kami</string>
diff --git a/Habitica/res/values-id/strings.tutorial.xml b/Habitica/res/values-id/strings.tutorial.xml
index 0b28c2cb5..2a1d146bb 100644
--- a/Habitica/res/values-id/strings.tutorial.xml
+++ b/Habitica/res/values-id/strings.tutorial.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Lakukan Kebiasaan Baik untuk mendapatkan emas dan pengalaman! Kebiasaan Buruk akan menyakiti avatarmu jika kamu mengetuknya, jadi hindari melakukannya di dunia nyata!</string>
-  <string name="tutorial_dailies">Kalahkan tugas harianmu yang berulang untuk mendapatkan emas dan pengalaman. Bahaya! Keseharian akan menyakiti avatarmu jika kamu tidak menyelesaikannya tepat waktu.</string>
+  <string name="tutorial_habits">Lakukan Kebiasaan Baik untuk mendapatkan emas dan pengalaman! Kebiasaan Buruk akan menyakiti avatarmu jika kamu ketuk, jadi hindari melakukannya di dunia nyata!</string>
+  <string name="tutorial_dailies">Selesaikan tugas harianmu yang berulang untuk mendapatkan emas dan pengalaman. Bahaya! Keseharian akan menyakiti avatarmu jika kamu tidak menyelesaikannya tepat waktu.</string>
   <string name="tutorial_todos">Lakukan Tugasmu di dunia nyata, lalu ceklis daftar untuk EMAS dan PENGALAMAN sehingga kamu bisa mendapatkan Hadiah dan membuka fitur baru!</string>
   <string name="tutorial_rewards">Ini adalah Hadiahmu! Dapatkan emas dengan menyelesaikan Tugas dunia-nyata, Keseharian, dan Daftar Tugas. Kemudian habiskan untuk Hadiah dalam game atau Hadiah dunia nyata kustom!</string>
   <string name="tutorial_equipment">Perlengkapan yang kamu beli akan muncul di sini. Perlengkapan Bertarung milikmu akan mempengaruhi status, dan Kostum (jika dicentang) hanya mempengaruhi apa yang avatarmu kenakan.</string>
diff --git a/Habitica/res/values-id/strings.xml b/Habitica/res/values-id/strings.xml
index ec818bb1c..afef99269 100644
--- a/Habitica/res/values-id/strings.xml
+++ b/Habitica/res/values-id/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Muat Ulang</string>
   <string name="XP_default">Pengalaman </string>
   <string name="HP_default">Kesehatan</string>
@@ -13,12 +12,23 @@
   <string name="SP_userID_summary">ID Pengguna Anda</string>
   <string name="SP_APIToken_title">Token API</string>
   <string name="SP_APIToken_summary">Token API Anda</string>
+  <string name="SP_user_qr_code">QR Kodemu</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_reminder_header">Peringatan Harian</string>
   <string name="pref_reminder_checkbox">Aktifkan Peringatan</string>
   <string name="pref_reminder_picker">Atur Waktu Peringatan</string>
+  <string name="pref_push_notifications_checkbox">Notifikasi Tampil Pengguna</string>
+  <string name="push_notifications">Notifikasi Tampil</string>
+  <string name="preference_push_you_won_challenge">Kamu memenangkan sebuah Tantangan!</string>
+  <string name="preference_push_received_a_private_message">Menerima sebuah Pesan Pribadi</string>
+  <string name="preference_push_gifted_gems">Permata terhadiahkan</string>
+  <string name="preference_push_gifted_subscription">Langganan terhadiahkan</string>
+  <string name="preference_push_invited_to_party">Terundang ke Kelompok</string>
+  <string name="preference_push_invited_to_guild">Terundang ke Perserikatan</string>
+  <string name="preference_push_your_quest_has_begun">Tugasmu telah Dimulai</string>
+  <string name="preference_push_invited_to_quest">Terundang ke Tugas</string>
   <!--Adding tasks-->
   <string name="task_value">Nilai</string>
   <string name="new_todo">Tugas baru</string>
@@ -70,6 +80,7 @@
   <string name="positive_habit_form">Positif (+)</string>
   <string name="negative_habit_form">Negatif (-)</string>
   <string name="checklist">Ceklis</string>
+  <string name="reminders">Pengingat</string>
   <string name="actions">Aksi</string>
   <string name="attributes">Atribut</string>
   <string name="physical">Fisik</string>
@@ -93,6 +104,7 @@
   <string name="faint_subtitle">Jangan bersedih!</string>
   <string name="faint_penalty_body">Kamu kehilangan Level, Emasmu, dan sepotong Perlengkapan, tetapi kamu dapat mendapatkannya kembali dengan kerja keras! Semoga berhasil--kamu pasti bisa.</string>
   <string name="faint_header">Kamu kehabisan Nyawa!</string>
+  <string name="faint_button">Isi ulang Kesehatan &amp; Ulang Lagi</string>
   <string name="filter">Filter</string>
   <string name="profile_image">Gambar Profil</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
@@ -221,6 +233,7 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</string>
   <string name="privacy">Privasi</string>
   <string name="write_message">Tulis Pesan</string>
   <string name="post">Kirim</string>
+  <string name="guild_search_hint">Mencari Perserikatan</string>
   <string name="todo_due" formatted="false">Tenggat: %s</string>
   <string name="daily_streak" formatted="false">%d kali berturut-turut</string>
   <string name="todo_has_duedate">Tugas memiliki Tenggat Waktu</string>
@@ -303,6 +316,7 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</string>
   <string name="dialog_go_back">Kembali</string>
   <string name="opt_out_confirmation">Apakah kamu yakin kamu ingin mematikan fitur?</string>
   <string name="change_class">Ganti profesi</string>
+  <string name="change_class_description">Ubah kelasmu dan terima kembali nilai atribut sebanyak 3 permata. Kamu bisa menempatkan nilai atribut melalui laman web</string>
   <string name="enable_class">Aktifkan Sistem Profesi</string>
   <string name="changing_class_progress">Ganti Profesi</string>
   <string name="by_email">Melalui Email</string>
@@ -319,5 +333,42 @@ Untuk memulai, bagian mana dari hidupmu yang ingin kamu tingkatkan?</string>
   <string name="share_levelup" formatted="false">Saya naik level %s di Habitica dengan meningkatkan kebiasaan kehidupan-nyata saya!</string>
   <string name="share_hatched" formatted="false">Saya menetaskan peliharaan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya! </string>
   <string name="share_raised" formatted="false">Saya baru mendapatkan tunggangan seekor %2$s %1$s di Habitica dengan menyelesaikan tugas kehidupan-nyata saya!</string>
+  <string name="open_in_store">Buka di Play Store</string>
+  <string name="change_class_confirmation">Apa kamu yakin untuk mengubah kelas? Ini akan membutuhkan 3 permata.</string>
+  <string name="leaderMessage" formatted="false">Pesan dari %1$s</string>
+  <string name="confirm">Pastikan</string>
+  <string name="market">Pasar</string>
+  <string name="timeTravelers">Penjelajah Waktu</string>
+  <string name="seasonalShop">Toko Musiman</string>
+  <string name="empty_inbox">Kamu tidak memiliki pesan dalam Kotak Masuk. Kamu bisa mengirim pesan baru ke pengguna lain melalui pesan publik!</string>
+  <string name="party_invite">Buka dengan mengundang teman</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" formatted="false">%1$s telah sukses terbeli</string>
+  <string name="purchase_confirmation_title">Pastikan belian</string>
+  <string name="confirm_purchase_text" formatted="false">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>
 </resources>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index d07ec9d2f..6fcf051a3 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Aggiorna</string>
   <string name="XP_default">Esperienza</string>
   <string name="HP_default">Salute</string>
@@ -13,15 +12,19 @@
   <string name="SP_userID_summary">Il tuo ID utente</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Il tuo API Token</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="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_push_notifications_checkbox">Notifiche push utente</string>
   <string name="push_notifications">Notifiche Push</string>
   <string name="preference_push_you_won_challenge">Hai vinto una Sfida!</string>
   <string name="preference_push_received_a_private_message">Ricevuto un messaggio</string>
+  <string name="preference_push_gifted_gems">Gemme regalate</string>
+  <string name="preference_push_gifted_subscription">Abbonamento regalato</string>
   <string name="preference_push_invited_to_party">Invito in una squadra</string>
   <string name="preference_push_invited_to_guild">Invito in una Gilda</string>
   <string name="preference_push_your_quest_has_begun">La tua Missione è cominciata</string>
@@ -94,7 +97,7 @@
   <string name="friday">Venerdì</string>
   <string name="saturday">Sabato</string>
   <string name="sunday">Domenica</string>
-  <string name="levelup_header">Sei salito di livello!</string>
+  <string name="levelup_header">Nuovo livello!</string>
   <string name="levelup_detail">Raggiungendo obiettivi nella vita reale, sei salito al Livello %1$d!</string>
   <string name="levelup_health">Sei stato completamente curato!</string>
   <string name="levelup_button">Urrà!</string>
@@ -221,7 +224,7 @@ Per cominciare, quali parti della tua vita vuoi migliorare?</string>
   <string name="leader">Leader</string>
   <string name="gems">Gemme</string>
   <string name="copy_as_todo">Copia come ToDo</string>
-  <string name="send_pm">Invia messaggio</string>
+  <string name="send_pm">Invia messaggio privato</string>
   <string name="flag">Segnala</string>
   <string name="delete">Elimina</string>
   <string name="name">Nome</string>
@@ -230,6 +233,7 @@ Per cominciare, quali parti della tua vita vuoi migliorare?</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" formatted="false">Scade: %s</string>
   <string name="daily_streak" formatted="false">serie: %d</string>
   <string name="todo_has_duedate">L\' attività ha una scadenza</string>
@@ -348,7 +352,25 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <string name="hourglass">clessidra</string>
   <string name="hourglasses">clessidre</string>
   <string name="gold_singular">oro</string>
+  <string name="gold_plural">oro</string>
   <string name="chat_message_copied">Messaggio copiato negli Appunti</string>
   <string name="copy_chat_message">Copia negli appunti</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="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 a</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>
+  <string name="action_continue">Continua</string>
+  <string name="scan_qr_code">Rileva codice QR</string>
+  <string name="invited_to_party">Hai ricevuto un invito per unirti a una squadra!</string>
 </resources>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 9495d6699..ea10e9cc1 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">更新</string>
   <string name="XP_default">経験値</string>
   <string name="HP_default">体力</string>
@@ -109,7 +108,7 @@
   <string name="filter">フィルター</string>
   <string name="profile_image">プロフィール画像</string>
   <string name="mana_price_button" formatted="false">%d マナ</string>
-  <string name="used_skill" formatted="false">%2$dマナを消費して%1$sをかけた。</string>
+  <string name="used_skill" formatted="false">%2$dマナを消費して%1$sを唱えた。</string>
   <string name="new_checklist_item">新しいチェックリスト項目</string>
   <string name="add_checklist_item">追加</string>
   <string name="reminder_title">日課をチェックした?</string>
@@ -356,8 +355,22 @@
   <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="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>
+  <string name="action_continue">続行</string>
+  <string name="scan_qr_code">QR コードを読み取る</string>
+  <string name="invited_to_party">パーティーに招待されました!</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.sidebar.xml b/Habitica/res/values-ko/strings.sidebar.xml
index d99b55868..5ca2041d5 100644
--- a/Habitica/res/values-ko/strings.sidebar.xml
+++ b/Habitica/res/values-ko/strings.sidebar.xml
@@ -16,4 +16,5 @@
   <string name="sidebar.news">뉴스</string>
   <string name="sidebar.settings">설정</string>
   <string name="sidebar.about">소개</string>
+  <string name="sidebar_shops">가게</string>
 </resources>
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 563c96ae2..40378c3f2 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">해비티카</string>
   <string name="action_refresh">새로고침</string>
   <string name="XP_default">경험</string>
   <string name="HP_default">체력</string>
@@ -13,12 +12,18 @@
   <string name="SP_userID_summary">당신의 유저ID</string>
   <string name="SP_APIToken_title">API 토큰</string>
   <string name="SP_APIToken_summary">당신의 API 토큰</string>
+  <string name="SP_user_qr_code">당신의 QR코드</string>
   <string name="PS_contact_title">연락처</string>
   <string name="unknown_error">오류가 발생했습니다...</string>
   <string name="pref_account_header">계정</string>
   <string name="pref_reminder_header">매일 알림</string>
   <string name="pref_reminder_checkbox">알림 활성화</string>
   <string name="pref_reminder_picker">알림 시간 설정</string>
+  <string name="pref_push_notifications_checkbox">사용자 알림</string>
+  <string name="push_notifications">공지를 하다</string>
+  <string name="preference_push_you_won_challenge">도전 기회를 얻었습니다.</string>
+  <string name="preference_push_received_a_private_message">개인 메시지를 받았습니다.</string>
+  <string name="preference_push_gifted_gems">선물받은 젬</string>
   <!--Adding tasks-->
   <string name="task_value">값</string>
   <string name="new_todo">새로운 할 일</string>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index d1801583c..b32335549 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Atnaujinti</string>
   <string name="XP_default">Partirtis</string>
   <string name="HP_default">Gyvybingumas</string>
@@ -13,6 +12,7 @@
   <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="SP_user_qr_code">Tavo QR Kodas</string>
   <string name="PS_contact_title">Susisiekti</string>
   <string name="unknown_error">Įvyko klaida...</string>
   <string name="pref_account_header">Paskyra</string>
@@ -354,5 +354,22 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</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="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>
+  <string name="action_continue">Tęsti</string>
+  <string name="scan_qr_code">Nuskanuok QR Kodą</string>
+  <string name="invited_to_party">Tave pakvietė į grupę!</string>
 </resources>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index dabd4258f..180162a71 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Verversen</string>
   <string name="XP_default">Ervaring</string>
   <string name="HP_default">Gezondheid</string>
@@ -13,6 +12,7 @@
   <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="SP_user_qr_code">Je QR code</string>
   <string name="PS_contact_title">Contact</string>
   <string name="unknown_error">Er ging iets mis...</string>
   <string name="pref_account_header">Account</string>
@@ -68,7 +68,7 @@
   <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="notes">Aantekeningen</string>
+  <string name="notes">Notities</string>
   <string name="text">Tekst</string>
   <string name="difficulty">Moeilijkheidsgraad</string>
   <string name="tags">Labels</string>
@@ -98,7 +98,7 @@
   <string name="saturday">Zaterdag</string>
   <string name="sunday">Zondag</string>
   <string name="levelup_header">Je bent een niveau omhoog gegaan!</string>
-  <string name="levelup_detail">Door het behalen van je doelen in het echte leven ben je uitgegroeid tot Level %1$d!</string>
+  <string name="levelup_detail">Door het behalen van je doelen in het echte leven ben je uitgegroeid tot Niveau %1$d!</string>
   <string name="levelup_health">Je bent volledig genezen!</string>
   <string name="levelup_button">Hoera!</string>
   <string name="faint_subtitle">Wanhoop niet!</string>
@@ -192,7 +192,7 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="setup_group_heathWellness">Gezondheid + Welzijn</string>
   <string name="setup_group_school">School</string>
   <string name="setup_group_teams">Teams</string>
-  <string name="setup_group_chores">Karweitjes</string>
+  <string name="setup_group_chores">Klusjes</string>
   <string name="setup_group_creativity">Creativiteit</string>
   <string name="setup_task_work_1">E-mail verwerken</string>
   <string name="setup_task_work_2">Belangrijkste taak</string>
@@ -252,7 +252,7 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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">Ben je zeker dat je de queeste wilt beginnen? Zodra het actief is, kunnen er geen andere spelers zich bij de queeste aansluiten.</string>
-  <string name="quest.invitation.text">Je bent uitgenodigd om deel te nemen in een queeste!</string>
+  <string name="quest.invitation.text">Je bent uitgenodigd om deel te nemen aan een queeste!</string>
   <string name="ago_1day">1 dag geleden</string>
   <string name="ago_days" formatted="false">%d dagen geleden</string>
   <string name="ago_1Minute">1 minuut geleden</string>
@@ -267,12 +267,12 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="quests">Queestes</string>
   <string name="pets">Huisdieren</string>
   <string name="mounts">Rijdieren</string>
-  <string name="armoireEquipment" formatted="false">Je hebt een zeldzaam stuk van een Wapenrusting gevonden in het Kabinet: %s! Geweldig!</string>
+  <string name="armoireEquipment" formatted="false">Je hebt een zeldzaam stuk van een uitrusting gevonden in het Kabinet: %s! Geweldig!</string>
   <string name="armoireFood" formatted="false">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" formatted="false">Open het Kabinet om willekeurig speciale Wapenrustingen, Ervaring of Voedsel te vinden! Stukken Wapenrusting die nog over zijn: %d</string>
-  <string name="armoireLastItem">Je hebt het laatste stuk zeldzame Wapenrusting gevonden in het Betoverde Kabinet.</string>
-  <string name="armoireNotesEmpty">Het Kabinet zal nieuwe stukken Wapenrusting hebben tijdens de eerste week van elke maand. Blijf tot die tijd klikken voor Ervaring en Voedsel!</string>
+  <string name="armoireNotesFull" formatted="false">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" formatted="false">Verkoop (%s Goud)</string>
   <string name="hatch_with_potion">Laten uitkomen met drankje</string>
   <string name="feed_to_pet">Aan huisdier voederen</string>
@@ -283,7 +283,7 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="feed">Voeder</string>
   <string name="hatch_with" formatted="false">Laat huisdier uitkomen met %s</string>
   <string name="hatched_pet_title" formatted="false">Je hebt een %1$s %2$s laten uitkomen!</string>
-  <string name="close">Dichtdoen</string>
+  <string name="close">Sluiten</string>
   <string name="share">Delen</string>
   <string name="notification_pet_fed" formatted="false">Je hebt je %1$s %2$s gevoederd!</string>
   <string name="notification_purchase" formatted="false">%s werd gekocht</string>
@@ -310,35 +310,35 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</string>
   <string name="healer_description">Helers staan onaangedaan tegenover schade en kunnen die bescherming tot anderen uitstrekken. Gemiste Dagelijkse Taken en slechte Gewoontes doen hen niet veel, en ze hebben hun manieren om er terug bovenop te raken na pech. Speel een Heler als je het leuk vindt om anderen in je Groep te helpen of als het idee om de Dood door hard werk te slim af te zijn jou inspireert!</string>
   <string name="select_class">Selecteer Klasse</string>
   <string name="opt_out_class">Trek je terug</string>
-  <string name="opt_out_description">Vindt 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 je dan als één bepaalde klasse laten inschrijven.</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" formatted="false">Weet je zeker dat je een %s wilt zijn?</string>
   <string name="choose_class">Kies een Klasse</string>
   <string name="dialog_go_back">Ga terug</string>
   <string name="opt_out_confirmation">Ben je zeker dat je je wilt terugtrekken?</string>
-  <string name="change_class">Verander je Klasse</string>
+  <string name="change_class">Verander je klasse</string>
   <string name="change_class_description">Verander je klasse en krijg je eigenschapspunten terug voor 3 edelstenen. Je kunt eigenschapspunten toewijzen via de website</string>
   <string name="enable_class">Zet het Klassesysteem aan</string>
-  <string name="changing_class_progress">Klasse aan het veranderen</string>
+  <string name="changing_class_progress">Van klasse veranderen</string>
   <string name="by_email">Via Email</string>
   <string name="invite_existing_users">Bestaande Gebruikers Uitnodigen</string>
   <string name="send">Versturen</string>
-  <string name="invite">Vrienden Uitnodigen</string>
+  <string name="invite">Vrienden uitnodigen</string>
   <string name="invite_id_description">Als je vrienden hebt die al Habitica spelen, nodig hen hier uit door hun Gebruikers ID.</string>
-  <string name="invite_email_description">Als een vriend zich inschrijft op Habitica door jouw email, zullen ze automatisch uitgenodigd worden naar jouw groep!</string>
-  <string name="add_invites">Uitnodigingen Toevoegen</string>
+  <string name="invite_email_description">Als een vriend zich inschrijft op Habitica door 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 naar Groep</string>
+  <string name="invite_users">Nodig uit voor Groep</string>
   <string name="share_using">Deel door</string>
-  <string name="share_levelup" formatted="false">Ik ben in Habitica tot level %s geraakt door mijn echte gewoonten te verbeteren!</string>
+  <string name="share_levelup" formatted="false">Ik ben in Habitica tot level %s geraakt door mijn echte gewoontes te verbeteren!</string>
   <string name="share_hatched" formatted="false">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" formatted="false">Ik heb net een %1$s %2$s rijdier gekregen in Habitica door mijn echte taken uit te voeren!</string>
   <string name="open_in_store">Open in de play store</string>
-  <string name="change_class_confirmation">Weet je zeker dat je van klasse wil veranderen? Dit kost 3 edelstenen.</string>
+  <string name="change_class_confirmation">Weet je zeker dat je van klasse wilt veranderen? Dit kost 3 edelstenen.</string>
   <string name="leaderMessage" formatted="false">Bericht van %1$s</string>
   <string name="confirm">Bevestig</string>
   <string name="market">Markt</string>
-  <string name="timeTravelers">Tijd Reizigers</string>
+  <string name="timeTravelers">Tijdreizigers</string>
   <string name="seasonalShop">Seizoenswinkel</string>
   <string name="empty_inbox">Je hebt geen Inbox berichten. Je kan een gebruiker een nieuw bericht sturen vanuit hun publieke chat berichten.</string>
   <string name="party_invite">Ontgrendel door vrienden uit te nodigen</string>
@@ -354,5 +354,22 @@ Om te beginnen, welke delen van je leven wil je verbeteren?</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="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>
+  <string name="action_continue">Ga verder</string>
+  <string name="scan_qr_code">Scan QR code</string>
+  <string name="invited_to_party">Je bent uitgenodigd voor een groep!</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 01ff70caa..421592a84 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Odśwież</string>
   <string name="XP_default">Doświadczenie</string>
   <string name="HP_default">Zdrowie</string>
@@ -8,10 +7,10 @@
   <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">Serwer na zamówienie</string>
-  <string name="SP_userID_title">ID użytkownika</string>
-  <string name="SP_userID_summary">Twoje ID</string>
-  <string name="SP_APIToken_title">API Token</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="SP_user_qr_code">Twój kod QR</string>
   <string name="PS_contact_title">Skontaktuj się ze mną</string>
@@ -359,4 +358,9 @@ Od czego chcesz zacząć poprawiać swoje życie?</string>
   <string name="qr_section_title">Czy ktoś 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>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index ffa848a0a..65d008bd0 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Atualizar</string>
   <string name="XP_default">Experiência</string>
   <string name="HP_default">Vida</string>
@@ -169,7 +168,7 @@
   <string name="quest.rejected">Rejeitado</string>
   <string name="quest.participants">Participantes</string>
   <string name="version_info" formatted="false">Versão %s (%d)</string>
-  <string name="sidebar_help">Ajuda &amp;amp: Perguntas Frequentes</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_title">Bem vindo(a) ao Habitica</string>
@@ -226,7 +225,7 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="gems">Gemas</string>
   <string name="copy_as_todo">Copiar como Afazer</string>
   <string name="send_pm">Enviar mensagem privada</string>
-  <string name="flag">Bandeira</string>
+  <string name="flag">Reportar</string>
   <string name="delete">Excluir</string>
   <string name="name">Nome</string>
   <string name="description">Descrição</string>
@@ -235,7 +234,7 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="write_message">Escrever mensagem</string>
   <string name="post">Publicar</string>
   <string name="guild_search_hint">Busque guildas</string>
-  <string name="todo_due" formatted="false">Devido: %s</string>
+  <string name="todo_due" formatted="false">Data limite: %s</string>
   <string name="daily_streak" formatted="false">Raia atual: %d</string>
   <string name="todo_has_duedate">Tarefa com vencimento</string>
   <string name="battle_gear">Equipamento de batalha</string>
@@ -297,7 +296,7 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="sectionquestMounts">Montarias de Missões</string>
   <string name="sectionspecialMounts">Montarias Raras</string>
   <string name="world_quest">Missões Globais</string>
-  <string name="inn_description">Descanse na Pousada para prevenir suas metas incompletas de le causarem dano de um dia para o outro! (Nota: Não le previne de receber dano do Boss)</string>
+  <string name="inn_description">Descanse na Pousada para prevenir suas metas incompletas de lhe causarem dano de um dia para o outro! (Nota: Não lhe previne de receber dano do Chefe)</string>
   <string name="empty_items" formatted="false">Você não tem nenhum %s</string>
   <string name="user_level" formatted="false">Level %s</string>
   <string name="user_level_with_class" formatted="false">Level %1$s - %2$s</string>
@@ -356,8 +355,22 @@ Para começar, quais partes da sua vida você quer melhorar?</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">Mensagem copiada para Área de Transferência</string>
+  <string name="edit_tag_title">Editar marcador</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="confirm_delete_tag_message">Você realmente quer deletar?</string>
+  <string name="filter_drawer_edit_tags">Editar marcadores</string>
+  <string name="filter_drawer_filter_tags">Filtrar por marcadores</string>
   <!--QR Strings-->
   <string name="qr_section_title">Deixe que te convidem com esse código QR</string>
   <string name="qr_save_message">Código QR salvo</string>
   <string name="qr_dialogue_title">Seu código QR</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>
+  <string name="action_continue">Continuar</string>
+  <string name="scan_qr_code">Escanear QR Code</string>
+  <string name="invited_to_party">Você foi convidado para um grupo!</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.sidebar.xml b/Habitica/res/values-pt-rPT/strings.sidebar.xml
index 7df89c5de..897b864d6 100644
--- a/Habitica/res/values-pt-rPT/strings.sidebar.xml
+++ b/Habitica/res/values-pt-rPT/strings.sidebar.xml
@@ -15,5 +15,6 @@
   <string name="sidebar.stable">Estábulo</string>
   <string name="sidebar.news">Noticias</string>
   <string name="sidebar.settings">Definições</string>
-  <string name="sidebar.about">Acerca</string>
+  <string name="sidebar.about">Sobre</string>
+  <string name="sidebar_shops">Lojas</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.tutorial.xml b/Habitica/res/values-pt-rPT/strings.tutorial.xml
index ce8969123..9f575060c 100644
--- a/Habitica/res/values-pt-rPT/strings.tutorial.xml
+++ b/Habitica/res/values-pt-rPT/strings.tutorial.xml
@@ -1,14 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="tutorial_habits">Completa os teus Hábitos Positivos para ganhar ouro e experiência! Hábitos Negativos vão magoar o teu avatar se carregares neles, por isso evita-os na vida real!</string>
-  <string name="tutorial_dailies">Derrotando repetidamente as tuas tarefas diárias para ganhar ouro e experiência. Perigo! As tarefas diárias irão magoar o teu avatar se não as completares a tempo.</string>
+  <string name="tutorial_habits">Complete os Hábitos Positivos para ganhar ouro e experiência! Hábitos Negativos irão magoar o seu avatar se tocar neles, por isso evite-os na vida real!</string>
+  <string name="tutorial_dailies">Vença as suas tarefas Diárias repetitivas para ganhar ouro e experiência. Perigo! As Tarefas Diárias irão magoar o seu avatar se não as completar a tempo.</string>
   <string name="tutorial_todos">Completa as tuas tarefas na vida real, depois verifica-as por OURO e EXPERIÊNCIA para que possas ganhar Recompensas e desbloquear novas habilidades!</string>
-  <string name="tutorial_rewards">Estas são as tuas recompensas! Ganha ouro por completar hábitos do mundo real, tarefas diárias e listas de tarefas. Depois gasta-as nas Recompensas de jogo ou em Recompensas do mundo real personalizáveis!</string>
-  <string name="tutorial_equipment">Quando compras equipamento, ele aparece aqui. O teu Equipamento de Batalha afeta as tuas estatísticas, e o teu fato (se accionado) afecta o que o teu avatar pode vestir.</string>
-  <string name="tutorial_items">Ganha itens ao completar as tarefas e aumentar de nível. Carrega num item para usá-lo!</string>
-  <string name="tutorial_pets">Ao completar as tuas tarefas do mundo real, tu terás a hipótese de aleatóriamente encontrar ovos e poções. Combina-os para gerar animais</string>
-  <string name="tutorial_skills">Atributos são habilidades especiais que te dão efeitos poderosos! Carrega num atributo para utilizá-lo. Ele vai gastar Mana (a barra azul), que ganhas por te ligares todos os dias e completar as tuas tarefas da vida real. Verifica as FAQ no menu para mais informação!</string>
-  <string name="tutorial_party">Isto é onde tu e os teus amigos podem responsabilizar-se mutuamente pelos vossos objectivos e lutar contra monstros com as vossas tarefas!</string>
-  <string name="tutorial_tavern">Bem vindo a taberna, uma sala de conversação publica para todas as idades! Aqui podes falar de produtividade e colocar questões. Diverte-te!</string>
+  <string name="tutorial_rewards">Estas são as suas Recompensas! Ganhe ouro completando os Hábitos do mundo real, Tarefas Diárias e listas de Tarefas. Depois gaste-as nas Recompensas no jogo ou em Recompensas do mundo real personalizadas!</string>
+  <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_party">Isto é onde você e os seus amigos podem responsabilizar-se mutuamente para os vossos objetivos e lutar contra monstros com as vossas tarefas!</string>
+  <string name="tutorial_tavern">Bem-vindo ao Tabern, uma sala de conversação publica para todas as idades! Aqui pode conversar sobre a produtividade e colocar questões. Divirta-se!</string>
   <string name="tutorial_classes">Escolhe tornares-te um Guerreiro, um Feiticeiro, um Curandeiro ou um bandido! Cada classe tem equipamento e atributos únicos. Carrega em (?) para saber mais!</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index aaafa6870..a8da06847 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -1,24 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
-  <string name="action_refresh">Actualizar</string>
+  <string name="action_refresh">Atualizar</string>
   <string name="XP_default">Experiência</string>
-  <string name="HP_default">Saúde</string>
+  <string name="HP_default">Vida</string>
   <string name="MP_default">Mana</string>
-  <string name="ERR_pb_barcode">As definições não puderam ser carregadas do código de barras</string>
+  <string name="ERR_pb_barcode">Não foi possível carregar as predefinições do código de barras</string>
   <!--Prefs-->
   <string name="PS_settings_title">Definições</string>
-  <string name="SP_address_hint">O teu servidor personalizado</string>
-  <string name="SP_userID_title">ID de utilizador</string>
-  <string name="SP_userID_summary">O teu ID de utilizador</string>
+  <string name="SP_address_hint">O seu servidor personalizado</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="PS_contact_title">Contacta-me</string>
-  <string name="unknown_error">Um erro aconteceu...</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="pref_reminder_header">Aviso diário</string>
-  <string name="pref_reminder_checkbox">Ativar aviso</string>
-  <string name="pref_reminder_picker">Definir aviso de lembrança</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_push_notifications_checkbox">Enviar Notificações do Utilizador</string>
+  <string name="push_notifications">Enviar Notificações</string>
+  <string name="preference_push_you_won_challenge">Ganhou um Desafio!</string>
+  <string name="preference_push_received_a_private_message">Recebeu uma Mensagem Privada</string>
+  <string name="preference_push_gifted_gems">Gemas Oferecidas</string>
+  <string name="preference_push_gifted_subscription">Subscriação Oferecida</string>
+  <string name="preference_push_invited_to_party">Convidado para a Equipa</string>
+  <string name="preference_push_invited_to_guild">Convidado para o Grêmio</string>
+  <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">Nova tarefa</string>
@@ -26,42 +36,42 @@
   <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">Apagar</string>
+  <string name="action_delete">Eliminar</string>
   <string name="action_cancel">Cancelar</string>
-  <string name="login_btn">Entrar</string>
-  <string name="register_btn">Registo</string>
+  <string name="login_btn">Iniciar Sessão</string>
+  <string name="register_btn">Registar</string>
   <string name="username">Nome de utilizador</string>
-  <string name="email_username">Email ou nome de utilizador</string>
-  <string name="password">Password</string>
-  <string name="emailAddress">Endereço de email</string>
-  <string name="confirmpassword">Confirmar password</string>
-  <string name="logout">Sair</string>
+  <string name="email_username">E-mail ou Nome de Utilizador</string>
+  <string name="password">Palavra-passe</string>
+  <string name="emailAddress">Endereço de e-mail</string>
+  <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="account_details">Detalhes da Conta</string>
   <string name="LoginActivityName">Bem-vindo</string>
   <string name="string_revive">Reanimar</string>
-  <string name="please_connect">Por favor liga-te através da aplicação antes de utilizar o widget</string>
-  <string name="about.title">Acerca</string>
-  <string name="about.libraries">Livrarias</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 open source no GitHub</string>
-  <string name="about.rate_our_app">Classifica a nossa aplicação</string>
-  <string name="about.give_us_feedback">Envia-nos comentários!</string>
-  <string name="about.bugreport">Comunica um problema</string>
-  <string name="about.source_code">Código fonte</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="network_error_title">Erro de ligação</string>
-  <string name="network_error_no_network_body">Não estás ligado à internet.</string>
-  <string name="internal_error_api">Parece que há um problema com o servidor. Tenta novamente mais tarde.</string>
-  <string name="authentication_error_title">Erro de autenticação</string>
-  <string name="authentication_error_body">O teu nome de Utilizador e/ou Password está incorrecto.</string>
-  <string name="login_validation_error_title">Erro de validação</string>
-  <string name="login_validation_error_fieldsmissing">Tu tens de preencher todos os campos.</string>
+  <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="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_fieldsmissing">Tem de preencher todos os campos.</string>
   <string name="save_changes">Guardar</string>
   <string name="notes">Notas</string>
   <string name="text">Texto</string>
   <string name="difficulty">Dificuldade</string>
-  <string name="tags">Etiqueta</string>
+  <string name="tags">Etiquetas</string>
   <string name="trivial">Trivial</string>
   <string name="easy">Fácil</string>
   <string name="medium">Média</string>
@@ -69,7 +79,7 @@
   <string name="start_date">Data de Início</string>
   <string name="positive_habit_form">Positivo ( + )</string>
   <string name="negative_habit_form">Negativo ( - )</string>
-  <string name="checklist">Lista de verificações</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>
@@ -87,41 +97,42 @@
   <string name="friday">Sexta</string>
   <string name="saturday">Sábado</string>
   <string name="sunday">Domingo</string>
-  <string name="levelup_header">Tu subiste um nível!</string>
-  <string name="levelup_detail">Ao atingir os teus objectivos da vida real, tu evoluíste para o Nível %1$d!</string>
-  <string name="levelup_health">Foste totalmente curado!</string>
-  <string name="levelup_button">Hurrah!</string>
-  <string name="faint_subtitle">Não desesperes!</string>
-  <string name="faint_penalty_body">Tu perdeste um Nível, o teu Ouro e uma peça do teu Equipamento, mas consegues recuperá-los de volta com trabalho duro! Boa sorte - tu serás grande.</string>
-  <string name="faint_header">Tu ficaste sem Saúde!</string>
+  <string name="levelup_header">Ganhou um nível!</string>
+  <string name="levelup_detail">Ao atingir os seus objetivos da vida real, evoluiu para o Nível %1$d!</string>
+  <string name="levelup_health">Foi totalmente curado!</string>
+  <string name="levelup_button">Hurra!</string>
+  <string name="faint_subtitle">Não desespere!</string>
+  <string name="faint_penalty_body">Perdeu um Nível, o seu Ouro, e uma peça de Equipamento, mas consegue recuperá-los de novo, com trabalho duro! Boa sorte - irá conseguir.</string>
+  <string name="faint_header">Gastou a sua Vida!</string>
+  <string name="faint_button">Recarregue a Vida e Tente Novamente</string>
   <string name="filter">Filtro</string>
-  <string name="profile_image">Imagem de perfil</string>
+  <string name="profile_image">Imagem de Perfil</string>
   <string name="mana_price_button" formatted="false">%d MP</string>
-  <string name="used_skill" formatted="false">Tu usaste %1$s de %2$d mana.</string>
-  <string name="new_checklist_item">Novo item da lista de verificações</string>
+  <string name="used_skill" formatted="false">Usou %1$s de %2$d mana.</string>
+  <string name="new_checklist_item">novo item da lista de verificações</string>
   <string name="add_checklist_item">Adicionar</string>
-  <string name="reminder_title">Lembrar de verificar os teus hábitos diários!</string>
+  <string name="reminder_title">Lembre-se de verificar as suas Tarefas Diárias!</string>
   <string name="skill_progress_title">Utilizando habilidade</string>
-  <string name="coming_soon">Em breve</string>
-  <string name="chat_flag_confirmation">Tens a certeza que queres denunciar esta mensagem por violação?</string>
-  <string name="flag_confirm">Marcar mensagem</string>
-  <string name="unlock_lvl_11">Desbloqueável no nível 11</string>
-  <string name="no_party_message">Tu não estás numa equipa. Para te juntares a uma equipa, por favor visita o website.</string>
-  <string name="forgot_pw_btn">Password esquecida</string>
-  <string name="forgot_pw_tv">Esqueceste a password? Por favor utiliza a versão móvel do Website</string>
-  <string name="tavern.inn.checkOut">Reactive as suas Tarefas Diárias</string>
-  <string name="tavern.inn.rest">Suspenda temporariamente as suas Tarefes Diárias</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="forgot_pw_tv">Esqueceu-se da sua palavra-passe? Por favor, use a versão móvel do site da Web.</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">Destituir</string>
+  <string name="reward.dialog.dismiss">Rejeitar</string>
   <string name="party">Equipa</string>
   <string name="chat">Conversar</string>
   <string name="members">Membros</string>
   <string name="habits">Hábitos</string>
-  <string name="dailies">Tarefas diárias</string>
+  <string name="dailies">Tarefas Diárias</string>
   <string name="todos">Tarefas</string>
   <string name="rewards">Recompensas</string>
-  <string name="taskform.delete.title">Tens a certeza?</string>
-  <string name="taskform.delete.message">Queres mesmo apagar?</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="no">Não</string>
   <string name="quest">Missão</string>
@@ -129,7 +140,7 @@
   <string name="avatar_hair">Cabelo</string>
   <string name="avatar_shirt">Camisa</string>
   <string name="avatar_skin">Pele</string>
-  <string name="avatar_ears">Ouvidos de animais</string>
+  <string name="avatar_ears">Ouvidos do Animal</string>
   <string name="avatar_base">Base</string>
   <string name="avatar_color">Cor</string>
   <string name="avatar_beard">Barba</string>
@@ -141,42 +152,42 @@
   <string name="avatar_size_slim">Magro</string>
   <string name="avatar_size_broad">Largo</string>
   <string name="avatar_background">Fundo</string>
-  <string name="purchase_customization">Comprar personalização</string>
+  <string name="purchase_customization">Comprar Personalização</string>
   <string name="purchase_set_button" formatted="false">Desbloquear conjunto por %d gemas</string>
   <string name="purchase_button">Comprar</string>
   <string name="purchase_set_title" formatted="false">Comprar conjunto %s</string>
-  <string name="due_date">Data limite</string>
+  <string name="due_date">Data Limite</string>
   <string name="quest.accept">Aceitar</string>
   <string name="quest.reject">Rejeitar</string>
-  <string name="quest.begin">Começar 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.begin">Começar 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">Aceitado</string>
+  <string name="quest.accepted">Aceite</string>
   <string name="quest.rejected">Rejeitado</string>
   <string name="quest.participants">Participantes</string>
   <string name="version_info" formatted="false">Versão %s (%d)</string>
-  <string name="sidebar_help">Ajuda &amp; FAQ</string>
-  <string name="complete_tutorial">Entendido!</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_title">Bem vindo à Habitica</string>
+  <string name="intro_1_title">Bem-vindo ao Habitica</string>
   <string name="intro_1_description">Junta-te a mais de 1,100,000 de pessoas divertindo-se enquanto fazem as suas coisas. Cria um avatar e vigia as tuas tarefas da vida real.</string>
-  <string name="intro_2_title">Progresso no jogo = Progresso na vida</string>
-  <string name="intro_2_description">Desbloqueia habilidades no jogo ao cumprires as tuas tarefas da vida real. Ganha armaduras, animais e muito mais para te recompensar por cumprires os teus objectivos!</string>
-  <string name="intro_3_title">Socializa e luta contra monstros</string>
+  <string name="intro_2_title">Progresso do Jogo = Progresso da Vida Real</string>
+  <string name="intro_2_description">Desbloqueie funcionalidades no jogo, ao cumprires as tuas tarefas da vida real. Ganhe armaduras, animais, e muito mais para o recompensar por cumprir os seus objetivos!</string>
+  <string name="intro_3_title">Socialize e Lute Contra Monstros</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">Começando</string>
+  <string name="intro_finish_button">Iniciação</string>
   <string name="previous_button">Anterior</string>
   <string name="next_button">Seguinte</string>
-  <string name="skip_button">Saltar</string>
-  <string name="setup_welcome_description">Bem vindo à Habitica, onde avançar no jogo melhorará a tua vida real! Ao atingir os objectivos do mundo real, desbloqueias equipamento, animais, tarefas e mais.</string>
+  <string name="skip_button">Ignorar</string>
+  <string name="setup_welcome_description">Bem-vindo ao Habitica, onde avançar no jogo irá melhor a sua vida real! Ao atingir os objetivos do mundo real, irá desbloquear equipamento, animais, tarefas, e muito mais.</string>
   <string name="setup_welcome_title">Bem-vindo</string>
-  <string name="avatar_setup_description">Primeiro, precisas de um avatar no jogo para te representar! As coisas que fazes na vida real vão afetar a saúde do teu avatar, o nível de experiência e ouro.</string>
+  <string name="avatar_setup_description">Primeiro, precisa de um avatar no jogo para o representar! As coisas que faz na vida real irão afetar a vida do seu avatar, o nível de experiência, e o ouro.</string>
   <string name="task_setup_description">Esplêndido! Agora vamos definir as tuas tarefa para que possas começar a ganhar experiência e ouro.
 
 Para começar, quais as partes da tua vida que queres melhorar?</string>
-  <string name="setup_group_work">Trabalh</string>
+  <string name="setup_group_work">Trabalho</string>
   <string name="setup_group_exercise">Exercício</string>
   <string name="setup_group_heathWellness">Saúde + Bem-estar</string>
   <string name="setup_group_school">Escola</string>
@@ -185,50 +196,51 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="setup_group_creativity">Criatividade</string>
   <string name="setup_task_work_1">Email processado</string>
   <string name="setup_task_work_2">Tarefa mais importante</string>
-  <string name="setup_task_work_3">Projecto de trabalho</string>
-  <string name="setup_task_exercise_1">10 minutos de cardio</string>
+  <string name="setup_task_work_3">Projeto de Trabalho</string>
+  <string name="setup_task_exercise_1">10 minutos de cárdio</string>
   <string name="setup_task_exercise_2">Alongamentos</string>
-  <string name="setup_task_exercise_3">Definir uma agenda de trabalho</string>
+  <string name="setup_task_exercise_3">Defina uma agenda de trabalho</string>
   <string name="setup_task_healthWellness_1">Comer comida saudável/rápida</string>
-  <string name="setup_task_healthWellness_2">Fio-dental</string>
-  <string name="setup_task_healthWellness_3">Agenda uma revisão médica</string>
-  <string name="setup_task_school_1">Estuda/preguiça</string>
-  <string name="setup_task_school_2">Faz o trabalho de casa</string>
-  <string name="setup_task_school_3">Termina o trabalho para a aula</string>
-  <string name="setup_task_teams_1">Reune com a equipa</string>
-  <string name="setup_task_teams_2">Atualiza o estado da equipa</string>
-  <string name="setup_task_teams_3">Completa o projecto da equipa</string>
+  <string name="setup_task_healthWellness_2">Fio dental</string>
+  <string name="setup_task_healthWellness_3">Agende um exame médico</string>
+  <string name="setup_task_school_1">Estudar/Adiar</string>
+  <string name="setup_task_school_2">Faça o trabalho de casa</string>
+  <string name="setup_task_school_3">Termine o trabalho para a aula</string>
+  <string name="setup_task_teams_1">Reúna-se com a equipa</string>
+  <string name="setup_task_teams_2">Atualize o estado da equipa</string>
+  <string name="setup_task_teams_3">Complete o projeto da equipa</string>
   <string name="setup_task_chores_1">10 minutos de limpeza</string>
-  <string name="setup_task_chores_2">Lavar a loiça</string>
-  <string name="setup_task_chores_3">Organizar o armário</string>
+  <string name="setup_task_chores_2">Lavar a Louça</string>
+  <string name="setup_task_chores_3">Organizar o Armário</string>
   <string name="setup_task_creativity_1">Estudar a mestria de um ofício</string>
-  <string name="setup_task_creativity_2">Trabalhar num projecto criativo</string>
-  <string name="setup_task_creativity_3">Terminar um projecto criativo</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">Queres ajudar o Habitica a persistir? Podes suportar os desenvolvedores ao comprar gemas!\n\n As gemas permitem-te comprar extras divertidos para a tua conta, incluindo: \n\n - Fatos engraçados para o teu avatar\n - Fantásticos fundos\n - Missões engraçadas que te recompensam com ovos de animais\n - A posibilidade de mudares a tua classe antes do nivel 100\n\n Muito obrigado por nos ajudares a tornar o Habitica no melhor que pode ser. O teu suporte significa muito para nós!</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">Juntar</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="copy_as_todo">Copiar como Tarefas</string>
   <string name="send_pm">Enviar Mensagem Pessoal</string>
-  <string name="flag">Reportar</string>
-  <string name="delete">Apagar</string>
+  <string name="flag">Marcar</string>
+  <string name="delete">Eliminar</string>
   <string name="name">Nome</string>
   <string name="description">Descrição</string>
   <string name="add_tag">Adicionar Etiqueta</string>
   <string name="privacy">Privacidade</string>
-  <string name="write_message">Escrever mensagem</string>
+  <string name="write_message">Escrever Mensagem</string>
   <string name="post">Publicar</string>
-  <string name="todo_due" formatted="false">Prazo: %s</string>
-  <string name="daily_streak" formatted="false">combo actual: %d</string>
-  <string name="todo_has_duedate">A Tarefa tem Prazo</string>
+  <string name="guild_search_hint">Procurar por guilds</string>
+  <string name="todo_due" formatted="false">Data limite: %s</string>
+  <string name="daily_streak" formatted="false">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="costume">Traje</string>
   <string name="outfit_head">Cabeça</string>
-  <string name="outfit_headAccessory">Acessório para Cabeça</string>
+  <string name="outfit_headAccessory">Acessório de Cabeça</string>
   <string name="outfit_eyewear">Óculos</string>
   <string name="outfit_armor">Armadura</string>
   <string name="outfit_back">Costas</string>
@@ -237,23 +249,23 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="outfit_weapon">Arma</string>
   <string name="wear_costume">Usar Traje</string>
   <string name="equipped">Equipado</string>
-  <string name="quest_cancel_message">Tem a certeza que quer cancelar esta missão? Todos os convites aceitos serão perdidos. O dono da missão manterá a posse do pergaminho de missão.</string>
-  <string name="quest.invitation">Convite para Missão</string>
-  <string name="quest_begin_message">Tem a certeza que quer começar a missão? Uma vez iniciada, nenhum membro adicional da equipa pode se juntar à missão.</string>
-  <string name="quest.invitation.text">Foi convidado a participar em uma missão!</string>
-  <string name="ago_1day">1 dia atrás</string>
-  <string name="ago_days" formatted="false">%d dias atrás</string>
-  <string name="ago_1Minute">1 minuto atrás</string>
-  <string name="ago_minutes" formatted="false">%d minutos atrás</string>
-  <string name="ago_hours" formatted="false">%d horas atrás</string>
-  <string name="ago_1hour">1 hora atrás</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_begin_message">Tem a certeza que pretende iniciar a missão? Assim que iniciada, nenhum membro adicional da equipa pode juntar-se à missão.</string>
+  <string name="quest.invitation.text">Foi convidado para participar numa missão!</string>
+  <string name="ago_1day">Há 1 dia</string>
+  <string name="ago_days" formatted="false">Há %d dias</string>
+  <string name="ago_1Minute">Há 1 minuto</string>
+  <string name="ago_minutes" formatted="false">Há %d minutos</string>
+  <string name="ago_hours" formatted="false">Há %d horas</string>
+  <string name="ago_1hour">Há 1 hora</string>
   <string name="today">Hoje</string>
   <string name="sidebar_items">Itens</string>
   <string name="eggs">Ovos</string>
-  <string name="hatching_potions">Poções de eclosão</string>
+  <string name="hatching_potions">Poções de Incubação</string>
   <string name="food">Comida</string>
   <string name="quests">Missões</string>
-  <string name="pets">Animais de estimação</string>
+  <string name="pets">Animais de Estimação</string>
   <string name="mounts">Montadas</string>
   <string name="armoireEquipment" formatted="false">Encontraste uma peça rara de Equipamento no Armário: %s! Fenomenal!</string>
   <string name="armoireFood" formatted="false">Vasculhas o Armário e encontras %1$s %2$s. Que é que isto está aqui a fazer?</string>
@@ -262,30 +274,30 @@ Para começar, quais as partes da tua vida que queres melhorar?</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" formatted="false">Vender (%s Ouro)</string>
-  <string name="hatch_with_potion">Eclodir ovo com poção</string>
-  <string name="feed_to_pet">Alimentar o animal</string>
-  <string name="hatch_egg">Eclodir com ovo</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="invite_party">Convidar a equipa</string>
   <string name="dialog_feeding" formatted="false">Alimente %1$s %2$s com:</string>
   <string name="use_animal">Usar</string>
   <string name="feed">Alimentar</string>
-  <string name="hatch_with" formatted="false">Eclodir animal com %s</string>
-  <string name="hatched_pet_title" formatted="false">Um %1$s %2$s eclodiu do ovo!</string>
+  <string name="hatch_with" formatted="false">Nascimento do animal com %s</string>
+  <string name="hatched_pet_title" formatted="false">Chocou um %1$s %2$s!</string>
   <string name="close">Fechar</string>
   <string name="share">Partilhar</string>
-  <string name="notification_pet_fed" formatted="false">Você alimentou %1$s %2$s!</string>
-  <string name="notification_purchase" formatted="false">Compraste %s</string>
+  <string name="notification_pet_fed" formatted="false">Alimentou o seu %1$s %2$s!</string>
+  <string name="notification_purchase" formatted="false">Comprou %s</string>
   <string name="sectionpets">Animais de Estimação Base</string>
-  <string name="sectionpremiumPets">Animais de Estimação de Poções Mágicas</string>
-  <string name="sectionquestPets">Animais de Estimação de Missões</string>
+  <string name="sectionpremiumPets">Animais de Estimação de Poção Mágica</string>
+  <string name="sectionquestPets">Animais de Estimação de Missão</string>
   <string name="sectionspecialPets">Animais de Estimação Raros</string>
   <string name="sectionmounts">Montadas Base</string>
   <string name="sectionpremiumMounts">Montadas de Poções Mágicas</string>
-  <string name="sectionquestMounts">Montadas de Missões</string>
+  <string name="sectionquestMounts">Montadas de Missão</string>
   <string name="sectionspecialMounts">Montadas Raras</string>
-  <string name="world_quest">Missão mundial</string>
-  <string name="inn_description">Descanse na Taverna para prevenir que Tarefas Diárias o magoem de um dia para o outro! (Nota: não previne dano que receba de um Chefão.) </string>
-  <string name="empty_items" formatted="false">Você não tem quaisquer %s</string>
+  <string name="world_quest">Missão Mundial</string>
+  <string name="inn_description">Descanse na Taverna para evitar que as Tarefas Diárias o magoem de um dia para o outro! (Nota: não evita que receba um dano do Chefe.) </string>
+  <string name="empty_items" formatted="false">Não tem quaisquer %s</string>
   <string name="user_level" formatted="false">Nível %s</string>
   <string name="user_level_with_class" formatted="false">Nível %1$s - %2$s</string>
   <string name="warrior">Guerreiro</string>
@@ -293,23 +305,63 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="mage">Mago</string>
   <string name="healer">Curandeiro</string>
   <string name="select_class">Selecionar Classe</string>
-  <string name="class_confirmation" formatted="false">Tem a certeza de que deseja ser um %s?</string>
+  <string name="opt_out_class">Optar</string>
+  <string name="class_confirmation" formatted="false">Tem a certeza que deseja ser um %s?</string>
   <string name="choose_class">Escolher Classe</string>
-  <string name="dialog_go_back">Anterior</string>
+  <string name="dialog_go_back">Recuar</string>
+  <string name="opt_out_confirmation">Tem a certeza que deseja Optar?</string>
   <string name="change_class">Altere a sua classe</string>
   <string name="enable_class">Ativar Sistema de Classe</string>
   <string name="changing_class_progress">Alteração de Classe</string>
   <string name="by_email">Por E-mail</string>
-  <string name="invite_existing_users">Convidar Utilziadores Existentes</string>
+  <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="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 Festa</string>
+  <string name="invite_users">Convidar para a Equipa</string>
   <string name="share_using">Partilhe, utilizando</string>
+  <string name="share_levelup" formatted="false">Eu cheguei até ao níve l%s em Habitica melhorando meus hábitos na vida real!</string>
   <string name="open_in_store">Abrir na Play Store</string>
   <string name="change_class_confirmation">Tem a certeza de que pretende alterar a sua classe? Isto irá custar 3 gemas.</string>
   <string name="leaderMessage" formatted="false">Mensagem de %1$s</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="empty_inbox">Você não tem nenhuma mensagem na sua Caixa de Entrada. Você pode enviar uma nova mensagem para um usuário a partir do bate-papo público!</string>
+  <string name="party_invite">Desbloqueie ao Convidar amigos</string>
+  <string name="no_gold">Ouro insuficiente</string>
+  <string name="no_potion">Precisa de comprar uma poção de vida</string>
+  <string name="successful_purchase" formatted="false">Comprou %1$s com sucesso</string>
+  <string name="purchase_confirmation_title">Confirmar compra</string>
+  <string name="confirm_purchase_text" formatted="false">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="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="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>
+  <string name="action_continue">Continuar</string>
+  <string name="scan_qr_code">Digitalizar Código QR</string>
+  <string name="invited_to_party">Foi convidado para se juntar à equipa!</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 37e010abc..cf34e5f24 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">Обновить</string>
   <string name="XP_default">Опыт</string>
   <string name="HP_default">Здоровье</string>
@@ -13,6 +12,7 @@
   <string name="SP_userID_summary">Ваш ID</string>
   <string name="SP_APIToken_title">API Token</string>
   <string name="SP_APIToken_summary">Ваш API Token</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>
@@ -233,6 +233,7 @@
   <string name="privacy">Приватность</string>
   <string name="write_message">Написать сообщение</string>
   <string name="post">Отправить</string>
+  <string name="guild_search_hint">Поиск для гильдий</string>
   <string name="todo_due" formatted="false">Выполнить к: %s</string>
   <string name="daily_streak" formatted="false">выполнено подряд: %d</string>
   <string name="todo_has_duedate">У задания есть срок выполнения</string>
@@ -350,7 +351,25 @@
   <string name="hourglass">Песочные часы</string>
   <string name="hourglasses">песочные часы</string>
   <string name="gold_singular">золото</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="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>
+  <string name="action_continue">Продолжить</string>
+  <string name="scan_qr_code">Сканировать QR код</string>
+  <string name="invited_to_party">Вас пригласили в команду!</string>
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index 63d141d27..0b21001fb 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">更新</string>
   <string name="XP_default">經驗值</string>
   <string name="HP_default">生命值</string>
@@ -13,12 +12,21 @@
   <string name="SP_userID_summary">你的用戶ID</string>
   <string name="SP_APIToken_title">API密碼</string>
   <string name="SP_APIToken_summary">你的API密碼</string>
+  <string name="SP_user_qr_code">你的 QR 碼</string>
   <string name="PS_contact_title">聯絡我</string>
   <string name="unknown_error">發生了一個錯誤……</string>
   <string name="pref_account_header">帳號</string>
   <string name="pref_reminder_header">每日任務提醒</string>
   <string name="pref_reminder_checkbox">啟用提醒</string>
   <string name="pref_reminder_picker">設置提醒時間</string>
+  <string name="pref_push_notifications_checkbox">開啟推送通知</string>
+  <string name="push_notifications">推送通知</string>
+  <string name="preference_push_you_won_challenge">你贏得了一個挑戰！</string>
+  <string name="preference_push_received_a_private_message">你收到一則私人訊息</string>
+  <string name="preference_push_invited_to_party">你受邀加入隊伍</string>
+  <string name="preference_push_invited_to_guild">你受邀加入公會</string>
+  <string name="preference_push_your_quest_has_begun">你的任務開始了</string>
+  <string name="preference_push_invited_to_quest">你受邀參加任務</string>
   <!--Adding tasks-->
   <string name="task_value">數值</string>
   <string name="new_todo">新待辦事項</string>
@@ -330,5 +338,7 @@
   <string name="timeTravelers">時光旅人</string>
   <string name="seasonalShop">季節限定商店</string>
   <string name="empty_inbox">你的收件匣裡面沒有任何信息。你可以利用聊天去傳送訊息給大家</string>
+  <string name="no_gold">金幣不足</string>
+  <string name="no_potion">你不需要購買治療藥水</string>
   <!--QR Strings-->
 </resources>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index f0a8727a0..013e24565 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -1,6 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="app_name">Habitica</string>
   <string name="action_refresh">刷新</string>
   <string name="XP_default">经验值</string>
   <string name="HP_default">生命值</string>
@@ -99,12 +98,12 @@
   <string name="saturday">星期六</string>
   <string name="sunday">星期日</string>
   <string name="levelup_header">你升级了！</string>
-  <string name="levelup_detail">通过完成您现实生活中的目标，您已升至 %1$d 级！</string>
+  <string name="levelup_detail">通过完成您现实生活中的目标，你已升至 %1$d 级！</string>
   <string name="levelup_health">你被完全治愈了！</string>
   <string name="levelup_button">吼啊~！</string>
   <string name="faint_subtitle">别失望！</string>
-  <string name="faint_penalty_body">你降了一级，丢失了所有的金币和一件装备。不过继续努力，你还可以把他们都拿回来的！加油！你做的很棒！</string>
-  <string name="faint_header">你没有生命值了！</string>
+  <string name="faint_penalty_body">你降了一级，丢失了所有的金币和一件装备。不过继续努力，你就可以把他们都拿回来！加油，你会更棒的！</string>
+  <string name="faint_header">你失去了所有的生命值</string>
   <string name="faint_button">补满生命值 &amp; 再次尝试</string>
   <string name="filter">过滤器</string>
   <string name="profile_image">头像</string>
@@ -185,7 +184,7 @@
   <string name="setup_welcome_description">欢迎来到Habitica，在游戏中打怪升级的同时改善自己的真实生活。完成现实生活中的目标，解锁大量装备、宠物、任务卷轴，更多特色等你探索。</string>
   <string name="setup_welcome_title">欢迎你</string>
   <string name="avatar_setup_description">首先，你需要创建一个角色来代表你自己。你在现实生活中的行动会影响到你的角色的生命值、经验值以及金钱。</string>
-  <string name="task_setup_description">打鸡血！现在开始设定你的任务，开始赚取经验和金币吧。
+  <string name="task_setup_description">太棒了！现在开始设定你的任务，开始赚取经验和金币吧。
 
 首先，你想改善生活中的哪一部分呢？</string>
   <string name="setup_group_work">工作</string>
@@ -355,8 +354,22 @@
   <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="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>
+  <string name="action_continue">继续</string>
+  <string name="scan_qr_code">扫描二维码</string>
+  <string name="invited_to_party">你被邀请加入一个队伍！</string>
 </resources>
diff --git a/Habitica/res/values/strings.profile.xml b/Habitica/res/values/strings.profile.xml
index ad214c227..44337a6d2 100644
--- a/Habitica/res/values/strings.profile.xml
+++ b/Habitica/res/values/strings.profile.xml
@@ -3,7 +3,7 @@
     <string name="profile_pets_and_mounts">Pets &amp; Mounts</string>
     <string name="profile_pets_found">Pets Found</string>
     <string name="profile_mounts_tamed">Mounts Tamed</string>
-    <string name="profile_loading_data">loading member data..</string>
+    <string name="profile_loading_data">loading member data.</string>
     <string name="profile_send_message_to">Send message to %s</string>
     <string name="profile_message_sent_to">Message sent to %s</string>
     <string name="profile_level">Level:</string>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index db86392ee..0015f6f1e 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -401,7 +401,7 @@ To start, which parts of your life do you want to improve?</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 Recipients User ID</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>
diff --git a/translations/store_strings-id.xml b/translations/store_strings-id.xml
index f6727d6d3..43d139fbf 100644
--- a/translations/store_strings-id.xml
+++ b/translations/store_strings-id.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">Perlakukan hidupmu seperti permainan untuk tetap termotivasi dan terorganisir!</string>
-  <string name="store_description">Aplikasi BARU dari HabitRPG! Ditulis ulang dari dasar untuk pengalaman yang lebih menyenangkan dan lebih banyak fitur.
+  <string name="store_description">Aplikasi BARU dari HabitRPG! Ditulis ulang dari awal untuk pengalaman yang lebih menyenangkan dan lebih banyak fitur.
 
 Perlakukan hidupmu seperti permainan untuk tetap termotivasi dan terorganisir! Habitica membuatmu lebih mudah untuk bersenang-senang sambil meraih tujuan.
 
-Masukkan Kebiasaanmu, tujuan Keseharianmu, dan daftar Tugasmu, dan buatlah avatar kustom. Centang tugas untuk meningkatkan level avatarmu dan membuka fitur seperti pakaian, peliharaan, keahlian, dan bahkan misi! Lawan monster bersama teman-teman untuk dapat saling bertanggung jawab, dan gunakan emas untuk hadiah dalam game, seperti perlengkapan, atau hadiah kustom, seperti menonton satu episode program TV favoritmu. Fleksibel, sosial, dan menyenangkan, Habitica adalah cara yang sempurna untuk memotivasi dirimu untuk mencapai apapun.
+Masukkan poin Kebiasaanmu, Keseharianmu, dan daftar Tugasmu, lalu buatlah avatar unikmu. Centang selesai tugas untuk meningkatkan level avatarmu dan membuka fitur seperti pakaian, peliharaan, keahlian, dan bahkan misi! Lawan monster bersama teman-teman untuk dapat saling membantu, dan gunakan emas dalam game sebagai hadiah, seperti perlengkapan avatar, atau hadiah unik buatan, seperti menonton satu episode program TV favoritmu. Fleksibel, sosial, dan menyenangkan, Habitica adalah cara yang sempurna untuk memotivasi dirimu untuk mencapai apapun.
 
 Kami masih sedang dalam versi beta, jadi silahkan mengirimkan feedback ke mobile@habitica.com! Dan jika Anda menyukai aplikasi kami, kami akan sangat menghargai jika Anda memberikan kami review.</string>
 </resources>
diff --git a/translations/store_strings-pt_PT.xml b/translations/store_strings-pt_PT.xml
index 3e18fbcf7..97a306f47 100644
--- a/translations/store_strings-pt_PT.xml
+++ b/translations/store_strings-pt_PT.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
-  <string name="store_short_description">Encara a tua vida como um jogo para te manteres motivado e organizado</string>
-  <string name="store_description">A NOVA aplicação do HabitRPG! Reescrita do zero para uma melhor experiência e mais habilidades.
+  <string name="store_short_description">Encare a sua vida como um jogo para manter-se motivado e organizado!</string>
+  <string name="store_description">A NOVA aplicação do HabitRPG! recreado do zero para uma melhor experiência e mais funcionalidades.
 
-Encara a tua vida como um jogo para te manteres motivado e organizado! O Habitica torna-a simples e divertida enquanto concluis os teus objectivos.
+Encara a tua vida como um jogo para te manteres motivado e organizado! O Habitica torna-a simples e divertida enquanto concluis os teus objetivos.
 
-Introduz os teus Hábitos, os teus objectivos Diários e a tua lista de Tarefas e cria o teu avatar personalizado. Verifica as tarefas para subir de nível o teu avatar e desbloquear novas características como armaduras, animais, habilidades e até novos desafios! Luta contra monstros com amigos para se manterem responsáveis e usa o teu ouro em recompensas dentro do jogo, tal como equipamento ou prémios personalizados, tais como ver um episódio da tua série de TV favorita. Flexível, social e divertido, o Habitica é a forma perfeita para te motivares a atingir qualquer coisa.
+Introduz os teus Hábitos, os teus objetivos Diários, e a tua lista de Tarefas, e depois crie um avatar personalizado. Verifique as tarefas para subir de nível o teu avatar e desbloquear funcionalidades, tias como armaduras, animais, habilidades, e até novos desafios! Luta contra monstros com amigos para se manterem responsáveis e utilize o seu ouro nas recompensas dentro do jogo, tal como equipamento, ou prémios personalizados, tais como ver um episódio da sua série de TV favorita. Flexível, social e divertido, o Habitica é a forma perfeita para se motivar para atingir qualquer coisa.
 
-De momento estamos em fase beta, por isso por favor, está à vontade para enviar o teu comentário para mobile@habitica.com! E se gostares da nossa aplicação, nós apreciaríamos que nos deixasses a tua opinião.</string>
+De momento nós estamos na fase beta, por isso, por favor, fique à vontade para nos enviar o seu comentário para mobile@habitica.com! E se gostar da nossa aplicação, nós apreciaríamos se nos deixasse a sua opinião.</string>
 </resources>
diff --git a/translations/store_strings-zh-Hans.xml b/translations/store_strings-zh-Hans.xml
index 6f6806a19..06aff8796 100644
--- a/translations/store_strings-zh-Hans.xml
+++ b/translations/store_strings-zh-Hans.xml
@@ -1,11 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="store_short_description">把生活当游戏玩，保持积极与条理！</string>
-  <string name="store_description">HabitRPG最新APP！从新写过之后，更流畅的体验与更多的功能。
+  <string name="store_description">HabitRPG最新APP！更流畅的体验与更多的功能。
 
 把生活当成游戏玩，保持积极与条理！Habitica让你简单地边玩边完成目标。
 
-输入你的“习惯”、“每日目标”和“要做的事情”，再创造个化身。完成任务就能升级，并将武装、宠物、技能、大任务等解锁！与朋友打怪物确保彼此会负责任，并用金币买游戏内的奖励，如装备，或自定奖励，如看一集你最喜欢的电视节目。Habitica是灵活的、社交的、好玩的，是鼓励自己完成任何事最棒的方法。
+输入你的“习惯”、“每日目标”和“要做的事情”，再创造个角色。完成任务就能升级，并将武装、宠物、技能、任务等功能解锁！与朋友做任务确保彼此负责任，并用金币买游戏内的奖励，如装备，或自定奖励，如看一集你最喜欢的电视节目。Habitica是灵活的、社交的、好玩的，是鼓励自己完成任何事最棒的方法。
 
-APP还在测试中，所以请自便把反映写给mobile@habitica.com！喜欢我们APP的话也请留个好评，我们会很感激。</string>
+APP还在测试中，所以请反馈至mobile@habitica.com！喜欢我们APP也请留个好评，我们会很感激。</string>
 </resources>