From 91d00d047ad4a3ef160ec2bb45fd7ea45cbd762e Mon Sep 17 00:00:00 2001
From: Donatas Kucinskas <donce.lt@gmail.com>
Date: Sun, 4 Mar 2018 12:38:56 +0200
Subject: [PATCH] Add custom message for evolved pet

---
 Habitica/res/values-bg/strings.xml                              | 1 +
 Habitica/res/values-de/strings.xml                              | 1 +
 Habitica/res/values-en-rGB/strings.xml                          | 1 +
 Habitica/res/values-es/strings.xml                              | 1 +
 Habitica/res/values-fr/strings.xml                              | 1 +
 Habitica/res/values-in/strings.xml                              | 1 +
 Habitica/res/values-it/strings.xml                              | 1 +
 Habitica/res/values-iw/strings.xml                              | 1 +
 Habitica/res/values-ja/strings.xml                              | 1 +
 Habitica/res/values-lt/strings.xml                              | 1 +
 Habitica/res/values-nl/strings.xml                              | 1 +
 Habitica/res/values-pl/strings.xml                              | 1 +
 Habitica/res/values-pt-rBR/strings.xml                          | 1 +
 Habitica/res/values-pt-rPT/strings.xml                          | 1 +
 Habitica/res/values-ru/strings.xml                              | 1 +
 Habitica/res/values-tr/strings.xml                              | 1 +
 Habitica/res/values-zh/strings.xml                              | 1 +
 Habitica/res/values/strings.xml                                 | 1 +
 .../habitrpg/android/habitica/ui/activities/MainActivity.java   | 2 +-
 19 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml
index 522171198..046d1a345 100644
--- a/Habitica/res/values-bg/strings.xml
+++ b/Habitica/res/values-bg/strings.xml
@@ -301,6 +301,7 @@
   <string name="feed">Хранене</string>
   <string name="hatch_with">Излюпване на любимец с %s</string>
   <string name="hatched_pet_title">Вие излюпихте %1$s %2$s!</string>
+  <string name="evolved_pet_title">Вие укротихте %1$s %2$s, хайде да пояздим!</string>
   <string name="close">Затваряне</string>
   <string name="share">Споделяне</string>
   <string name="notification_pet_fed">Вие нахранихте своя(та/то) %1$s %2$s!</string>
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 8018f2038..c11cd4775 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -301,6 +301,7 @@
   <string name="feed">Füttern</string>
   <string name="hatch_with">Haustier mit %s ausbrüten</string>
   <string name="hatched_pet_title">Du hast ein %1$s %2$s ausgebrütet!</string>
+  <string name="evolved_pet_title">%1$s %2$s wurde gezähmt. Es ist an der Zeit aufzusitzen!</string>
   <string name="close">Schließen</string>
   <string name="share">Teilen</string>
   <string name="notification_pet_fed">Du hast Dein/e/n %1$s %2$s gefüttert!</string>
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index d4f99afbe..ea12832f0 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -302,6 +302,7 @@
   <string name="feed">Feed</string>
   <string name="hatch_with">Hatch pet with %s</string>
   <string name="hatched_pet_title">You hatched a %1$s %2$s!</string>
+  <string name="evolved_pet_title">You have tamed %1$s %2$s, let's go for a ride!</string>
   <string name="close">Close</string>
   <string name="share">Share</string>
   <string name="notification_pet_fed">You fed your %1$s %2$s!</string>
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 0e0190b7f..7ef9bdb4c 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -302,6 +302,7 @@
   <string name="feed">Alimentar</string>
   <string name="hatch_with">Criar mascota con %s</string>
   <string name="hatched_pet_title">¡Ha nacido un/a %2$s %1$s!</string>
+  <string name="evolved_pet_title">Has dominado a %2$s %1$s, ¡vamos a dar una vuelta!</string>
   <string name="close">Cerrar</string>
   <string name="share">Compartir</string>
   <string name="notification_pet_fed">¡Tu %2$s %1$s ha comido!</string>
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index d4f2dfbb2..7bb9c0791 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -301,6 +301,7 @@
   <string name="feed">Nourrir</string>
   <string name="hatch_with">Faire éclore le familier avec %s</string>
   <string name="hatched_pet_title">Votre %1$s %2$s a éclos !</string>
+  <string name="evolved_pet_title">Votre %1$s %2$s a grandi, baladez-vous dessus !</string>
   <string name="close">Fermer</string>
   <string name="share">Partager</string>
   <string name="notification_pet_fed">Vous avez nourri votre %1$s %2$s !</string>
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 44f4ef177..ceb023401 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -268,6 +268,7 @@
   <string name="feed">Beri makan</string>
   <string name="hatch_with">Tetaskan dengan %s</string>
   <string name="hatched_pet_title">Kamu menetaskan seekor %2$s %1$s!</string>
+  <string name="evolved_pet_title">Kamu telah menjinakkan %2$s %1$s, kini kamu dapat menungganginya!</string>
   <string name="close">Tutup</string>
   <string name="share">Bagikan</string>
   <string name="notification_pet_fed">Kamu memberi makan %2$s %1$s !</string>
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index 8e7a6cfcc..7ca130aa9 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -301,6 +301,7 @@
   <string name="feed">Dai da mangiare</string>
   <string name="hatch_with">Fai nascere un animale con %s</string>
   <string name="hatched_pet_title">È nato un %2$s %1$s!</string>
+  <string name="evolved_pet_title">Hai appena addomesticato %2$s %1$s, andiamo a farci un giro!</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>
diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml
index 08d1e6b98..c1ec1b280 100644
--- a/Habitica/res/values-iw/strings.xml
+++ b/Habitica/res/values-iw/strings.xml
@@ -260,6 +260,7 @@
   <string name="feed">האכילו</string>
   <string name="hatch_with">הבקיעו חיית מחמד עם %s</string>
   <string name="hatched_pet_title">הבקעתם %1$s %2$s!</string>
+  <string name="evolved_pet_title">הצלחתם לאלף %1$s %2$s!, בואו נצא לרכיבה!</string>
   <string name="close">סיגרו</string>
   <string name="share">שתפו</string>
   <string name="notification_pet_fed">האכלתם את ה %1$s %2$s שלכם!</string>
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 0e47ace5c..421a5d06f 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -297,6 +297,7 @@
   <string name="feed">えさをやる</string>
   <string name="hatch_with">%s でペットをかえす</string>
   <string name="hatched_pet_title">%1$s%2$sが生まれた!</string>
+  <string name="evolved_pet_title">%1$s%2$s はあなたに懐きました。 一緒に出かけましょう!</string>
   <string name="close">閉じる</string>
   <string name="share">共有する</string>
   <string name="notification_pet_fed">%1$s%2$sにえさをやった!</string>
diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml
index 2d70a78c6..07999d434 100644
--- a/Habitica/res/values-lt/strings.xml
+++ b/Habitica/res/values-lt/strings.xml
@@ -267,6 +267,7 @@
   <string name="feed">Maitinti</string>
   <string name="hatch_with">Užauginti gyvūną su %s</string>
   <string name="hatched_pet_title">Užauginai %1$s %2$s!</string>
+  <string name="evolved_pet_title">Prisijaukinai %1$s %2$s, lekiame paskraidyti!</string>
   <string name="close">Uždaryti</string>
   <string name="share">Dalintis</string>
   <string name="notification_pet_fed">Pašėrei savo %1$s %2$s!</string>
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index 13de71fbb..ba175838c 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -301,6 +301,7 @@
   <string name="feed">Voeder</string>
   <string name="hatch_with">Laat huisdier uitkomen met %s</string>
   <string name="hatched_pet_title">Je hebt een %1$s %2$s laten uitkomen!</string>
+  <string name="evolved_pet_title">Je hebt %1$s %2$s getemd; laten we op weg gaan!</string>
   <string name="close">Sluiten</string>
   <string name="share">Delen</string>
   <string name="notification_pet_fed">Je hebt je %1$s %2$s gevoederd!</string>
diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml
index 5534833b3..eed07c6f2 100644
--- a/Habitica/res/values-pl/strings.xml
+++ b/Habitica/res/values-pl/strings.xml
@@ -298,6 +298,7 @@
   <string name="feed">Nakarm</string>
   <string name="hatch_with">Wykluj za pomocą %s</string>
   <string name="hatched_pet_title">Wyklułeś/as %1$s %2$s!</string>
+  <string name="evolved_pet_title">Oswoiłeś: %1$s %2$s, chodźmy na przejażdżkę!</string>
   <string name="close">Zamknij</string>
   <string name="share">Podziel się</string>
   <string name="notification_pet_fed">Nakarmiłeś/aś %1$s %2$s!</string>
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index fe4c45b15..1a6d96f76 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -301,6 +301,7 @@
   <string name="feed">Alimentar</string>
   <string name="hatch_with">Chocar mascote com %s</string>
   <string name="hatched_pet_title">Você chocou um %1$s %2$s!</string>
+  <string name="evolved_pet_title">Você domou %1$s %2$s, vamos dar um passeio!</string>
   <string name="close">Fechar</string>
   <string name="share">Compartilhar</string>
   <string name="notification_pet_fed">Você alimentou seu %1$s %2$s!</string>
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index 63556298d..8189289ed 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -280,6 +280,7 @@
   <string name="feed">Alimentar</string>
   <string name="hatch_with">Nascimento do animal com %s</string>
   <string name="hatched_pet_title">Chocou um %1$s %2$s!</string>
+  <string name="evolved_pet_title">Você domou %1$s %2$s, vamos dar um passeio.</string>
   <string name="close">Fechar</string>
   <string name="share">Partilhar</string>
   <string name="notification_pet_fed">Alimentou o seu %1$s %2$s!</string>
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index 8c22e4b72..3c049a2d7 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -301,6 +301,7 @@
   <string name="feed">Покормить</string>
   <string name="hatch_with">Вылупить питомца с помощью %s</string>
   <string name="hatched_pet_title">У вас вылупился %1$s %2$s!</string>
+  <string name="evolved_pet_title">%1$s %2$s ждет в стойлах, пора покататься!</string>
   <string name="close">Закрыть</string>
   <string name="share">Поделиться</string>
   <string name="notification_pet_fed">Вы покормили вашего %1$s %2$s!</string>
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index fd6c7fe3f..9dbbb6ecf 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -301,6 +301,7 @@
   <string name="feed">Besle</string>
   <string name="hatch_with">Evcil hayvanı %s ile üret</string>
   <string name="hatched_pet_title">%1$s %2$s ürettin!</string>
+  <string name="evolved_pet_title">%1$s %2$s yetiştirildi, haydi biraz dolaşalım!</string>
   <string name="close">Kapat</string>
   <string name="share">Paylaş</string>
   <string name="notification_pet_fed">%1$s %2$s besledin!</string>
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index 39c326e9d..81afbb26e 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -283,6 +283,7 @@
   <string name="feed">喂食</string>
   <string name="hatch_with">用%s孵化宠物</string>
   <string name="hatched_pet_title">你孵化了一个 %1$s %2$s！</string>
+  <string name="evolved_pet_title">你驯养了%1$s %2$s，去骑几圈吧！</string>
   <string name="close">关闭</string>
   <string name="share">分享</string>
   <string name="notification_pet_fed">你喂食了你的%1$s %2$s！</string>
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 0796c3146..a9fb8cb5b 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -332,6 +332,7 @@
     <string name="feed">Feed</string>
     <string name="hatch_with">Hatch pet with %s</string>
     <string name="hatched_pet_title">You hatched a %1$s %2$s!</string>
+    <string name="evolved_pet_title">You have tamed %1$s %2$s, let's go for a ride!</string>
     <string name="close">Close</string>
     <string name="share">Share</string>
     <string name="notification_pet_fed" >You fed your %1$s %2$s!</string>
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
index ef357de27..1c9f4ef8e 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java
@@ -724,7 +724,7 @@ public class MainActivity extends BaseActivity implements TutorialView.OnTutoria
                         String colorName = event.usingPet.getColorText();
                         String animalName = event.usingPet.getAnimalText();
                         AlertDialog dialog = new AlertDialog.Builder(MainActivity.this)
-                                .setTitle(getString(R.string.hatched_pet_title, colorName, animalName))
+                                .setTitle(getString(R.string.evolved_pet_title, colorName, animalName))
                                 .setView(mountWrapper)
                                 .setPositiveButton(R.string.close, (hatchingDialog, which) -> hatchingDialog.dismiss())
                                 .setNeutralButton(R.string.share, (hatchingDialog, which) -> {