From 3d4507c24f08db98de12ca7b07bf04582a78c2a1 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 19 Apr 2016 12:49:19 +0200
Subject: [PATCH] Update translations

---
 Habitica/res/values-es/strings.xml         |  9 +++++++++
 Habitica/res/values-it/strings.sidebar.xml |  2 +-
 Habitica/res/values-it/strings.xml         | 10 +++++-----
 Habitica/res/values-ja/strings.xml         |  4 ++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 5dc29c63b..8f92c5b67 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -113,6 +113,8 @@
   <string name="no_party_message">No formas parte de ningún grupo. Para unirte a uno, entra en la página web.</string>
   <string name="forgot_pw_btn">He olvidado la contraseña</string>
   <string name="forgot_pw_tv">¿No recuerdas tu contraseña? Entra en el sitio web para móviles.</string>
+  <string name="tavern.inn.checkOut">Reactivar tareas diarias</string>
+  <string name="tavern.inn.rest">Pausar tareas diarias</string>
   <string name="reward.dialog.buy">Comprar</string>
   <string name="reward.dialog.dismiss">Descartar</string>
   <string name="party">Grupo</string>
@@ -268,12 +270,14 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="feed_to_pet">Alimentar a mascota</string>
   <string name="hatch_egg">Mezclar con huevo</string>
   <string name="invite_party">Invitar al grupo</string>
+  <string name="dialog_feeding" formatted="false">Dar de comer a %2$s %1$s:</string>
   <string name="use_animal">Usar</string>
   <string name="feed">Alimentar</string>
   <string name="hatch_with" formatted="false">Criar mascota con %s</string>
   <string name="hatched_pet_title" formatted="false">¡Ha nacido un/a %2$s %1$s!</string>
   <string name="close">Cerrar</string>
   <string name="share">Compartir</string>
+  <string name="notification_pet_fed" formatted="false">¡Tu %2$s %1$s ha comido!</string>
   <string name="notification_purchase" formatted="false">Has comprado %s</string>
   <string name="sectionpets">Mascotas básicas</string>
   <string name="sectionpremiumPets">Mascotas de pociones mágicas</string>
@@ -283,4 +287,9 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="sectionpremiumMounts">Monturas de pociones mágicas</string>
   <string name="sectionquestMounts">Monturas de misiones</string>
   <string name="sectionspecialMounts">Monturas insólitas</string>
+  <string name="world_quest">Misión mundial</string>
+  <string name="inn_description">Descansa en la posada para que tus tareas diarias sin completar no te hagan daño por la noche. (Nota: No evita que el jefe te dañe).</string>
+  <string name="empty_items" formatted="false">No tienes %s</string>
+  <string name="user_level" formatted="false">Nivel %s</string>
+  <string name="user_level_with_class" formatted="false">Nivel %1$s - %2$s</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.sidebar.xml b/Habitica/res/values-it/strings.sidebar.xml
index 46556b322..16df130fc 100644
--- a/Habitica/res/values-it/strings.sidebar.xml
+++ b/Habitica/res/values-it/strings.sidebar.xml
@@ -14,5 +14,5 @@
   <string name="sidebar.stable">Scuderia</string>
   <string name="sidebar.news">Novità</string>
   <string name="sidebar.settings">Impostazioni</string>
-  <string name="sidebar.about">Info</string>
+  <string name="sidebar.about">Su Habitica</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index ccfe8154a..2384ed6ba 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -31,9 +31,9 @@
   <string name="login_btn">Accedi</string>
   <string name="register_btn">Registrati</string>
   <string name="username">Nome utente</string>
-  <string name="email_username">Email o nome utente</string>
+  <string name="email_username">E-mail o nome utente</string>
   <string name="password">Password</string>
-  <string name="emailAddress">Indirizzo email</string>
+  <string name="emailAddress">Indirizzo e-mail</string>
   <string name="confirmpassword">Conferma password</string>
   <string name="logout">Esci</string>
   <string name="account_details">Dettagli account</string>
@@ -165,11 +165,11 @@
   <string name="complete_tutorial">Capito!</string>
   <string name="dismiss_tutorial">Ricordamelo ancora</string>
   <string name="intro_1_title">Benvenuto in Habitica</string>
-  <string name="intro_1_description">Unisciti ad oltre 1,100,000 persone che si divertono raggiungendo i propri obiettivi. Crea un avatar e tieni traccia delle tue attività nella vita reale.</string>
+  <string name="intro_1_description">Unisciti ad oltre 1.100.000 persone che si divertono raggiungendo i propri obiettivi. Crea un avatar e tieni traccia delle tue attività nella vita reale.</string>
   <string name="intro_2_title">Progressi nel gioco = 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 fatto del tuo meglio!</string>
   <string name="intro_3_title">Sconfiggi mostri in compagnia</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 migliorando insieme!</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">Inizia</string>
   <string name="previous_button">Indietro</string>
   <string name="next_button">Avanti</string>
@@ -187,7 +187,7 @@ Per cominciare, quali parti della tua vita vuoi migliorare?</string>
   <string name="setup_group_teams">Team</string>
   <string name="setup_group_chores">Faccende di casa</string>
   <string name="setup_group_creativity">Creatività</string>
-  <string name="setup_task_work_1">Controlla le email</string>
+  <string name="setup_task_work_1">Controlla le e-mail</string>
   <string name="setup_task_work_2">La cosa più importante da fare oggi</string>
   <string name="setup_task_work_3">Progetto di lavoro</string>
   <string name="setup_task_exercise_1">10 min cardio</string>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index eb4be0a80..bfa94f477 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -99,7 +99,7 @@
   <string name="faint_button"><![CDATA[体力を満たしてもう一度]]></string>
   <string name="filter">フィルター</string>
   <string name="profile_image">プロフィール画像</string>
-  <string name="mana_price_button" formatted="false">%d MP</string>
+  <string name="mana_price_button" formatted="false">%d マナ</string>
   <string name="used_skill" formatted="false">%2$d マナを %1$s ゴールドで買った</string>
   <string name="new_checklist_item">新しいチェックリスト項目</string>
   <string name="add_checklist_item">追加</string>
@@ -270,7 +270,7 @@
   <string name="feed_to_pet">ペットにえさをやる</string>
   <string name="hatch_egg">たまごをかえす</string>
   <string name="invite_party">パーティーに招待する</string>
-  <string name="dialog_feeding" formatted="false">%1$s %2$s にえさをやる :</string>
+  <string name="dialog_feeding" formatted="false">%1$s%2$s にえさをやる :</string>
   <string name="use_animal">つかう</string>
   <string name="feed">えさやり</string>
   <string name="hatch_with" formatted="false">%s でペットをかえす</string>