From bd2934d31c9dc1e49430931515f5f634285a5e15 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 12 Apr 2016 18:54:28 +0200
Subject: [PATCH] update translations

---
 Habitica/AndroidManifest.xml           |  2 +-
 Habitica/res/layout/dialog_faint.xml   |  6 ++++-
 Habitica/res/layout/dialog_levelup.xml |  6 ++++-
 Habitica/res/values-de/strings.xml     |  4 ---
 Habitica/res/values-es/strings.xml     | 35 ++++++++++++++++++++++++--
 Habitica/res/values-fr/strings.xml     |  4 ---
 Habitica/res/values-hr-rHR/strings.xml | 14 ++++++++---
 Habitica/res/values-it/strings.xml     |  8 +++---
 Habitica/res/values-ja/strings.xml     | 14 ++++++++---
 Habitica/res/values-lt/strings.xml     |  4 ---
 Habitica/res/values-pl/strings.xml     |  9 +++++--
 Habitica/res/values-pt-rBR/strings.xml |  4 ---
 Habitica/res/values-pt-rPT/strings.xml | 24 +++++++++++-------
 Habitica/res/values-zh-rTW/strings.xml |  4 ---
 Habitica/res/values-zh/strings.xml     | 14 ++++++++---
 15 files changed, 100 insertions(+), 52 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 088249afd..f5e918f85 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="54"
+    android:versionCode="55"
     android:versionName="0.0.28"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/res/layout/dialog_faint.xml b/Habitica/res/layout/dialog_faint.xml
index 4afaaabcb..86c1b6507 100644
--- a/Habitica/res/layout/dialog_faint.xml
+++ b/Habitica/res/layout/dialog_faint.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingLeft="24dip"
+    android:paddingEnd="24dip"
+    android:paddingStart="24dip"
+    android:paddingRight="24dip">
 
 
     <include
diff --git a/Habitica/res/layout/dialog_levelup.xml b/Habitica/res/layout/dialog_levelup.xml
index aff6f5478..d9cfbcfda 100644
--- a/Habitica/res/layout/dialog_levelup.xml
+++ b/Habitica/res/layout/dialog_levelup.xml
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingLeft="24dip"
+    android:paddingEnd="24dip"
+    android:paddingStart="24dip"
+    android:paddingRight="24dip">
     <ImageView
         android:layout_width="@dimen/avatar_small_width"
         android:layout_height="@dimen/avatar_small_height"
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 03e053cff..056070f29 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -112,8 +112,6 @@ Versuche Deine täglichen Aufgaben sorgfältiger zu erledigen und bekomme Deine
   <string name="no_party_message">Du bist nicht in einer Gruppe. Besuche die Website, um einer Gruppe beizutreten.</string>
   <string name="forgot_pw_btn">Passwort vergessen</string>
   <string name="forgot_pw_tv">Passwort vergessen? Bitte die mobile Website benutzen.</string>
-  <string name="tavern.inn.checkOut">Das Gasthaus verlassen</string>
-  <string name="tavern.inn.rest">Im Gasthaus erholen</string>
   <string name="reward.dialog.buy">Kaufen</string>
   <string name="reward.dialog.dismiss">Als gelesen markieren</string>
   <string name="party">Gruppe</string>
@@ -269,14 +267,12 @@ Für den Anfang: welche Bereiche Deines Lebens möchtest Du verbessern?</string>
   <string name="feed_to_pet">An Haustier verfüttern</string>
   <string name="hatch_egg">Mit Ei ausbrüten</string>
   <string name="invite_party">Gruppe einladen</string>
-  <string name="dialog_feeding" formatted="false">Füttere %s mit</string>
   <string name="use_animal">Nutzen</string>
   <string name="feed">Verfü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>
   <string name="share">Teilen</string>
-  <string name="notification_pet_fed" formatted="false">Du hast Dein/e/n %s gefüttert</string>
   <string name="notification_purchase" formatted="false">%s gekauft</string>
   <string name="sectionpets">Normale Haustiere</string>
   <string name="sectionpremiumPets">Magische Haustiere</string>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index f4ba10c6b..5dc29c63b 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -113,8 +113,6 @@
   <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">Salir de la taberna</string>
-  <string name="tavern.inn.rest">Descansar en la taberna</string>
   <string name="reward.dialog.buy">Comprar</string>
   <string name="reward.dialog.dismiss">Descartar</string>
   <string name="party">Grupo</string>
@@ -252,4 +250,37 @@ Para empezar, ¿qué aspectos de tu vida te gustaría mejorar?</string>
   <string name="ago_hours" formatted="false">Hace %d horas</string>
   <string name="ago_1hour">Hace 1 hora</string>
   <string name="today">Hoy</string>
+  <string name="sidebar_items">Artículos</string>
+  <string name="eggs">Huevos</string>
+  <string name="hatching_potions">Pociones de nacimiento</string>
+  <string name="food">Comida</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="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>
+  <string name="hatch_egg">Mezclar con huevo</string>
+  <string name="invite_party">Invitar al grupo</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_purchase" formatted="false">Has comprado %s</string>
+  <string name="sectionpets">Mascotas básicas</string>
+  <string name="sectionpremiumPets">Mascotas de pociones mágicas</string>
+  <string name="sectionquestPets">Mascotas de misiones</string>
+  <string name="sectionspecialPets">Mascotas insólitas</string>
+  <string name="sectionmounts">Monturas básicas</string>
+  <string name="sectionpremiumMounts">Monturas de pociones mágicas</string>
+  <string name="sectionquestMounts">Monturas de misiones</string>
+  <string name="sectionspecialMounts">Monturas insólitas</string>
 </resources>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index 152e41e59..8c1fbe5e1 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -113,8 +113,6 @@
   <string name="no_party_message">Vous ne faites pas partie d\'une équipe. Pour rejoindre une équipe, veuillez visiter le site.</string>
   <string name="forgot_pw_btn">Mot de passe oublié</string>
   <string name="forgot_pw_tv">Mot de passe oublié ? Veuillez vous rendre sur la version mobile du site.</string>
-  <string name="tavern.inn.checkOut">Quitter l\'Auberge</string>
-  <string name="tavern.inn.rest">Se reposer à l\'Auberge</string>
   <string name="reward.dialog.buy">Acheter</string>
   <string name="reward.dialog.dismiss">Annuler</string>
   <string name="party">Équipe</string>
@@ -270,14 +268,12 @@ Pour commencer, quels aspects de votre vie souhaitez-vous améliorer ?</string>
   <string name="feed_to_pet">Donner au Familier</string>
   <string name="hatch_egg">Faire éclore avec l\'oeuf</string>
   <string name="invite_party">Inviter l\'Équipe</string>
-  <string name="dialog_feeding" formatted="false">Nourrir %s avec </string>
   <string name="use_animal">Utiliser</string>
   <string name="feed">Nourrir</string>
   <string name="hatch_with" formatted="false">Faire éclore le Familier avec %s</string>
   <string name="hatched_pet_title" formatted="false">Vous avez fait éclore un·e %1$s %2$s !</string>
   <string name="close">Fermer</string>
   <string name="share">Partager</string>
-  <string name="notification_pet_fed" formatted="false">Vous avez nourri votre %s!</string>
   <string name="notification_purchase" formatted="false">%s acheté</string>
   <string name="sectionpets">Familiers de Base</string>
   <string name="sectionpremiumPets">Familiers Magiques</string>
diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml
index 94c812043..3ddfda1c8 100644
--- a/Habitica/res/values-hr-rHR/strings.xml
+++ b/Habitica/res/values-hr-rHR/strings.xml
@@ -112,8 +112,6 @@
   <string name="no_party_message">Nisi u grupi. Za pridruživanje grupi, posjetite stranicu.</string>
   <string name="forgot_pw_btn">Zaboravili Lozinku</string>
   <string name="forgot_pw_tv">Zaboravili Lozinku? Molimo koristite mobilnu Stranicu.</string>
-  <string name="tavern.inn.checkOut">Odjavi se iz Krčme</string>
-  <string name="tavern.inn.rest">Odmaraj se u Krčmi</string>
   <string name="reward.dialog.buy">Kupi</string>
   <string name="reward.dialog.dismiss">Zanemari</string>
   <string name="party">Partija</string>
@@ -259,6 +257,7 @@ Za početak, koje djelove života želiš poboljšati?</string>
   <string name="pets">Ljubimci</string>
   <string name="mounts">Životinje za jahanje</string>
   <string name="armoireEquipment" formatted="false">Našao si komad rijetke Opreme u Ormaru: %s!! Zakon!</string>
+  <string name="armoireFood" formatted="false">Premećeš po Ormaru i nalaziš %1$s %2$s. Što to radi ovdje?</string>
   <string name="armoireExp">Hrvaš se s Ormarom i zarađuješ iskustvo. Evo ti ovo!</string>
   <string name="armoireNotesFull" formatted="false">Otvori Ormar za nasumično dobivanje Opreme, Iskustva ili hrane! Ostalo komada opreme: %d</string>
   <string name="armoireLastItem">Našao si zadnji komad rijetke Opreme u Začaranom Ormaru.</string>
@@ -268,12 +267,19 @@ Za početak, koje djelove života želiš poboljšati?</string>
   <string name="feed_to_pet">Nahrani ljubimca</string>
   <string name="hatch_egg">Izlegni s jajetom</string>
   <string name="invite_party">Pozovi grupu</string>
-  <string name="dialog_feeding" formatted="false">Nahrani %s sa</string>
   <string name="use_animal">Koristi</string>
   <string name="feed">Nahrani</string>
   <string name="hatch_with" formatted="false">Izlegni ljubimca sa %s</string>
+  <string name="hatched_pet_title" formatted="false">%1$s %2$s se izlegao/la!</string>
   <string name="close">Zatvori</string>
   <string name="share">Podijeli</string>
-  <string name="notification_pet_fed" formatted="false">Hraniš svog/svoju %s!</string>
   <string name="notification_purchase" formatted="false">%s je kupljen/a</string>
+  <string name="sectionpets">Bazni Ljubimci</string>
+  <string name="sectionpremiumPets">Ljubimci Čarobnog Napitka</string>
+  <string name="sectionquestPets">Ljubimci s Pothvata</string>
+  <string name="sectionspecialPets">Rijetki Ljubimci</string>
+  <string name="sectionmounts">Životinje za jahanje</string>
+  <string name="sectionpremiumMounts">Životinje za jahanje Čarobnog Napitka </string>
+  <string name="sectionquestMounts">Životinje za jahanje s Pothvata</string>
+  <string name="sectionspecialMounts">Rijetke Životinje za jahanje</string>
 </resources>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index e4d66d05e..9b4017062 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -113,8 +113,6 @@
   <string name="no_party_message">Non sei in una squadra. Per unirti ad una squadra, per favore visita il sito web di Habitica.</string>
   <string name="forgot_pw_btn">Password dimenticata</string>
   <string name="forgot_pw_tv">Hai dimenticato la password? Per favore usa il sito web di Habitica.</string>
-  <string name="tavern.inn.checkOut">Esci dalla Locanda</string>
-  <string name="tavern.inn.rest">Riposa nella Locanda</string>
   <string name="reward.dialog.buy">Compra</string>
   <string name="reward.dialog.dismiss">Annulla</string>
   <string name="party">Squadra</string>
@@ -262,10 +260,12 @@ Per cominciare, quali parti della tua vita vuoi migliorare?</string>
   <string name="sell" formatted="false">Vendi (%s Oro)</string>
   <string name="feed_to_pet">Dai ad animale</string>
   <string name="invite_party">Invita squadra</string>
-  <string name="dialog_feeding" formatted="false">Nutri %s con</string>
   <string name="use_animal">Usa</string>
   <string name="close">Chiudi</string>
   <string name="share">Condividi</string>
-  <string name="notification_pet_fed" formatted="false">Hai nutrito il tuo %s!</string>
   <string name="notification_purchase" formatted="false">Hai acquistato %s</string>
+  <string name="sectionpets">Animali base</string>
+  <string name="sectionspecialPets">Animali rari</string>
+  <string name="sectionmounts">Cavalcature base</string>
+  <string name="sectionspecialMounts">Cavalcature rare</string>
 </resources>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 2f870ee6b..615383b19 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -112,8 +112,6 @@
   <string name="no_party_message">パーティーに参加していません。パーティーに参加する方法を website で確認してください。</string>
   <string name="forgot_pw_btn">パスワードがわからない</string>
   <string name="forgot_pw_tv">パスワードを忘れた? 携帯電話用のWebsiteへアクセスしてください。</string>
-  <string name="tavern.inn.checkOut">宿からチェックアウト</string>
-  <string name="tavern.inn.rest">宿で休憩</string>
   <string name="reward.dialog.buy">買う</string>
   <string name="reward.dialog.dismiss">中止</string>
   <string name="party">パーティー</string>
@@ -260,6 +258,7 @@
   <string name="pets">ペット</string>
   <string name="mounts">乗用獣</string>
   <string name="armoireEquipment" formatted="false">戸棚で貴重なアイテム、 %s を見つけました!　すごい!</string>
+  <string name="armoireFood" formatted="false">戸棚をひっかきまわして%1$s%2$sを見つけました。何でこんなとこにあるんでしょう?</string>
   <string name="armoireExp">戸棚と格闘して経験値を増やしました。どうぞっ!</string>
   <string name="armoireNotesFull" formatted="false">戸棚を開くと、ときどき特別な装備、経験値、餌を手にすることができます!　残っているアイテムの部品 : %d</string>
   <string name="armoireLastItem">貴重なアイテムの最後の部品を魅惑の戸棚で発見しました。</string>
@@ -269,12 +268,19 @@
   <string name="feed_to_pet">ペットにえさをやる</string>
   <string name="hatch_egg">たまごをかえす</string>
   <string name="invite_party">パーティーに招待する</string>
-  <string name="dialog_feeding" formatted="false">%s にえさをやる : </string>
   <string name="use_animal">つかう</string>
   <string name="feed">えさやり</string>
   <string name="hatch_with" formatted="false">%s でペットをかえす</string>
+  <string name="hatched_pet_title" formatted="false">%1$s%2$sが生まれました!</string>
   <string name="close">閉じる</string>
   <string name="share">共有する</string>
-  <string name="notification_pet_fed" formatted="false">%s にえさをやった!</string>
   <string name="notification_purchase" formatted="false">%s は購入済み</string>
+  <string name="sectionpets">普通のペット</string>
+  <string name="sectionpremiumPets">魔法の薬のペット</string>
+  <string name="sectionquestPets">クエスト ペット</string>
+  <string name="sectionspecialPets">貴重なペット</string>
+  <string name="sectionmounts">基本の乗用獣</string>
+  <string name="sectionpremiumMounts">魔法の薬の乗用獣</string>
+  <string name="sectionquestMounts">クエストの乗用獣</string>
+  <string name="sectionspecialMounts">貴重な乗用獣</string>
 </resources>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index 002be1993..9dd7aa51d 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -113,8 +113,6 @@
   <string name="no_party_message">Tu nesi grupėje. Norėdama(s) prisidėti prie grupės, apsilankyk svetainėje.</string>
   <string name="forgot_pw_btn">Pamiršau Slaptažodį</string>
   <string name="forgot_pw_tv">Pamiršote Slaptažodį? Naudokite mobilią Svetainę.</string>
-  <string name="tavern.inn.checkOut">Išeiti iš Užeigos</string>
-  <string name="tavern.inn.rest">Pailsėti Užeigoje</string>
   <string name="reward.dialog.buy">Pirkti</string>
   <string name="reward.dialog.dismiss">Atšaukti</string>
   <string name="party">Grupė</string>
@@ -269,12 +267,10 @@ Pradžiai, kurias savo gyvenimo dalis norėtum tobulint?</string>
   <string name="feed_to_pet">Maitinti Gyvūnui</string>
   <string name="hatch_egg">Išperėti kiaušinį</string>
   <string name="invite_party">Pakviesti Grupę</string>
-  <string name="dialog_feeding" formatted="false">Pamaitinti %s su </string>
   <string name="use_animal">Panaudoti</string>
   <string name="feed">Maitinti</string>
   <string name="hatch_with" formatted="false">Užauginti gyvūną su %s</string>
   <string name="close">Uždaryti</string>
   <string name="share">Dalintis</string>
-  <string name="notification_pet_fed" formatted="false">Pamaitinai savo %s!</string>
   <string name="notification_purchase" formatted="false">%s nupirkta</string>
 </resources>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 0c78e0e59..70fe21ef6 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -113,8 +113,6 @@
   <string name="no_party_message">Nie jesteś w drużynie. Żeby dołączyć do drużyny odwiedź stronę internetową.</string>
   <string name="forgot_pw_btn">Zapomniane hasło</string>
   <string name="forgot_pw_tv">Zapomniane hasło? Użyj mobilnej strony internetowej.</string>
-  <string name="tavern.inn.checkOut">Wymelduj się z Gospody</string>
-  <string name="tavern.inn.rest">Odpoczywaj w Gospodzie</string>
   <string name="reward.dialog.buy">Kup</string>
   <string name="reward.dialog.dismiss">Anuluj</string>
   <string name="party">Drużyna</string>
@@ -252,4 +250,11 @@ Od czego chcesz zacząć poprawiać swoje życie?</string>
   <string name="ago_hours" formatted="false">%d godzin temu</string>
   <string name="ago_1hour">1 godzinę temu</string>
   <string name="today">Dzisiaj</string>
+  <string name="sidebar_items">Przedmioty</string>
+  <string name="eggs">Jaja</string>
+  <string name="hatching_potions">Eliksiry wyklucia</string>
+  <string name="food">Jedzonko</string>
+  <string name="quests">Misje</string>
+  <string name="pets">Zwierzaki</string>
+  <string name="mounts">Wierzchowce</string>
 </resources>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 8f6927a53..900fb7194 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -113,8 +113,6 @@
   <string name="no_party_message">Você não está em um grupo. Para entrar em um grupo, por favor visite o site.</string>
   <string name="forgot_pw_btn">Esqueci a senha</string>
   <string name="forgot_pw_tv">Esqueceu a senha? Por favor use o Site móvel.</string>
-  <string name="tavern.inn.checkOut">Sair da Pousada</string>
-  <string name="tavern.inn.rest">Descansar na Pousada</string>
   <string name="reward.dialog.buy">Comprar</string>
   <string name="reward.dialog.dismiss">Desfazer</string>
   <string name="party">Grupo</string>
@@ -269,12 +267,10 @@ Para começar, quais partes da sua vida você quer melhorar?</string>
   <string name="feed_to_pet">Alimentar mascote</string>
   <string name="hatch_egg">Chocar com ovo</string>
   <string name="invite_party">Convidar equipe</string>
-  <string name="dialog_feeding" formatted="false">Alimentar %s com</string>
   <string name="use_animal">Usar</string>
   <string name="feed">Alimentar</string>
   <string name="hatch_with" formatted="false">Chocar mascote com %s</string>
   <string name="close">Fechar</string>
   <string name="share">Compartilhar</string>
-  <string name="notification_pet_fed" formatted="false">Você alimentou seu %s!</string>
   <string name="notification_purchase" formatted="false">%s foi comprado</string>
 </resources>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index a72da1051..6baa635a7 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -112,8 +112,6 @@
   <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">Sai da taberna</string>
-  <string name="tavern.inn.rest">Descansa na taberna</string>
   <string name="reward.dialog.buy">Comprar</string>
   <string name="reward.dialog.dismiss">Destituir</string>
   <string name="party">Equipa</string>
@@ -258,22 +256,30 @@ Para começar, quais as partes da tua vida que queres melhorar?</string>
   <string name="quests">Missões</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 na Sala de Armas: %s! Fenomenal!</string>
-  <string name="armoireExp">Lutas com a Sala de Armas e ganhas experiência. Boa!</string>
-  <string name="armoireNotesFull" formatted="false">Abre a Sala de Armas para receberes aleatoriamente uma peça de Equipamento, Experiência ou comida! Número de peças de Equipamento que restam por encontrar: %d</string>
-  <string name="armoireLastItem">Encontraste a última peça rara de Equipamento na Sala de Armas Encantada.</string>
-  <string name="armoireNotesEmpty">A Sala de Armas terá novos Equipamentos na primeira semana de cada mês. Até lá, continua a clicar para receberes Experiência e comida!</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>
+  <string name="armoireExp">Lutas com o Armário e ganhas experiência. Boa!</string>
+  <string name="armoireNotesFull" formatted="false">Abre o Armário para receberes aleatoriamente uma peça de Equipamento, Experiência ou comida! Número de peças de Equipamento que restam por encontrar: %d</string>
+  <string name="armoireLastItem">Encontraste a última peça rara de Equipamento no Armário Encantado.</string>
+  <string name="armoireNotesEmpty">O Armário terá novos Equipamentos na primeira semana de cada mês. Até lá, continua a clicar para receberes Experiência e comida!</string>
   <string name="sell" 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="invite_party">Convidar a equipa</string>
-  <string name="dialog_feeding" formatted="false">Alimentar %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="close">Fechar</string>
   <string name="share">Partilhar</string>
-  <string name="notification_pet_fed" formatted="false">Alimentaste o teu %s!</string>
   <string name="notification_purchase" formatted="false">Compraste %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="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="sectionspecialMounts">Montadas Raras</string>
 </resources>
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index c342029f2..903ce4765 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -113,8 +113,6 @@
   <string name="no_party_message">你沒有加入任何隊伍。如想加入隊伍，請訪問網頁版。</string>
   <string name="forgot_pw_btn">忘記密碼</string>
   <string name="forgot_pw_tv">忘記了您的密碼？請訪問網頁版。</string>
-  <string name="tavern.inn.checkOut">離開客棧</string>
-  <string name="tavern.inn.rest">在客棧休息</string>
   <string name="reward.dialog.buy">購買</string>
   <string name="reward.dialog.dismiss">解散</string>
   <string name="party">隊伍</string>
@@ -269,12 +267,10 @@
   <string name="feed_to_pet">餵食寵物</string>
   <string name="hatch_egg">孵化寵物蛋</string>
   <string name="invite_party">隊伍邀請</string>
-  <string name="dialog_feeding" formatted="false">餵食 %s 寵物</string>
   <string name="use_animal">用</string>
   <string name="feed">餵</string>
   <string name="hatch_with" formatted="false">用 %s 孵化寵物</string>
   <string name="close">關閉</string>
   <string name="share">分享</string>
-  <string name="notification_pet_fed" formatted="false">你餵了你的 %s!</string>
   <string name="notification_purchase" formatted="false">%s 被買下來了</string>
 </resources>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 8e74a1a41..787a8300c 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -113,8 +113,6 @@
   <string name="no_party_message">你没有加入任何队伍。如想加入队伍，请访问网页版。</string>
   <string name="forgot_pw_btn">忘记密码</string>
   <string name="forgot_pw_tv">忘记了您的密码？请访问网页版。</string>
-  <string name="tavern.inn.checkOut">离开客栈</string>
-  <string name="tavern.inn.rest">在客栈休息</string>
   <string name="reward.dialog.buy">购买</string>
   <string name="reward.dialog.dismiss">解散</string>
   <string name="party">队伍</string>
@@ -260,6 +258,7 @@
   <string name="pets">宠物</string>
   <string name="mounts">坐骑</string>
   <string name="armoireEquipment" formatted="false">您在魔法衣橱里找到了一件稀有装备：%s！恭喜你！</string>
+  <string name="armoireFood" formatted="false">你在魔法衣橱里找到了%1$s %2$s。它是用来做什么的？</string>
   <string name="armoireExp">你和大衣柜展开了殊死搏斗，并赢得了经验，尝尝这个吧！</string>
   <string name="armoireNotesFull" formatted="false">拉开 魔法衣橱 来获得随机的特殊装备，经验或者食物！剩余的装备：%d</string>
   <string name="armoireLastItem">您在魔法衣橱里找到了最后一件稀有装备。</string>
@@ -269,12 +268,19 @@
   <string name="feed_to_pet">喂养宠物</string>
   <string name="hatch_egg">孵化宠物蛋</string>
   <string name="invite_party">邀请队伍</string>
-  <string name="dialog_feeding" formatted="false">喂养%s用</string>
   <string name="use_animal">使用</string>
   <string name="feed">喂食</string>
   <string name="hatch_with" formatted="false">用%s孵化宠物</string>
+  <string name="hatched_pet_title" formatted="false">你孵化了一个 %1$s %2$s！</string>
   <string name="close">关闭</string>
   <string name="share">分享</string>
-  <string name="notification_pet_fed" formatted="false">你喂食了你的%s！</string>
   <string name="notification_purchase" formatted="false">已购买 %s</string>
+  <string name="sectionpets">基本宠物</string>
+  <string name="sectionpremiumPets">神奇药水宠物</string>
+  <string name="sectionquestPets">剧情任务宠物</string>
+  <string name="sectionspecialPets">稀有宠物</string>
+  <string name="sectionmounts">基本坐骑</string>
+  <string name="sectionpremiumMounts">神奇药水坐骑</string>
+  <string name="sectionquestMounts">剧情任务坐骑</string>
+  <string name="sectionspecialMounts">稀有坐骑</string>
 </resources>