From 79c3d3e7482ee6f4bb54563c3240e9c935329060 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 18 Apr 2017 13:52:27 +0200
Subject: [PATCH] update translations

---
 Habitica/res/values-bg/strings.profile.xml  |  3 +-
 Habitica/res/values-bg/strings.xml          |  4 ---
 Habitica/res/values-de/strings.profile.xml  |  3 +-
 Habitica/res/values-de/strings.xml          |  4 ---
 Habitica/res/values-es/strings.profile.xml  |  3 +-
 Habitica/res/values-es/strings.xml          |  1 -
 Habitica/res/values-fr/strings.profile.xml  |  3 +-
 Habitica/res/values-fr/strings.xml          | 10 +++---
 Habitica/res/values-in/strings.xml          |  1 -
 Habitica/res/values-it/strings.profile.xml  |  1 +
 Habitica/res/values-it/strings.tutorial.xml |  9 +++++
 Habitica/res/values-it/strings.xml          | 11 +++---
 Habitica/res/values-iw/strings.xml          |  1 -
 Habitica/res/values-ja/strings.profile.xml  |  3 +-
 Habitica/res/values-ja/strings.xml          |  3 --
 Habitica/res/values-ko/strings.profile.xml  |  3 +-
 Habitica/res/values-ko/strings.xml          |  3 --
 Habitica/res/values-lt/strings.xml          |  1 -
 Habitica/res/values-nl/strings.profile.xml  |  1 +
 Habitica/res/values-nl/strings.xml          | 12 ++++---
 Habitica/res/values-pl/strings.profile.xml  |  1 +
 Habitica/res/values-pl/strings.tutorial.xml |  1 +
 Habitica/res/values-pl/strings.xml          | 22 ++++++++++--
 Habitica/res/values-ru/strings.profile.xml  |  3 +-
 Habitica/res/values-ru/strings.tutorial.xml |  8 +++++
 Habitica/res/values-ru/strings.xml          | 12 +++++--
 Habitica/res/values-tr/strings.profile.xml  |  1 +
 Habitica/res/values-tr/strings.tutorial.xml |  1 +
 Habitica/res/values-tr/strings.xml          | 12 +++++--
 Habitica/res/values-zh/strings.profile.xml  |  1 +
 Habitica/res/values-zh/strings.tutorial.xml |  4 +++
 Habitica/res/values-zh/strings.xml          | 37 ++++++++++++++++-----
 32 files changed, 122 insertions(+), 61 deletions(-)

diff --git a/Habitica/res/values-bg/strings.profile.xml b/Habitica/res/values-bg/strings.profile.xml
index 4fdf05896..b856345f9 100644
--- a/Habitica/res/values-bg/strings.profile.xml
+++ b/Habitica/res/values-bg/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">Лично съобщение</string>
     <string name="profile_achievements">Постижения</string>
     <string name="profile_achievement_ok">Добре</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 4a35686af..f8249cecd 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -182,8 +182,6 @@
   <string name="intro_2_subtitle">Напредък в играта</string>
   <string name="intro_2_title">Напредък в живота</string>
   <string name="intro_2_description">Отключвайте функционалности в играта като отбелязвате завършените задачи в истинския си живот. За изпълнението на целите си ще получавате екипировка, любимци и най-различни други награди.</string>
-  <string name="intro_3_subtitle">Общувайте</string>
-  <string name="intro_3_title">Бийте се с чудовища</string>
   <string name="intro_3_description">Приятелите Ви могат да Ви помогнат да постигнете целите си. Подкрепяйте се взаимно в живота и битките, за да израснете заедно!</string>
   <string name="intro_finish_button">Да започваме!</string>
   <string name="previous_button">Назад</string>
@@ -234,7 +232,6 @@
   <string name="delete">Изтриване</string>
   <string name="name">Име</string>
   <string name="description">Описание</string>
-  <string name="add_tag">Добавяне на етикет</string>
   <string name="privacy">Поверителност</string>
   <string name="write_message">Напишете съобщение</string>
   <string name="post">Изпр.</string>
@@ -514,7 +511,6 @@
   <string name="avatar_wheelchair">Инвалидна количка</string>
   <string name="weak">Слаби</string>
   <string name="strong">Силни</string>
-  <string name="gray">Сиви</string>
   <string name="dated">С дата</string>
   <string name="completed">Завършени</string>
   <string name="setuP_group_other">Други</string>
diff --git a/Habitica/res/values-de/strings.profile.xml b/Habitica/res/values-de/strings.profile.xml
index 774820136..676127686 100644
--- a/Habitica/res/values-de/strings.profile.xml
+++ b/Habitica/res/values-de/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">Private Nachricht</string>
     <string name="profile_achievements">Erfolge</string>
     <string name="profile_achievement_ok">Okay</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index ac8f203f1..fb315826c 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -182,8 +182,6 @@
   <string name="intro_2_subtitle">Fortschritt im Spiel</string>
   <string name="intro_2_title">Fortschritt im Leben</string>
   <string name="intro_2_description">Schalte Spielinhalte durch das Erledigen und Abhaken deiner realen Aufgaben frei. Bekomme Rüstungen, Tiere und vieles mehr als Belohnungen für das Erfüllen deiner Ziele.</string>
-  <string name="intro_3_subtitle">Finde Gleichgesinnte</string>
-  <string name="intro_3_title">Bekämpfe Monster</string>
   <string name="intro_3_description">Behalte Deine Ziele im Auge mit Hilfe Deiner Freunde. Unterstützt Euch gegenseitig im Leben und im Kampf, während Ihr Euch gemeinsam verbessert!</string>
   <string name="intro_finish_button">Fangen wir an!</string>
   <string name="previous_button">Zurück</string>
@@ -233,7 +231,6 @@
   <string name="delete">Löschen</string>
   <string name="name">Name</string>
   <string name="description">Beschreibung</string>
-  <string name="add_tag">Tag hinzufügen</string>
   <string name="privacy">Privatsphäre</string>
   <string name="write_message">Nachricht schreiben</string>
   <string name="post">posten</string>
@@ -510,7 +507,6 @@
   <string name="avatar_wheelchair">Rollstuhl</string>
   <string name="weak">Schwach</string>
   <string name="strong">Stark</string>
-  <string name="gray">Grau</string>
   <string name="completed">Vervollständigt</string>
   <string name="setuP_group_other">Anderes</string>
   <string name="clear">löschen</string>
diff --git a/Habitica/res/values-es/strings.profile.xml b/Habitica/res/values-es/strings.profile.xml
index 322e14cfd..c57e22076 100644
--- a/Habitica/res/values-es/strings.profile.xml
+++ b/Habitica/res/values-es/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">Mensaje privado</string>
     <string name="profile_achievements">Logros</string>
     <string name="profile_achievement_ok">Ok</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index bd5e5a446..0ed18ef14 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -222,7 +222,6 @@
   <string name="delete">Borrar</string>
   <string name="name">Nombre</string>
   <string name="description">Descripción</string>
-  <string name="add_tag">Añadir etiqueta</string>
   <string name="privacy">Privacidad</string>
   <string name="write_message">Escribir mensaje</string>
   <string name="post">Publicar</string>
diff --git a/Habitica/res/values-fr/strings.profile.xml b/Habitica/res/values-fr/strings.profile.xml
index 4646f34b2..448f06739 100644
--- a/Habitica/res/values-fr/strings.profile.xml
+++ b/Habitica/res/values-fr/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">Message privé</string>
     <string name="profile_achievements">Succès</string>
     <string name="profile_achievement_ok">Ok</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index 0fdefafa2..47e0a7d4d 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -16,6 +16,7 @@
   <string name="Language_summary">Changer le langage d\'Habitica</string>
   <string name="SP_user_qr_code">Votre QR code</string>
   <string name="PS_contact_title">Contactez-moi</string>
+  <string name="unknown_error">Une erreur est survenue...</string>
   <string name="pref_account_header">Compte</string>
   <string name="pref_first_day_of_the_week_title">Premier jour de la semaine</string>
   <string name="pref_first_day_of_the_week_summary">Premier jour de la semaine dans tous les calendriers</string>
@@ -37,6 +38,10 @@
   <string name="preference_push_invited_to_quest">Invitation à une quête</string>
   <!--Adding tasks-->
   <string name="task_value">Valeur</string>
+  <string name="new_todo">Nouvelle tâche À Faire</string>
+  <string name="new_reward">Nouvelle Récompense</string>
+  <string name="new_daily">Nouvelle Quotidienne</string>
+  <string name="new_habit">Nouvelle Habitude</string>
   <string name="action_edit">Modifier</string>
   <string name="action_delete">Supprimer</string>
   <string name="action_cancel">Annuler</string>
@@ -182,8 +187,6 @@
   <string name="intro_2_subtitle">Progrès en jeu</string>
   <string name="intro_2_title">Progrès dans la vie</string>
   <string name="intro_2_description">Débloquez des fonctionnalités en jeu en validant vos tâches dans la vraie vie. Obtenez des équipements, des familiers, et d\'autres récompenses pour l\'accomplissement de vos objectifs.</string>
-  <string name="intro_3_subtitle">Sociabilisez-vous</string>
-  <string name="intro_3_title">Combattez des monstres</string>
   <string name="intro_3_description">Restez sur les rails de l\'accomplissement de vos buts avez l\'aide de vos amis. Épaulez-vous dans la vie et dans la bataille en vous améliorant ensemble !</string>
   <string name="intro_finish_button">C\'est parti !</string>
   <string name="previous_button">Précédent</string>
@@ -229,12 +232,12 @@
   <string name="join">Rejoindre</string>
   <string name="leader">Responsable</string>
   <string name="gems">Gemmes</string>
+  <string name="copy_as_todo">Copier comme une tâche À Faire</string>
   <string name="send_pm">Envoyer un MP</string>
   <string name="flag">Signaler</string>
   <string name="delete">Supprimer</string>
   <string name="name">Nom</string>
   <string name="description">Description</string>
-  <string name="add_tag">Ajouter une étiquette</string>
   <string name="privacy">Sécurité</string>
   <string name="write_message">Écrire un message</string>
   <string name="post">Envoyer</string>
@@ -514,7 +517,6 @@
   <string name="avatar_wheelchair">Fauteuil roulant</string>
   <string name="weak">Faibles</string>
   <string name="strong">Fortes</string>
-  <string name="gray">Grisées</string>
   <string name="dated">Datées</string>
   <string name="completed">Terminé</string>
   <string name="setuP_group_other">Autre</string>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 61a09f1ff..8ca3a0589 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -222,7 +222,6 @@
   <string name="delete">Hapus</string>
   <string name="name">Nama </string>
   <string name="description">Deskripsi</string>
-  <string name="add_tag">Beri Label</string>
   <string name="privacy">Privasi</string>
   <string name="write_message">Tulis Pesan</string>
   <string name="post">Kirim</string>
diff --git a/Habitica/res/values-it/strings.profile.xml b/Habitica/res/values-it/strings.profile.xml
index 8140922e2..a5a025896 100644
--- a/Habitica/res/values-it/strings.profile.xml
+++ b/Habitica/res/values-it/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Messaggio privato</string>
     <string name="profile_achievements">Medaglie</string>
     <string name="profile_achievement_ok">Ok</string>
+    <string name="profile_qrcode_close">Chiudi</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-it/strings.tutorial.xml b/Habitica/res/values-it/strings.tutorial.xml
index 5afebedc0..a46666b74 100644
--- a/Habitica/res/values-it/strings.tutorial.xml
+++ b/Habitica/res/values-it/strings.tutorial.xml
@@ -1,5 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="tutorial_overview">Eccoci qui! Ho creato alcune attività per te basate sui tuoi interessi. Prova ad aggiungerne qualcuna anche tu. Puoi modificare un\'attività toccando il titolo.</string>
+  <string name="tutorial_habits_1">Per prima cosa ci sono le Habit, le abitudini. Possono essere abitudini positive che vuoi migliorare o abitudini negative che vuoi abbandonare.</string>
+  <string name="tutorial_habits_2">Ogni volta che porti a termine un\'abitudine positiva, tocca il + per ottenere esperienza ed oro!</string>
+  <string name="tutorial_habits_3">Se ti fai tentare da un\'abitudine negativa, toccando - il tuo avatar perderà punti salute, per aiutarti a non farlo di nuovo.</string>
+  <string name="tutorial_todos_1">Usa le To-do per tenere traccia delle cose che devi fare solo una volta.</string>
+  <string name="tutorial_todos_2">Se le tue To-do devono essere completate entro un certo giorno, imposta una data di scadenza. Pare che tu possa completarne una, prova!</string>
+  <string name="tutorial_rewards_1">Compra oggetti per il tuo avatar con l\'oro che ottieni!</string>
+  <string name="tutorial_rewards_2">Puoi anche creare delle ricompense reali, basate su ciò che ti motiva.</string>
+  <string name="tutorial_tasks_complete">Per ora è tutto. Se hai bisogno di un ripasso, consulta la sezione FAQ.</string>
   <string name="tutorial_equipment">Quando compri dell\'equipaggiamento, apparirà qui. Il tuo equipaggiamento di battaglia influisce sulle tue statistiche, e il tuo Costume (se attivato) cambia ciò che indossa il tuo avatar.</string>
   <string name="tutorial_items">Guadagnati degli oggetti completando attività e salendo di livello. Tocca un oggetto per usarlo!</string>
   <string name="tutorial_pets">Man mano che porti a termine attività nella vita reale, ora potrai trovare casualmente uova e pozioni. Combinali per far nascere degli animali!</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 45fd2410b..1b60d2108 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -187,8 +187,8 @@
   <string name="intro_2_subtitle">Progressi nel gioco</string>
   <string name="intro_2_title">Progressi nella vita</string>
   <string name="intro_2_description">Sblocca nuovi elementi nel gioco portando a termine gli impegni della vita reale. Ottieni armature, animali e altro come ricompensa per aver raggiunto i tuoi obiettivi.</string>
-  <string name="intro_3_subtitle">Sii Social</string>
-  <string name="intro_3_title">Combatti mostri</string>
+  <string name="intro_3_subtitle">Combatti mostri</string>
+  <string name="intro_3_title">Sii Social</string>
   <string name="intro_3_description">Tieni traccia dei tuoi obiettivi con l\'aiuto dei tuoi amici. Supportatevi a vicenda nella vita e nelle battaglie per migliorare insieme!</string>
   <string name="intro_finish_button">Iniziamo!</string>
   <string name="previous_button">Indietro</string>
@@ -240,7 +240,7 @@
   <string name="delete">Elimina</string>
   <string name="name">Nome</string>
   <string name="description">Descrizione</string>
-  <string name="add_tag">Aggiungi etichetta</string>
+  <string name="add_tag">Aggiungi una nuova etichetta</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Scrivi messaggio</string>
   <string name="post">Invia</string>
@@ -293,7 +293,7 @@
   <string name="use_animal">Usa</string>
   <string name="feed">Dai da mangiare</string>
   <string name="hatch_with">Fai nascere un animale con %s</string>
-  <string name="hatched_pet_title">E\' nato un %2$s %1$s!</string>
+  <string name="hatched_pet_title">È nato un %2$s %1$s!</string>
   <string name="close">Chiudi</string>
   <string name="share">Condividi</string>
   <string name="notification_pet_fed">Hai dato da mangiare al tuo %1$s %2$s!</string>
@@ -526,6 +526,7 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <string name="dated">Con scadenza</string>
   <string name="completed">Completate</string>
   <string name="setuP_group_other">Altro</string>
+  <string name="clear">Deseleziona</string>
   <string name="empty_title_habits">Non hai alcuna Habit.</string>
   <string name="empty_description_habits">Le Habit sono attività che possono essere svolte in modo molto flessibile. Puoi usarle diverse volte al giorno, o non usarle affatto.</string>
   <string name="empty_title_dailies">Non hai nessuna Daily</string>
@@ -533,5 +534,7 @@ Le Dailies mancate e le cattive Habit non li danneggiano molto, e hanno sempre m
   <string name="empty_title_todos">Non hai alcuna To-do.</string>
   <string name="empty_description_todos">Le To-do sono attività da completare solo una volta. Aggiungi una checklist alle tue To-do per aumentarne il valore.</string>
   <string name="empty_title_rewards">Non hai nessuna Ricompensa</string>
+  <string name="reset_walkthrough">Ripristina la spiegazione introduttiva di Justin</string>
   <string name="read_community_guidelines">Per favore, leggi le Linee guida della community prima di scrivere un post.</string>
+  <string name="maintenance">Manutenzione</string>
 </resources>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index 7439e0cce..7fa971dc1 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -214,7 +214,6 @@
   <string name="delete">מחיקה</string>
   <string name="name">שם</string>
   <string name="description">תיאור</string>
-  <string name="add_tag">הוסיפו תגית</string>
   <string name="privacy">פרטיות</string>
   <string name="write_message">כיתבו הודעה</string>
   <string name="post">שליחה</string>
diff --git a/Habitica/res/values-ja/strings.profile.xml b/Habitica/res/values-ja/strings.profile.xml
index e72a7c198..70ba83f5c 100644
--- a/Habitica/res/values-ja/strings.profile.xml
+++ b/Habitica/res/values-ja/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">プライベートメッセージ</string>
     <string name="profile_achievements">実績</string>
     <string name="profile_achievement_ok">Ok</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index e7997d7bb..538b041d0 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -180,8 +180,6 @@
   <string name="intro_1_title">Habitica</string>
   <string name="intro_2_subtitle">ゲームの進行</string>
   <string name="intro_2_title">人生の進行</string>
-  <string name="intro_3_subtitle">友達とつながって</string>
-  <string name="intro_3_title">モンスターと戦おう</string>
   <string name="intro_3_description">友達の力を借りて目標にしがみつこう。実生活とバトルでお互いに助け合い、いっしょに成長しよう!</string>
   <string name="intro_finish_button">始めましょう!</string>
   <string name="previous_button">戻る</string>
@@ -230,7 +228,6 @@
   <string name="delete">削除</string>
   <string name="name">名前</string>
   <string name="description">詳細</string>
-  <string name="add_tag">タグを追加する</string>
   <string name="privacy">プライバシー</string>
   <string name="write_message">メッセージを書く</string>
   <string name="post">投稿</string>
diff --git a/Habitica/res/values-ko/strings.profile.xml b/Habitica/res/values-ko/strings.profile.xml
index 31afe88e1..6142193db 100644
--- a/Habitica/res/values-ko/strings.profile.xml
+++ b/Habitica/res/values-ko/strings.profile.xml
@@ -13,5 +13,4 @@
     <string name="profile_private_message">개인 메시지</string>
     <string name="profile_achievements">업적</string>
     <string name="profile_achievement_ok">확인</string>
-
-</resources>
\ No newline at end of file
+    </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index 52bc0b9e8..f612b59d0 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -181,8 +181,6 @@
   <string name="intro_2_subtitle">게임의 진전</string>
   <string name="intro_2_title">삶의 진전</string>
   <string name="intro_2_description">실제 삶에서의 일을 처리하는 것으로 게임의 특색들을 잠금해제 하세요. 목표를 달성해 갑옷, 펫, 그리고 더 많은 것들을 얻으세요.</string>
-  <string name="intro_3_subtitle">친목을 다지세요</string>
-  <string name="intro_3_title">몬스터와 싸우세요</string>
   <string name="intro_3_description">친구들의 도움으로 당신의 목표를 유지시키세요. 일상 생활과 전투에서 서로를 도와가며 함께 성장하세요!</string>
   <string name="intro_finish_button">시작합시다!</string>
   <string name="previous_button">이전</string>
@@ -237,7 +235,6 @@
   <string name="delete">삭제</string>
   <string name="name">이름</string>
   <string name="description">설명</string>
-  <string name="add_tag">태그 더하기</string>
   <string name="privacy">개인정보 보호</string>
   <string name="write_message">메세지 작성</string>
   <string name="post">게시</string>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index c165ff4c9..211847db5 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -221,7 +221,6 @@
   <string name="delete">Trinti</string>
   <string name="name">Pavadinimas</string>
   <string name="description">Aprašymas</string>
-  <string name="add_tag">Pridėti Žymę</string>
   <string name="privacy">Privatumas</string>
   <string name="write_message">Rašyti Žinutę</string>
   <string name="post">Siųsti</string>
diff --git a/Habitica/res/values-nl/strings.profile.xml b/Habitica/res/values-nl/strings.profile.xml
index 3c04c13a5..a481be4c6 100644
--- a/Habitica/res/values-nl/strings.profile.xml
+++ b/Habitica/res/values-nl/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Privébericht</string>
     <string name="profile_achievements">Prestaties</string>
     <string name="profile_achievement_ok">Oké</string>
+    <string name="profile_qrcode_close">Sluiten</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index ae1c8dc5b..2e4221f31 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -187,8 +187,8 @@
   <string name="intro_2_subtitle">Vooruitgang in het spel</string>
   <string name="intro_2_title">Vooruitgang in je leven</string>
   <string name="intro_2_description">Ontgrendel functies in het spel door taken in je echte leven af te vinken. Verdien uitrusting, huisdieren en meer als beloning voor het bereiken van je doelen.</string>
-  <string name="intro_3_subtitle">Word sociaal</string>
-  <string name="intro_3_title">Vecht tegen monsters</string>
+  <string name="intro_3_subtitle">Vecht tegen monsters</string>
+  <string name="intro_3_title">Wordt sociaal</string>
   <string name="intro_3_description">Houd je doelen op peil met hulp van je vrienden. Ondersteun elkaar in het leven en vecht samen terwijl je steeds beter wordt.</string>
   <string name="intro_finish_button">Laten we beginnen!</string>
   <string name="previous_button">Vorige</string>
@@ -240,7 +240,7 @@
   <string name="delete">Verwijderen</string>
   <string name="name">Naam</string>
   <string name="description">Beschrijving</string>
-  <string name="add_tag">Label toevoegen</string>
+  <string name="add_tag">Nieuwe label toevoegen</string>
   <string name="privacy">Privacy</string>
   <string name="write_message">Bericht schrijven</string>
   <string name="post">Post</string>
@@ -521,7 +521,7 @@
   <string name="avatar_wheelchair">Rolstoel</string>
   <string name="weak">Zwak</string>
   <string name="strong">Sterk</string>
-  <string name="gray">Grijs</string>
+  <string name="gray">Grijd</string>
   <string name="dated">Gedateerd</string>
   <string name="completed">Voltooid</string>
   <string name="setuP_group_other">Andere</string>
@@ -535,4 +535,8 @@
   <string name="empty_title_rewards">Je hebt geen beloningen</string>
   <string name="reset_walkthrough">Herstart Justin\'s inleiding</string>
   <string name="read_community_guidelines">Lees alsjeblieft onze gemeenschapsrichtlijnen voordat je berichten plaatst</string>
+  <string name="maintenance">Onderhoud</string>
+  <string name="reload_content">Inhoud herladen</string>
+  <string name="dailyDueDefaultView">Standaard de \'Onvoltooid\' tab laten zien in Dagelijkse Taken</string>
+  <string name="dailyDueDefaultViewDescription">Als deze optie aan staat, wordt standaard de \'onvoltooid\' tab getoond in plaats van \'alle\'</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.profile.xml b/Habitica/res/values-pl/strings.profile.xml
index 4570ca2a3..0206d9948 100644
--- a/Habitica/res/values-pl/strings.profile.xml
+++ b/Habitica/res/values-pl/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Wiadomość prywatna</string>
     <string name="profile_achievements">Osiągnięcia</string>
     <string name="profile_achievement_ok">OK</string>
+    <string name="profile_qrcode_close">Zamknij</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-pl/strings.tutorial.xml b/Habitica/res/values-pl/strings.tutorial.xml
index 8ef93429b..4ccc6adaf 100644
--- a/Habitica/res/values-pl/strings.tutorial.xml
+++ b/Habitica/res/values-pl/strings.tutorial.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="tutorial_tasks_complete">To wszystko na razie. Jeżeli potrzebujesz przypomnienia, sprawdź sekcję FAQ.</string>
   <string name="tutorial_equipment">Tu pojawia się zakupiony ekwipunek. Wyposażenie Bojowe wpływa na Twoje statystyki, a Kostium (o ile włączony) na wygląd Twojego awatara.</string>
   <string name="tutorial_items">Zbieraj przedmioty kończąc zadania i zdobywając poziomy. Stuknij przedmiot, żeby go użyć!</string>
   <string name="tutorial_pets">Kończąc zadania w prawdziwym świecie, masz szansę znalezienia losowych jaj i eliksirów. Połącz je, aby wykluć chowańce.</string>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 27a4dc302..358271d13 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -16,6 +16,7 @@
   <string name="Language_summary">Zmień język Habitici</string>
   <string name="SP_user_qr_code">Twój kod QR</string>
   <string name="PS_contact_title">Skontaktuj się ze mną</string>
+  <string name="unknown_error">Wystąpił błąd...</string>
   <string name="pref_account_header">Konto</string>
   <string name="pref_first_day_of_the_week_title">Pierwszy Dzień Tygodnia</string>
   <string name="pref_first_day_of_the_week_summary">Pierwszy dzień tygodnia we wszystkich kalendarzach</string>
@@ -37,6 +38,10 @@
   <string name="preference_push_invited_to_quest">Zaproszono Cię na misję</string>
   <!--Adding tasks-->
   <string name="task_value">Wartość</string>
+  <string name="new_todo">Nowe Do-Zrobienia</string>
+  <string name="new_reward">Nowa nagroda</string>
+  <string name="new_daily">Nowe codzienne</string>
+  <string name="new_habit">Nowy nawyk</string>
   <string name="action_edit">Edytuj</string>
   <string name="action_delete">Usuń</string>
   <string name="action_cancel">Anuluj</string>
@@ -181,7 +186,6 @@
   <string name="intro_2_subtitle">Postęp w grze</string>
   <string name="intro_2_title">Postęp w życiu</string>
   <string name="intro_2_description">Odblokuj cechy w grze przez wykonywanie twoich zadań z realnego życia. Zdobywaj broń, chowańce i znacznie więcej za realizacje swoich celów.</string>
-  <string name="intro_3_title">Walcz z potworami</string>
   <string name="intro_3_description">Zmierzaj do swoich celów z pomocą przyjaciół. Wspierajcie się wzajemnie w życiu i w walce, aby wspólnie się udoskonalać!</string>
   <string name="intro_finish_button">Zaczynajmy!</string>
   <string name="previous_button">Poprzedni</string>
@@ -192,6 +196,7 @@
   <string name="avatar_setup_description">Więc, jak chciałbyś wyglądać. Nie obawiaj się, możesz to później zmienić.</string>
   <string name="setup_group_work">Praca</string>
   <string name="setup_group_exercise">Ćwiczenia</string>
+  <string name="setup_group_health">Zdrowie</string>
   <string name="setup_group_school">Szkoła</string>
   <string name="setup_group_teams">Zespoły</string>
   <string name="setup_group_chores">Obowiązki domowe</string>
@@ -225,12 +230,12 @@
   <string name="join">Dołącz</string>
   <string name="leader">Lider</string>
   <string name="gems">Klejnoty</string>
+  <string name="copy_as_todo">Kopiuj jako Do-Zrobienia</string>
   <string name="send_pm">Wyślij wiadomość</string>
   <string name="flag">Oznacz</string>
   <string name="delete">Usuń</string>
   <string name="name">Nazwa</string>
   <string name="description">Opis</string>
-  <string name="add_tag">Dodaj tag</string>
   <string name="privacy">Prywatność</string>
   <string name="write_message">Napisz wiadomość</string>
   <string name="post">Wyślij</string>
@@ -387,6 +392,7 @@
   <string name="all_dailies_completed">Wykonałeś wszystkie codzienne. Brawo!</string>
   <string name="widget_habit_button">Nawyk Habitiki</string>
   <string name="widget_dailies">Codzienne Habitiki</string>
+  <string name="widget_todo_list">Lista Do-Zrobienia Habitiki</string>
   <string name="widget_add_task">Dodaj zadanie do Habitiki</string>
   <string name="google_services_missing">Nie znaleziono usługi Google Play.</string>
   <string name="gem.purchase.toolbartitle">Zamów</string>
@@ -492,7 +498,17 @@
   <string name="avatar_wheelchair">Wózek</string>
   <string name="weak">Słaby</string>
   <string name="strong">Silny</string>
-  <string name="gray">Szary</string>
   <string name="dated">Przestarzały</string>
+  <string name="completed">Ukończone</string>
   <string name="setuP_group_other">Pozostałe</string>
+  <string name="empty_title_habits">Nie posiadasz żadnych nawyków</string>
+  <string name="empty_description_habits">Nawyki są zadaniami nie posiadającymi sztywnego harmonogramu. Możesz je odhaczać wiele razy dziennie, lub w ogóle.</string>
+  <string name="empty_title_dailies">Nie posiadasz żadnych codziennych</string>
+  <string name="empty_description_dailies">Codzienne są zadaniami regularnie się powtarzającymi. Wybierz pasujący Ci harmonogram!</string>
+  <string name="empty_title_todos">Nie posiadasz żadnych Do-Zrobienia</string>
+  <string name="empty_description_todos">Do-Zrobienia są jednokrotnymi zadaniami. Dodaj listy kontrolne do swoich Do-Zrobienia, aby zwiększyć ich wartość.</string>
+  <string name="empty_title_rewards">Nie posiadasz żadnych nagród</string>
+  <string name="read_community_guidelines">Prosimy, przeczytaj Wytyczne Społeczności zanim umieścisz posta</string>
+  <string name="maintenance">Utrzymanie</string>
+  <string name="reload_content">Odśwież zawartość</string>
 </resources>
diff --git a/Habitica/res/values-ru/strings.profile.xml b/Habitica/res/values-ru/strings.profile.xml
index 100853fd1..03867c934 100644
--- a/Habitica/res/values-ru/strings.profile.xml
+++ b/Habitica/res/values-ru/strings.profile.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="profile_pets_and_mounts">Питомцы &amp; Скакуны</string>
-    <string name="profile_pets_found">Найдены питомцы</string>
+    <string name="profile_pets_found">Найденые питомцы</string>
     <string name="profile_mounts_tamed">Прирученые скакуны</string>
     <string name="profile_loading_data">загрузка данных участников.</string>
     <string name="profile_send_message_to">Отправить сообщение %s</string>
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Личное сообщение</string>
     <string name="profile_achievements">Достижения</string>
     <string name="profile_achievement_ok">Хорошо</string>
+    <string name="profile_qrcode_close">Закрыть</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-ru/strings.tutorial.xml b/Habitica/res/values-ru/strings.tutorial.xml
index 8fcc43d6c..74239648f 100644
--- a/Habitica/res/values-ru/strings.tutorial.xml
+++ b/Habitica/res/values-ru/strings.tutorial.xml
@@ -1,7 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="tutorial_overview">Вот и мы! Я выполнил некоторые задания для вас, исходя из ваших интересов. Попробуйте добавить несколько собственных. Вы можете редактировать любую задачу, нажав на заголовок.</string>
+  <string name="tutorial_habits_1">Прежде всего это Привычки. Они могут быть положительными, которые вы хотите приобрести, или негативными, которые вы хотите бросить.</string>
   <string name="tutorial_habits_2">Каждый раз, когда вы выполняете положительную привычку, нажмите +, чтобы получить опыт и золото!</string>
   <string name="tutorial_habits_3">Если вы ошибетесь в негативной привычкой, нажав на - , то вы уменьшите здоровье вашего аватара. Это сделано для того, чтобы помочь вам быть более ответственным.</string>
+  <string name="tutorial_dailies_1">Создайте ежедневные задачи, которые необходимо выполнять по расписанию.</string>
+  <string name="tutorial_dailies_2">Будьте осторожны - если вы пропустите раз, ваш аватар в одночасье получит урон . Регулярно выполняя их, вы получите отличные награды!</string>
+  <string name="tutorial_todos_1">Используйте список дел, чтобы отслеживать задачи, которые нужно выполнять только один раз.</string>
+  <string name="tutorial_rewards_1">Покупайте снаряжение для вашего аватара за золото которое вы получаете!</string>
+  <string name="tutorial_rewards_2">Вы также можете создавать свои вознаграждения в зависимости от того, что вас мотивирует.</string>
+  <string name="tutorial_tasks_complete">На этом все. Если вы что-то забыли, проверьте раздел часто задаваемых вопросов.</string>
   <string name="tutorial_equipment">Когда вы покупаете снаряжение, оно появляется здесь. Ваша Боевая Экипировка влияет на ваши характеристики, а Костюм (если используется) изменяет внешний вид вашего аватара.</string>
   <string name="tutorial_items">Зарабатывайте предметы, выполняя задания и повышая уровень. Нажмите на предмет, чтобы использовать его!</string>
   <string name="tutorial_pets">Теперь, когда вы будете выполнять задачи в реальном мире, у Вас есть шанс получить яйца и зелья. Соединяйте их, чтобы вылуплялись питомцы</string>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 2a76bd855..9bfd732c6 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -183,9 +183,9 @@
   <string name="dismiss_tutorial">Напомнить позже</string>
   <string name="intro_1_subtitle">Добро пожаловать в</string>
   <string name="intro_1_title">Habitica</string>
+  <string name="intro_1_description">Пришло время веселиться, пока вы делаете свою работу. Присоединитесь к %s участникам, уже улучшающих свою жизнь.</string>
   <string name="intro_2_subtitle">Прогресс в игре</string>
   <string name="intro_2_title">Прогресс в жизни</string>
-  <string name="intro_3_title">Сражайтесь с монстрами</string>
   <string name="intro_3_description">Добивайтесь поставленнх целей с помощью друзей. Поддерживайте друг друга в реальной жизни и в сражении, делая свою жизнь лучше!</string>
   <string name="intro_finish_button">Давайте начнем!</string>
   <string name="previous_button">Назад</string>
@@ -193,6 +193,8 @@
   <string name="skip_button">Пропустить</string>
   <string name="setup_welcome_description">Добро пожаловать в Habitica, где продвижение в игре помогает вам в рельной жизни! Выполняя реальные задачи, вы разблокируете снаряжение, питомцев, квесты и многое другое.</string>
   <string name="setup_welcome_title">Добро пожаловать</string>
+  <string name="avatar_setup_description">Итак, как бы вы хотели выглядеть? Не беспокойтесь, вы это сможете изменить позже.</string>
+  <string name="task_setup_description">Великолепно! Теперь, вы заинтересованы в работе на протяжении этого путешествия?</string>
   <string name="setup_group_work">Работа</string>
   <string name="setup_group_exercise">Тренировки</string>
   <string name="setup_group_health">Здоровье</string>
@@ -235,7 +237,6 @@
   <string name="delete">Удалить</string>
   <string name="name">Имя</string>
   <string name="description">Описание</string>
-  <string name="add_tag">Добавить метку</string>
   <string name="privacy">Приватность</string>
   <string name="write_message">Написать сообщение</string>
   <string name="post">Отправить</string>
@@ -423,6 +424,7 @@
   <string name="subscriptions">Абонемент</string>
   <string name="subscription_duration">Повторять каждые %s</string>
   <string name="subscribe">Подписаться</string>
+  <string name="subscribe.listitem2.description">Каждый месяц вы получаете уникальный косметический элемент для своего аватара! Плюс, каждые три месяца последовательной подписки таинственные путешественники во времени предоставят вам доступ к историческим (и футуристическим!) косметическим предметам.</string>
   <string name="subscribe.listitem3.description">Завершенный список дел и история доступны дольше.</string>
   <string name="subscription_hourglasses">+%d Мистических песочных часов</string>
   <string name="payment_method">Способ оплаты</string>
@@ -445,6 +447,7 @@
   <string name="twelve_months">12 месяцев</string>
   <string name="subscribe_prompt_thanks">Как подписчик вы получаете эти полезные преимущества:</string>
   <string name="subscription_status">Статус подписки</string>
+  <string name="byLeader">сделано %s</string>
   <string name="challenge_details">Детали испытания</string>
   <string name="challenge_leave_title">Покинуть испытание</string>
   <string name="challenge_leave_text">Вы уверены, что хотите покинуть испытание “%s”?</string>
@@ -503,8 +506,11 @@
   <string name="avatar_wheelchair">Кресло-каталка</string>
   <string name="weak">Стройное</string>
   <string name="strong">Тучное</string>
-  <string name="gray">Серый</string>
   <string name="completed">Завершить</string>
   <string name="setuP_group_other">Другое</string>
   <string name="clear">Очистить</string>
+  <string name="empty_title_habits">У вас нет привычек</string>
+  <string name="empty_title_todos">У вас нет задач</string>
+  <string name="empty_title_rewards">У вас нет вознаграждений</string>
+  <string name="reload_content">Обновить содержимое</string>
 </resources>
diff --git a/Habitica/res/values-tr/strings.profile.xml b/Habitica/res/values-tr/strings.profile.xml
index 5d4a9ebbf..f810ca377 100644
--- a/Habitica/res/values-tr/strings.profile.xml
+++ b/Habitica/res/values-tr/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">Özel Mesaj</string>
     <string name="profile_achievements">Başarılar</string>
     <string name="profile_achievement_ok">Tamam</string>
+    <string name="profile_qrcode_close">Kapat</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-tr/strings.tutorial.xml b/Habitica/res/values-tr/strings.tutorial.xml
index dada18885..bc1c325f7 100644
--- a/Habitica/res/values-tr/strings.tutorial.xml
+++ b/Habitica/res/values-tr/strings.tutorial.xml
@@ -1,5 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="tutorial_overview">İşte geldik! İlgi alanlarına göre sana bazı işler doldurdum. Kendin de birkaç tane eklemeyi dene. Başlığa basarak işleri düzenleyebilirsin.</string>
   <string name="tutorial_equipment">Ekipman satın aldığında burada gözükür. Savaş Ekipmanın niteliklerini, ve Kostümün (eğer etkinse) avatarının ne giydiğini etkiler.</string>
   <string name="tutorial_items">Görevlerini tamamlayarak ve seviye yükselerek eşya kazan. Kullanmak için eşyanın üzerine tıkla!</string>
   <string name="tutorial_pets">Gerçek dünya işlerini tamamladıkça, artık rastgele yumurta ve iksir bulma şansın var. Hayvanları yumurtadan çıkarmak için o ikisini birleştir</string>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index 92f34a3fe..bb22da300 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -16,6 +16,7 @@
   <string name="Language_summary">Habitica dilini değiştirin</string>
   <string name="SP_user_qr_code">Sizin QR Kodunuz</string>
   <string name="PS_contact_title">Benimle iletişime geçin</string>
+  <string name="unknown_error">Bir hata oluştu...</string>
   <string name="pref_account_header">Hesap</string>
   <string name="pref_first_day_of_the_week_title">Haftanın İlk Günü</string>
   <string name="pref_first_day_of_the_week_summary">Tüm takvimlerde haftanın ilk günü</string>
@@ -37,6 +38,10 @@
   <string name="preference_push_invited_to_quest">Göreve Davet Edildin</string>
   <!--Adding tasks-->
   <string name="task_value">Değer</string>
+  <string name="new_todo">Yeni Yapılacak İş</string>
+  <string name="new_reward">Yeni Ödül</string>
+  <string name="new_daily">Yeni Günlük İş</string>
+  <string name="new_habit">Yeni Alışkanlık</string>
   <string name="action_edit">Düzenle</string>
   <string name="action_delete">Sil</string>
   <string name="action_cancel">İptal et</string>
@@ -182,8 +187,8 @@
   <string name="intro_2_subtitle">Oyun gelişimi</string>
   <string name="intro_2_title">Hayatta gelişim</string>
   <string name="intro_2_description">Gerçek hayatındaki işlerini tamamlayarak oyun içindeki özellikleri aç. Zırh, evcil hayvan ve daha fazlasını hedeflerine ulaştığında ödül olarak kazan.</string>
-  <string name="intro_3_subtitle">Sosyalleş</string>
-  <string name="intro_3_title">Canavarlarla Savaş</string>
+  <string name="intro_3_subtitle">Canavarlarla savaş</string>
+  <string name="intro_3_title">Sosyalleş</string>
   <string name="intro_3_description">Hedeflerini arkadaşlarından yardım alarak devam ettir. Hayatta ve savaşlarda birbirinizi birlikte geliştirerek destek olun!</string>
   <string name="intro_finish_button">Hadi başlayalım!</string>
   <string name="previous_button">Önceki</string>
@@ -229,12 +234,12 @@
   <string name="join">Katıl</string>
   <string name="leader">Lider</string>
   <string name="gems">Elmaslar</string>
+  <string name="copy_as_todo">Yapılacak İşlere kopyala</string>
   <string name="send_pm">ÖM Gönder</string>
   <string name="flag">Bildir</string>
   <string name="delete">Sil</string>
   <string name="name">Ad</string>
   <string name="description">Tanım</string>
-  <string name="add_tag">Etiket Ekle</string>
   <string name="privacy">Gizlilik</string>
   <string name="write_message">Mesaj Yaz</string>
   <string name="post">Gönder</string>
@@ -391,6 +396,7 @@
   <string name="all_dailies_completed">Tüm günlük işlerini tamamladın. Tebrikler!</string>
   <string name="widget_habit_button">Habitica Alışkanlığı Yap</string>
   <string name="widget_dailies">Habitica Günlük İşler</string>
+  <string name="widget_todo_list">Habitica Yapılacak İşler Listesi</string>
   <string name="widget_add_task">Habitica İş Ekle</string>
   <string name="google_services_missing">Google play services bulunamadı.</string>
   <string name="gem.purchase.toolbartitle">Satın al</string>
diff --git a/Habitica/res/values-zh/strings.profile.xml b/Habitica/res/values-zh/strings.profile.xml
index cc1c9cb89..c221ff3f1 100644
--- a/Habitica/res/values-zh/strings.profile.xml
+++ b/Habitica/res/values-zh/strings.profile.xml
@@ -13,5 +13,6 @@
     <string name="profile_private_message">私信</string>
     <string name="profile_achievements">成就</string>
     <string name="profile_achievement_ok">OK</string>
+    <string name="profile_qrcode_close">关闭</string>
 
 </resources>
\ No newline at end of file
diff --git a/Habitica/res/values-zh/strings.tutorial.xml b/Habitica/res/values-zh/strings.tutorial.xml
index 420f23687..ccd660700 100644
--- a/Habitica/res/values-zh/strings.tutorial.xml
+++ b/Habitica/res/values-zh/strings.tutorial.xml
@@ -1,5 +1,9 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="tutorial_overview">我们在这儿！我已经根据你的兴趣给你添加了几个任务~也试试自己添加几个吧！你还可以点击任务标题来修改它们。</string>
+  <string name="tutorial_habits_1">首先是习惯。它们可以是你想养成的积极习惯，也可以是你想停止的消极习惯。</string>
+  <string name="tutorial_habits_2">每当你完成一次积极的习惯，点击习惯前的加号，就可以获得经验和金币啦！</string>
+  <string name="tutorial_habits_3">如果你一不留神完成了一次消极习惯，点击减号，这会减少你的角色的生命值来帮助你保持责任感。</string>
   <string name="tutorial_equipment">在你购买装备后，在这里显示。你的战斗装备会影响你的属性，你的服装(如果装备)会在你的角色上显示。</string>
   <string name="tutorial_items">通过升级和完成任务获得物品。点击一个物品来使用。</string>
   <string name="tutorial_pets">完成现实任务后，随机掉落宠物蛋和药水。将药水洒在宠物蛋上孵化宠物。</string>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 655757593..78ff0e6b8 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -16,6 +16,7 @@
   <string name="Language_summary">更改 Habitica的语言</string>
   <string name="SP_user_qr_code">你的二维码</string>
   <string name="PS_contact_title">联系我</string>
+  <string name="unknown_error">发生错误……</string>
   <string name="pref_account_header">账号</string>
   <string name="pref_first_day_of_the_week_title">每周的第一天</string>
   <string name="pref_first_day_of_the_week_summary">在所有的日程表中，每周的第一天</string>
@@ -32,11 +33,15 @@
   <string name="preference_push_gifted_gems">赠送的钻石</string>
   <string name="preference_push_gifted_subscription">赠送的订阅</string>
   <string name="preference_push_invited_to_party">被邀请加入队伍</string>
-  <string name="preference_push_invited_to_guild">已邀请至工会</string>
+  <string name="preference_push_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>
+  <string name="new_reward">新奖励</string>
+  <string name="new_daily">新每日任务</string>
+  <string name="new_habit">新习惯</string>
   <string name="action_edit">编辑</string>
   <string name="action_delete">删除</string>
   <string name="action_cancel">取消</string>
@@ -181,8 +186,6 @@
   <string name="intro_2_subtitle">游戏进度</string>
   <string name="intro_2_title">生活进度</string>
   <string name="intro_2_description">通过完成现实生活中的任务来解锁游戏内容。得到装备、宠物和更多的奖励来促使你完成你的目标吧！</string>
-  <string name="intro_3_subtitle">获得社交</string>
-  <string name="intro_3_title">击退怪物</string>
   <string name="intro_3_description">和朋友们一起为目标努力吧。在生活和战斗中互相支持，共同进步！</string>
   <string name="intro_finish_button">让我们开始吧！</string>
   <string name="previous_button">上一页</string>
@@ -218,7 +221,7 @@
   <string name="setup_task_creativity_2">进行创新项目</string>
   <string name="setup_task_creativity_3">完成创新项目</string>
   <string name="gem.purchase.support">想要帮助我们维持Habitica？通过买宝石的方式来支持开发者吧！\n\n 宝石能用来购买额外的乐趣，包括：\n\n - 角色的酷酷的服装\n - 好看的背景\n - 能获得宠物蛋的有趣的任务\n - 1001级之前改变职业的能力\n\n非常感谢您帮助我们使Habitica变的更好。您的支持非常重要！</string>
-  <string name="my_guilds">我的工会</string>
+  <string name="my_guilds">我的公会</string>
   <string name="public_guilds">公共公会</string>
   <string name="guild">公会</string>
   <string name="leave">离开</string>
@@ -230,11 +233,10 @@
   <string name="delete">删除</string>
   <string name="name">名称</string>
   <string name="description">描述</string>
-  <string name="add_tag">添加标签</string>
   <string name="privacy">隐私</string>
   <string name="write_message">写消息</string>
   <string name="post">公告</string>
-  <string name="guild_search_hint">寻找工会</string>
+  <string name="guild_search_hint">查找公会</string>
   <string name="todo_due">到期：%s</string>
   <string name="daily_streak">目前连击数：%d</string>
   <string name="todo_has_duedate">任务有截止日</string>
@@ -457,7 +459,7 @@
   <string name="keep_tasks">保持</string>
   <string name="my_challenges">我的挑战</string>
   <string name="public_challenges">公共挑战</string>
-  <string name="challenges">享受挑战吧！</string>
+  <string name="challenges">挑战</string>
   <string name="daily">每日任务</string>
   <string name="habit">习惯</string>
   <string name="reward">奖励</string>
@@ -467,8 +469,8 @@
   <string name="challenge">挑战</string>
   <string name="go_to_challenge">参加挑战</string>
   <string name="not_part_of_a_challenge">你还没有加入任何挑战呢！</string>
-  <string name="join_a_challenge">加入一个挑战会将它的任务加入你的任务列表，完成一个挑战会给你一个成就，通常还有一些宝石奖励。</string>
-  <string name="check_the_public_challenge_tab">点击“公公挑战”按钮来寻找其他勇士创建的挑战吧！也许会有适合你的哟！</string>
+  <string name="join_a_challenge">加入一个挑战会将它的任务加入你的任务列表，然后去完成任务战胜其他habitican赢得成就甚至钻石吧！</string>
+  <string name="check_the_public_challenge_tab">点击“公会挑战”按钮来寻找其他勇士创建的挑战吧！也许会有适合你的哟！</string>
   <string name="add_reminder">增加提醒</string>
   <string name="warning">警告</string>
   <string name="open_settings">打开设置</string>
@@ -495,4 +497,21 @@
   <string name="none">无</string>
   <string name="owned">已拥有的</string>
   <string name="not_owned">未拥有的</string>
+  <string name="login_btn_fb">Facebook登录</string>
+  <string name="login_btn_google">Google登录</string>
+  <string name="action_back">返回</string>
+  <string name="avatar_skin_color">肤色</string>
+  <string name="avatar_hair_color">发色</string>
+  <string name="avatar_hair_bangs">刘海</string>
+  <string name="avatar_hair_ponytail">辫子</string>
+  <string name="avatar_glasses">眼镜</string>
+  <string name="avatar_wheelchair">轮椅</string>
+  <string name="weak">瘦小</string>
+  <string name="strong">强壮</string>
+  <string name="completed">完成</string>
+  <string name="setuP_group_other">其他</string>
+  <string name="empty_title_habits">你还没有任何习惯</string>
+  <string name="empty_title_dailies">你还没有任何每日任务</string>
+  <string name="empty_title_todos">你还没有任何待办事项</string>
+  <string name="empty_title_rewards">你还没有任何奖励项目</string>
 </resources>