diff --git a/Habitica/res/drawable/calendar_ic.xml b/Habitica/res/drawable/calendar_ic.xml
new file mode 100644
index 000000000..7238df7af
--- /dev/null
+++ b/Habitica/res/drawable/calendar_ic.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
diff --git a/Habitica/res/drawable/gem_ic.xml b/Habitica/res/drawable/gem_ic.xml
new file mode 100644
index 000000000..6da6bbb84
--- /dev/null
+++ b/Habitica/res/drawable/gem_ic.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
diff --git a/Habitica/res/drawable/hourglass_fancy_left.png b/Habitica/res/drawable/hourglass_fancy_left.png
new file mode 100644
index 000000000..ce840e5de
Binary files /dev/null and b/Habitica/res/drawable/hourglass_fancy_left.png differ
diff --git a/Habitica/res/drawable/hourglass_fancy_right.png b/Habitica/res/drawable/hourglass_fancy_right.png
new file mode 100644
index 000000000..20a5a97b4
Binary files /dev/null and b/Habitica/res/drawable/hourglass_fancy_right.png differ
diff --git a/Habitica/res/layout/subscription_details.xml b/Habitica/res/layout/subscription_details.xml
index 9423d61eb..376d49775 100644
--- a/Habitica/res/layout/subscription_details.xml
+++ b/Habitica/res/layout/subscription_details.xml
@@ -1,226 +1,335 @@
+ android:orientation="vertical"
+ tools:background="@color/content_background">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="12dp" />
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:layout_marginBottom="12dp"
+ android:fontFamily="sans-serif-medium"
+ android:text="@string/thanks_for_supporting"
+ android:textColor="@color/text_quad" />
+
+ android:text="@string/cancel_subscription" />
+
+ android:layout_marginBottom="8dp"
+ android:text="@string/cancel_subscription_notgoogle_description" />
+
diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml
index 3b003383e..9cca6f9bd 100644
--- a/Habitica/res/values-de/strings.xml
+++ b/Habitica/res/values-de/strings.xml
@@ -733,7 +733,7 @@ Die Quest-Schriftrolle wird an den Quest-Besitzer zurückgegeben.
Willst Du weiter Deine Vorteile genießen\? Du kannst ein neues Abonnement abschließen, bevor dieses ausläuft, um Deine Vorteile zu behalten.Erneut abonnierenAbonnement erneuern
- Danke für das Abonnieren
+ Danke für das AbonnierenWähle die Abonnementlänge, die für Dich passtEndet am %sEinmalig
diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml
index e7cb15aca..5f12180e0 100644
--- a/Habitica/res/values-en-rGB/strings.xml
+++ b/Habitica/res/values-en-rGB/strings.xml
@@ -709,7 +709,7 @@
Want to continue your benefits\? You can start a new subscription before this one runs out to keep your benefits active.ResubscribeRenew Subscription
- Thanks for subscribing
+ Thanks for subscribingChoose the Subscription length that works for youEnding on %sNot Recurring
diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml
index 80dba4dfb..17b1f7794 100644
--- a/Habitica/res/values-es/strings.xml
+++ b/Habitica/res/values-es/strings.xml
@@ -722,7 +722,7 @@
Invitar amigosDesbloqueado al conectarse en Habitica %d veces.Nivel %1$d %2$s
- Gracias por suscribirte
+ Gracias por suscribirteElige el tiempo de suscripción que mejor funcione para tíCanceladoEnviar invitaciones
diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml
index bf1f4c98b..decd113f3 100644
--- a/Habitica/res/values-fr/strings.xml
+++ b/Habitica/res/values-fr/strings.xml
@@ -908,7 +908,7 @@
Vous voulez encore profiter des bonus \? Vous pouvez commencer un nouvel abonnement avant que celui-ci ne se termine pour les conserver.Se réinscrireRenouveler l\'abonnement
- Merci d\'avoir souscrit un abonnement
+ Merci d\'avoir souscrit un abonnementChoisissez la durée d\'abonnement qui marche pour vousTermine le %sNe se renouvelle pas
diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml
index 40ad6c1ee..4947755bd 100644
--- a/Habitica/res/values-in/strings.xml
+++ b/Habitica/res/values-in/strings.xml
@@ -917,7 +917,7 @@
Telah diberikanBerlangganan KembaliMemperbarui Berlangganan
- Terima kasih telah berlangganan
+ Terima kasih telah berlanggananPilih masa Berlangganan yang kamu inginkanBerakhir pada %sTidak Berulang
diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml
index f5903a9c5..a916414af 100644
--- a/Habitica/res/values-it/strings.xml
+++ b/Habitica/res/values-it/strings.xml
@@ -908,7 +908,7 @@
Vuoi continuare ad avere i tuoi vantaggi\? Puoi iniziare un nuovo abbonamento prima che questo scada per mantenerli attivi.RiabbonatiRinnova l\'Abbonamento
- Grazie per esserti iscritto
+ Grazie per esserti iscrittoScegli la durata dell\'abbonamento che fa per teTermina il %sNon ricorrente
diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml
index 03f3bf957..0c43dc437 100644
--- a/Habitica/res/values-ja/strings.xml
+++ b/Habitica/res/values-ja/strings.xml
@@ -897,7 +897,7 @@
特典を受け続けたいですか?この有料プランの有効期限が切れる前に新しい有料プランをはじめることで、特典を有効に受け続けられます。有料プランの再開有料プランを再開する
- 有料プランにご加入いただきありがとうございます
+ 有料プランにご加入いただきありがとうございます有料プランの期間をあなたのご都合に合わせて選びましょう%sに止めるくり返さない
diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml
index bba1dea98..7814f3190 100644
--- a/Habitica/res/values-ko/strings.xml
+++ b/Habitica/res/values-ko/strings.xml
@@ -911,7 +911,7 @@
혜택을 계속 받고 싶으신가요\? 이번 구독기간이 끝나기 전에 새로 시작하시면 현재 받고 계신 혜택을 계속 유지시킬 수 있습니다.재구독구독 갱신
- 구독해주셔서 감사합니다
+ 구독해주셔서 감사합니다원하시는 구독 기간을 정하세요%s 에 종료자동 반복 안됨
diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml
index b587f6737..9164ec894 100644
--- a/Habitica/res/values-nl/strings.xml
+++ b/Habitica/res/values-nl/strings.xml
@@ -751,7 +751,7 @@
Gebruikers ID kopiërenOpnieuw abonnerenAbonnement vernieuwen
- Bedankt voor het abonneren
+ Bedankt voor het abonnerenKies de abonnementslengte die voor u werktEindigend op %sNiet Terugkerend
diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml
index 5b1c74b30..5c667bec9 100644
--- a/Habitica/res/values-pt-rBR/strings.xml
+++ b/Habitica/res/values-pt-rBR/strings.xml
@@ -709,7 +709,7 @@
Você quer continuar com seus benefícios\? Você pode iniciar uma nova assinatura antes que esta acabe para manter seus benefícios ativos.Assinar novamenteRenovar assinatura
- Obrigado por assinar
+ Obrigado por assinarEscolha o tempo de assinatura que funciona para vocêFinalizando em %sNão recorrente
diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml
index ef1556fdd..f3a13ddef 100644
--- a/Habitica/res/values-pt-rPT/strings.xml
+++ b/Habitica/res/values-pt-rPT/strings.xml
@@ -710,7 +710,7 @@
Crédito de SubscriçãoEconomize 20%Renovar Subscrição
- Obrigado por subscrever-se
+ Obrigado por subscrever-seEquipamentoDistribuindo PontosDistribui pontos baseado nas categorias Força, Inteligência, Constituição e Percepção associadas com as tarefas que completastes.
diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml
index d95b62ede..b8aa283af 100644
--- a/Habitica/res/values-ru/strings.xml
+++ b/Habitica/res/values-ru/strings.xml
@@ -954,7 +954,7 @@
Обычно %d самоцветовПодписаться сноваОбновить подписку
- Благодарим за подписку
+ Благодарим за подпискуПодареноОтвет от %1$d/%2$dЗаканчивается %s
diff --git a/Habitica/res/values-sv/strings.xml b/Habitica/res/values-sv/strings.xml
index 8cc12bcfd..6ae194068 100755
--- a/Habitica/res/values-sv/strings.xml
+++ b/Habitica/res/values-sv/strings.xml
@@ -564,7 +564,7 @@
Dec 17 till Jan 6Abonnera igenKopiera Användarnamn
- Tack för att du prenumererar
+ Tack för att du prenumererarSluta på %sVisa PrestationerKöpa
diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml
index 5c8986894..a09886280 100644
--- a/Habitica/res/values-tr/strings.xml
+++ b/Habitica/res/values-tr/strings.xml
@@ -961,7 +961,7 @@
Faydalardan yararlanmaya devam etmek ister misin\? Faydalarını etkin tutmak için bu abonelik bitmeden yeni bir abonelik başlatabilirsin.Aboneliği YenileYeniden abone ol
- Abone olduğun için teşekkürler
+ Abone olduğun için teşekkürlerYinelenmiyorİptal EdildiDavet Gönder
diff --git a/Habitica/res/values-uk/strings.xml b/Habitica/res/values-uk/strings.xml
index 3b7901355..2c455db26 100755
--- a/Habitica/res/values-uk/strings.xml
+++ b/Habitica/res/values-uk/strings.xml
@@ -857,7 +857,7 @@
Груповий планХочеш надалі використовувати свої переваги\? Ти можеш розпочати нову підписку до закінчення актуальної підтиски, щоб зберегти свої переваги.Вибери час підписки, який тобі найбільше підходить
- Дякуємо за підписку
+ Дякуємо за підпискуПідписатися зновуОновити підпискуЗаощадити 20%
diff --git a/Habitica/res/values-vi/strings.xml b/Habitica/res/values-vi/strings.xml
index 116dbd083..6adafc6df 100755
--- a/Habitica/res/values-vi/strings.xml
+++ b/Habitica/res/values-vi/strings.xml
@@ -868,7 +868,7 @@
Muốn tiếp tục những lợi ích của bạn\? Bạn có thể bắt đầu một Gói đăng ký mới trước khi cái này kết thúc để giữ những lợi ích của bạn được hoạt động.Đăng ký lạiLàm mới Gói đăng ký
- Cảm ơn vì đăng ký
+ Cảm ơn vì đăng kýChọn độ dài Gói đăng ký mà thích hợp với bạnKết thúc vào %sKhông lặp lại
diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml
index 4c40fcd08..a8d453b05 100644
--- a/Habitica/res/values-zh-rTW/strings.xml
+++ b/Habitica/res/values-zh-rTW/strings.xml
@@ -863,7 +863,7 @@
不重複在%s結束選擇最適合的訂閱計劃
- 感謝您的訂閱
+ 感謝您的訂閱更新訂閱重新訂閱要繼續用您的訂閱增值?您可以在現在的訂閱結束前開始新的訂閱,就能繼續使用。
diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml
index fbbbccf15..52ba59dc5 100644
--- a/Habitica/res/values-zh/strings.xml
+++ b/Habitica/res/values-zh/strings.xml
@@ -842,7 +842,7 @@
不重复在%s结束选择最适合的订阅计划
- 感谢您的订阅
+ 感谢您的订阅更新订阅重新订阅要继续用您的订阅增值?您可以在现在的订阅结束前开始新的订阅,就能继续使用。
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 6c26e2ed4..95345f3f2 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -306,7 +306,7 @@
I got to level %d in #Habitica by improving my real-life habits!I just hatched a %1$s %2$s pet in #Habitica by completing my real-life tasks!I just gained a %1$s mount in #Habitica by completing my real-life tasks!
- Open in play store
+ Open Play StoreAre you sure you want to change your class? This will cost 3 gems.Warning: You will no longer be able to buy equipment from the %s class.Confirm
@@ -365,7 +365,7 @@
Belongs to ChallengeHas ReminderHas Tag
- Subscribing supports the developers and helps keep Habitica running
+ Subscribing supports our small team and help keeps Habitica running, thank you!Become a subscriber to receive these exclusive benefits!Gold for GemsMystic Hourglasses
@@ -389,17 +389,18 @@
+%d Mystic HourglassPayment methodSubscription
+ "Your +%d months of subscription credit will activate after cancelingActiveDueCancel Subscription
- No longer want to subscribe? You can find the option to unsubscribe in the “My Apps” section of the Google Play Store. Any months of subscription credit will be applied after your subscription has ended.
+ You can cancel your subscription from the Google Play Store app. Any months of Subscription credit will be applied after your recurring Subscription has ended.No longer want to subscribe? Due to constraints on mobile payments, you\'ll need to cancel via our website. To do this, tap the button below, log in to your account, tap the User icon in the top right, then go to Subscription. Any months of subscription credit will be applied after your subscription has ended. We\'ll miss you!Visit Habitica WebsiteCurrent Bonuses
- Months subscribed
+ Months SubscribedCurrent Mystic Hourglasses
- Next Hourglass
- Monthly gem cap
+ Next Hourglass delivery
+ Monthly Gem CapInactive1 Month%d Months
@@ -910,7 +911,8 @@
Not RecurringEnding on %sChoose the Subscription length that works for you
- Thanks for subscribing
+ Thanks for supporting Habitica
+ Subscribers receive Mystic Hourglasses within the first three days of the month.Renew SubscriptionResubscribeWant to continue your benefits? You can start a new subscription before this one runs out to keep your benefits active.
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 9771018ed..60edf5c76 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -590,6 +590,23 @@
16dp
+
+
+
+
+
+