From 32abe93bafb5f9cb60d4becaaf205c4b66d8bb45 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Fri, 1 Dec 2023 16:29:42 +0100
Subject: [PATCH] fix strings

---
 Habitica/res/layout/fragment_about.xml    | 9 ---------
 Habitica/res/values/strings.xml           | 4 ++--
 version.properties                        | 2 +-
 wearos/src/main/res/values-de/strings.xml | 3 +--
 wearos/src/main/res/values-fr/strings.xml | 3 +--
 wearos/src/main/res/values-hr/strings.xml | 3 +--
 wearos/src/main/res/values-id/strings.xml | 3 +--
 wearos/src/main/res/values-ja/strings.xml | 3 +--
 wearos/src/main/res/values-ro/strings.xml | 3 +--
 wearos/src/main/res/values-tr/strings.xml | 3 +--
 wearos/src/main/res/values-uk/strings.xml | 3 +--
 11 files changed, 11 insertions(+), 28 deletions(-)

diff --git a/Habitica/res/layout/fragment_about.xml b/Habitica/res/layout/fragment_about.xml
index c24b954cd..a02b4c517 100644
--- a/Habitica/res/layout/fragment_about.xml
+++ b/Habitica/res/layout/fragment_about.xml
@@ -81,15 +81,6 @@
             android:text="www.habitica.com"
             android:textSize="@dimen/card_medium_text" />
 
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="10sp"
-            android:autoLink="web"
-            android:text="http://habitica.wikia.com/"
-            android:textSize="@dimen/card_medium_text" />
-
         <Button
             android:id="@+id/privacy_policy_button"
             android:layout_width="250dp"
diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml
index 22212ef40..c55ce6d60 100644
--- a/Habitica/res/values/strings.xml
+++ b/Habitica/res/values/strings.xml
@@ -569,8 +569,8 @@
     <string name="reset_account">Reset Account</string>
     <string name="reset_account_title">Are you sure you want to reset?</string>
     <string name="confirm_reset">Confirm reset</string>
-    <string name="reset_account_description_new">You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, including limited edition or subscriber equipment, but you will be able to buy it back (you will need to be the correct class to re-buy class-specific gear). You will keep your current class and your Pets and Mounts. To confirm reset, type your password below.</string>
-    <string name="reset_account_description_no_pw">You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, including limited edition or subscriber equipment, but you will be able to buy it back (you will need to be the correct class to re-buy class-specific gear). You will keep your current class and your Pets and Mounts. To confirm reset, type RESET below.</string>
+    <string name="reset_account_description_new">You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, except Subscriber items and free commemorative items, but you will be able to buy it back. You will need to be the correct class to re-buy class-specific gear. You will keep your current class, Achievements, and your Pets and Mounts. To confirm reset, type your password below.</string>
+    <string name="reset_account_description_no_pw">You will lose all your levels, Gold, and Experience. All your tasks and their historical data will be deleted (Challenge tasks will stay). You will lose all equipment, except Subscriber items and free commemorative items, but you will be able to buy it back. You will need to be the correct class to re-buy class-specific gear. You will keep your current class, Achievements, and your Pets and Mounts. To confirm reset, type RESET below.</string>
     <string name="delete_caps" translatable="false">DELETE</string>
     <string name="delete_account">Delete Account</string>
     <string name="delete_account_description">This will delete your account forever and it can never be restored! Banked or spent Gems will not be refunded. If you’re absolutely certain, type your password into the text box below.</string>
diff --git a/version.properties b/version.properties
index 77bad4478..1d4915059 100644
--- a/version.properties
+++ b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.3.1
-CODE=6731
+CODE=6751
\ No newline at end of file
diff --git a/wearos/src/main/res/values-de/strings.xml b/wearos/src/main/res/values-de/strings.xml
index 0b69830b6..13b07a8e8 100644
--- a/wearos/src/main/res/values-de/strings.xml
+++ b/wearos/src/main/res/values-de/strings.xml
@@ -5,7 +5,6 @@
     <string name="sign_in">Anmelden</string>
     <string name="other_options">Andere Optionen</string>
     <string name="create_account">Benutzerkonto erstellen</string>
-    <string name="sign_in_password">Mit Passwort anmelden</string>
     <string name="continue_text">Fortfahren</string>
     <string name="day_start">Tagesbeginn</string>
     <string name="rya_description">Es sind noch unvervollständigte Tagesaufgaben von gestern übrig</string>
@@ -24,4 +23,4 @@
     <string name="check_on_phone">Auf dem Handy nachsehen</string>
     <string name="ok">Okay</string>
     <string name="syncing_account">Benutzerkonto vom Handy wird synchronisiert</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wearos/src/main/res/values-fr/strings.xml b/wearos/src/main/res/values-fr/strings.xml
index 2a2d4cbc4..e88a8ed9e 100644
--- a/wearos/src/main/res/values-fr/strings.xml
+++ b/wearos/src/main/res/values-fr/strings.xml
@@ -9,7 +9,6 @@
     <string name="sign_in_description">Créez une liste de tâche et suivez votre progression avec votre avatar de jeu</string>
     <string name="sign_in_on_phone">S\'identifier sur le téléphone</string>
     <string name="create_account">Créer un compte</string>
-    <string name="sign_in_password">S\'identifier avec un mot de passe</string>
     <string name="other_options">Autres options</string>
     <string name="continue_text">Continuer</string>
     <string name="day_start">Début de journée</string>
@@ -41,4 +40,4 @@
     <string name="version_info">Version %1$s (%2$d)</string>
     <string name="starting_your_day">Votre journée commence...</string>
     <string name="disconnected">Déconnecté·e</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wearos/src/main/res/values-hr/strings.xml b/wearos/src/main/res/values-hr/strings.xml
index 07e0f29cf..bb1d1a151 100644
--- a/wearos/src/main/res/values-hr/strings.xml
+++ b/wearos/src/main/res/values-hr/strings.xml
@@ -5,7 +5,6 @@
     <string name="version_info">Verzija %1$s (%2$d)</string>
     <string name="create_account">Stvori račun</string>
     <string name="other_options">Ostale opcije</string>
-    <string name="sign_in_password">Prijavi se s lozinkom</string>
     <string name="continue_text">Nastavi</string>
     <string name="you_ran_out_of_hp">Ponestalo ti je HP-a</string>
     <string name="day_start">Početak dana</string>
@@ -41,4 +40,4 @@
     <string name="some_food">Ponešto Hrane</string>
     <string name="faint_description">Izgubio/la si Level, Iskustvo i Zlatnike. Ne odustaj!</string>
     <string name="levelup_description">Zahvaljujući tvom napornom radu, prešao/la si na novu razinu!</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wearos/src/main/res/values-id/strings.xml b/wearos/src/main/res/values-id/strings.xml
index 9cb9074a0..c09ca9422 100644
--- a/wearos/src/main/res/values-id/strings.xml
+++ b/wearos/src/main/res/values-id/strings.xml
@@ -14,7 +14,6 @@
     <string name="x_quest_item">%d item Misi</string>
     <string name="x_and_y">%1$s dan %2$s</string>
     <string name="create_account">Buat akun</string>
-    <string name="sign_in_password">Masuk dengan sandi</string>
     <string name="continue_text">Lanjutkan</string>
     <string name="you_ran_out_of_hp">Kamu kehabisan nyawa</string>
     <string name="faint_description">Kamu kehilangan Level, Pengalaman, dan Koin Emas. Jangan menyerah!</string>
@@ -41,4 +40,4 @@
     <string name="all_done_today">Semuanya selesai untuk hari ini!</string>
     <string name="starting_your_day">Memulai harimu...</string>
     <string name="disconnected">Terputus</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wearos/src/main/res/values-ja/strings.xml b/wearos/src/main/res/values-ja/strings.xml
index d800bdd4f..9fd8d2ee9 100644
--- a/wearos/src/main/res/values-ja/strings.xml
+++ b/wearos/src/main/res/values-ja/strings.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="other_options">ほかのオプション</string>
-    <string name="sign_in_password">パスワードでサインイン</string>
     <string name="continue_text">続ける</string>
     <string name="you_ran_out_of_hp">体力がなくなりました</string>
     <string name="x_quest_item">%d個のクエストアイテム</string>
@@ -32,4 +31,4 @@
     <string name="levelup_description">あなたは努力の積み重ねでレベルアップしました！</string>
     <string name="all_done_today">今日はすべて完了しました！</string>
     <string name="disconnected">接続を切断されました</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wearos/src/main/res/values-ro/strings.xml b/wearos/src/main/res/values-ro/strings.xml
index c061ed488..41fbb9ca4 100644
--- a/wearos/src/main/res/values-ro/strings.xml
+++ b/wearos/src/main/res/values-ro/strings.xml
@@ -10,7 +10,6 @@
     <string name="sign_in_on_phone">Conectează-te pe telefon</string>
     <string name="other_options">Alte opțiuni</string>
     <string name="create_account">Creare cont</string>
-    <string name="sign_in_password">Conectează-te cu parolă</string>
     <string name="day_start">Începutul zilei</string>
     <string name="rya_description">Nu există zilnice incomplete de ieri</string>
     <string name="review_dailies">Verificare zilnice</string>
@@ -35,4 +34,4 @@
     <string name="continue_on_your_phone">Continuă pe telefon</string>
     <string name="disconnected">Deconectat</string>
     <string name="task_title_hint">Scrie numele sarcinii</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wearos/src/main/res/values-tr/strings.xml b/wearos/src/main/res/values-tr/strings.xml
index 42065fa98..f70ce0c79 100644
--- a/wearos/src/main/res/values-tr/strings.xml
+++ b/wearos/src/main/res/values-tr/strings.xml
@@ -14,7 +14,6 @@
     <string name="sign_in_on_phone">Telefondan oturum aç</string>
     <string name="other_options">Diğer seçenekler</string>
     <string name="create_account">Hesap Oluştur</string>
-    <string name="sign_in_password">Şifre ile Oturum Aç</string>
     <string name="continue_text">Devam Et</string>
     <string name="you_ran_out_of_hp">Canın Bitti</string>
     <string name="faint_description">Bir seviye, DP ve Altın kaybettin. Sakın pes etme!</string>
@@ -41,4 +40,4 @@
     <string name="all_done_today">Bugünlük Tamam!</string>
     <string name="starting_your_day">Gününü başlatıyoruz...</string>
     <string name="disconnected">Bağlantı kesildi</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/wearos/src/main/res/values-uk/strings.xml b/wearos/src/main/res/values-uk/strings.xml
index 3a8b666d7..a6fa32ef4 100644
--- a/wearos/src/main/res/values-uk/strings.xml
+++ b/wearos/src/main/res/values-uk/strings.xml
@@ -5,7 +5,6 @@
     <string name="one_quest_item">1 Квестова річ</string>
     <string name="syncing_account">Синхронізуємо акаунт з телефоном</string>
     <string name="ok">ОК</string>
-    <string name="sign_in_password">Увійти за допомогою пароля</string>
     <string name="starting_your_day">Починаємо твій день...</string>
     <string name="disconnected">Роз\'єднано</string>
     <string name="sign_in_description">Створюйте списки завдань та відстежуйте прогрес з вашим ігровим аватаром</string>
@@ -41,4 +40,4 @@
     <string name="checklist_disclaimer">Списки завдань доступні на телефоні</string>
     <string name="hide_task_rewards">Сховати нагоди за завдання</string>
     <string name="levelup_description">Твій рівень підвищено завдяки твоїм старанням!</string>
-</resources>
\ No newline at end of file
+</resources>