feat: 更新翻译

.gitignore

@@ -20,5 +20,5 @@ schemas
 schemas/
 schemas/*
 app/release/
-app/yoki/release
+app/gami/release
 /tool/log/config.ini

app/src/main/java/com/adealink/weparty/url/UrlConfig.kt

@@ -13,11 +13,6 @@ object UrlConfig {
     private val isProdEnv =
         AppBase.isRelease || RELEASE_HOSTS.contains(Uri.parse(DebugPrefs.httpUrl).host)
 
-    val thirdPayUrl = when {
-        isProdEnv -> "https://web.wenext.chat/web/yoki-wallet"
-        else -> "http://web-test.wenext.chat/web/yoki-wallet"
-    }
-
     val serviceTerms = when {
         isProdEnv -> "https://web.gami.vip/about/termsOfService"
         else -> "https://web.gami.vip/about/termsOfService"

app/src/main/java/com/adealink/weparty/util/UIUtil.kt

@@ -40,12 +40,16 @@ fun formatNumberStr(number: Long): String {
             number.toString()
         }
 
-        number < 1000000 -> {
-            String.format(Locale.US, "%.1fK", (number.toFloat() / 1000))
+        number < 1000_000 -> {
+            String.format(Locale.US, "%.2fK", (number.toFloat() / 1000))
+        }
+
+        number < 1000_000_000 -> {
+            String.format(Locale.US, "%.2fM", (number.toFloat() / 1000_000))
         }
 
         else -> {
-            String.format(Locale.US, "%.1fM", (number.toFloat() / 1000000))
+            String.format(Locale.US, "%.2fB", (number.toFloat() / 1000_000_000))
         }
     }
 }
@@ -53,25 +57,24 @@ fun formatNumberStr(number: Long): String {
 
 fun formatNumberStr(number: Double): String {
     return when {
-//        number < 1000 -> {
-//            if (number % 1 == 0.0) {
-//                "%.0f".format(number)
-//            } else {
-//                "%.2f".format(number)
-//            }
-//        }
-
-        number < 1000000 -> {
+        number < 1000 -> {
             if (number % 1 == 0.0) {
                 "%.0f".format(number)
             } else {
                 "%.2f".format(number)
             }
-//            String.format(Locale.US, "%.1fK", (number.toFloat() / 1000))
+        }
+
+        number < 1000_000 -> {
+            String.format(Locale.US, "%.2fK", (number.toFloat() / 1000))
+        }
+
+        number < 1000_000_000 -> {
+            String.format(Locale.US, "%.2fM", (number.toFloat() / 1000_000))
         }
 
         else -> {
-            String.format(Locale.US, "%.1fM", (number.toFloat() / 1000000))
+            String.format(Locale.US, "%.2fB", (number.toFloat() / 1000_000_000))
         }
     }
 }

app/src/main/res/values-in/strings.xml

@@ -159,6 +159,8 @@
     <string name="common_upgrade_other_desc">%1$s mempromosikan %2$s ke tingkat %3$s</string>
     <string name="common_search_record">Sejarah pencarian</string>
     <string name="common_coin">Koin emas</string>
+    <string name="common_diamond">Berlian</string>
+    <string name="common_bean">Kacang</string>
     <string name="common_end">Menyelesaikan</string>
     <string name="common_copy">Menyalin</string>
     <string name="common_skip">Lewati</string>
@@ -219,4 +221,45 @@
     <string name="commonui_list_search_empty">Oh, tidak ada apa-apa di sini~</string>
     <string name="common_error">Error</string>
     <string name="common_ssl_error_tip">Sertifikat keamanan situs web saat ini tidak kredibel. Mungkin ada risiko keamanan. Apakah Anda ingin terus mengakses?</string>
+    <string name="common_star_rank_filter">Peringkat</string>
+    <string name="common_star_rank_filter_to_low">Peringkat tinggi ke rendah</string>
+    <string name="common_star_rank_filter_to_high">Peringkat rendah ke tinggi</string>
+    <string name="common_price_rank_filter">Harga</string>
+    <string name="common_price_rank_filter_to_low">Harga tinggi ke rendah</string>
+    <string name="common_price_rank_filter_to_high">Harga rendah ke tinggi</string>
+    <string name="common_find_your_partner">Temukan pasangan Anda</string>
+    <string name="common_online_play">Bermain Online</string>
+    <string name="common_pc_game">Game PC</string>
+    <string name="common_activity">Aktivitas</string>
+    <string name="common_all_category">Semua Kategori</string>
+    <string name="common_gender">Jenis Kelamin</string>
+    <string name="common_age">Usia</string>
+    <string name="common_area">Wilayah</string>
+    <string name="common_count_str">Jumlah</string>
+    <string name="common_submit">Kirim</string>
+    <string name="order_status_in_progress">Sedang Diproses</string>
+    <string name="order_status_finish">Selesai</string>
+    <string name="order_status_cancel">Dibatalkan</string>
+    <string name="order_status_refund">Dikembalikan</string>
+    <string name="common_main_home_tab">Beranda</string>
+    <string name="common_main_message_tab">Pesan</string>
+    <string name="common_main_me_tab">Saya</string>
+    <string name="common_logout">Keluar</string>
+    <string name="toast_storage_permission_no_granted">Izin penyimpanan tidak diberikan, gambar tidak dapat disimpan. Silakan buka [Pengaturan Sistem] untuk membukanya.</string>
+    <string name="common_error_no_more_data">Tidak ada data lagi</string>
+    <string name="common_playmate_price">%1$s/%2$s</string>
+    <string name="profile_create_order">Buat pesanan</string>
+    <string name="photo_size_not_valid">Foto yang Anda pilih memiliki resolusi rendah, silakan pilih lagi</string>
+    <string name="common_video_select_duration_limit_tip">Hanya video dengan durasi %1$s detik atau kurang yang dapat dipilih.</string>
+    <string name="common_hi">Hai</string>
+    <string name="common_choose_date">Pilih Tanggal</string>
+    <string name="common_just_now">Saat Ini</string>
+    <string name="common_help_center">Pusat Bantuan</string>
+    <string name="web_view_page_load_error_tip">Pemuatan halaman gagal, silakan coba lagi.</string>
+    <string name="common_settings">Pengaturan</string>
+    <string name="common_copy_id_success">ID berhasil disalin</string>
+    <string name="common_black_tips">Anda tidak akan menerima pesan dari pengguna ini setelah memblokirnya. Apakah Anda yakin ingin memblokirnya?</string>
+    <string name="common_unfollow_tips">Anda akan berhenti mengikuti pengguna ini. Apakah Anda yakin?</string>
+    <string name="common_unfollow_cancel_tips">Pikirkan dulu</string>
+    <string name="common_unfollow_confirm_tips">Jangan ikuti lagi</string>
 </resources>

app/src/main/res/values-zh/strings.xml

@@ -159,6 +159,8 @@
     <string name="common_upgrade_other_desc">%1$s晋升%2$s到达%3$s</string>
     <string name="common_search_record">搜索记录</string>
     <string name="common_coin">金币</string>
+    <string name="common_diamond">钻石</string>
+    <string name="common_bean">金豆</string>
     <string name="common_end">结束</string>
     <string name="common_copy">复制</string>
     <string name="common_skip">跳过</string>
@@ -216,4 +218,48 @@
     <string name="common_hardware_camera">相机</string>
     <string name="common_hardware_mic">麦克风</string>
     <string name="common_version_too_old">您的应用版本过低，请更新后继续</string>
+    <string name="commonui_list_search_empty">哦,这里什么都没有</string>
+    <string name="common_error">错误</string>
+    <string name="common_ssl_error_tip">网站安全证书不可信,可能存在安全问题,你要继续访问么?</string>
+    <string name="common_star_rank_filter">评分</string>
+    <string name="common_star_rank_filter_to_low">评分高到低</string>
+    <string name="common_star_rank_filter_to_high">评分低到高</string>
+    <string name="common_price_rank_filter">价格</string>
+    <string name="common_price_rank_filter_to_low">价格高到低</string>
+    <string name="common_price_rank_filter_to_high">价格低到高</string>
+    <string name="common_find_your_partner">找陪玩</string>
+    <string name="common_online_play">在线游玩</string>
+    <string name="common_pc_game">PC游戏</string>
+    <string name="common_activity">活动</string>
+    <string name="common_all_category">全部分类</string>
+    <string name="common_gender">性别</string>
+    <string name="common_age">年龄</string>
+    <string name="common_area">地区</string>
+    <string name="common_count_str">数量</string>
+    <string name="common_submit">提交</string>
+    <string name="order_status_in_progress">进行中</string>
+    <string name="order_status_finish">已完成</string>
+    <string name="order_status_cancel">已取消</string>
+    <string name="order_status_refund">已退款</string>
+    <string name="common_main_home_tab">首页</string>
+    <string name="common_main_message_tab">消息</string>
+    <string name="common_main_me_tab">我的</string>
+    <string name="common_logout">登出</string>
+    <string name="toast_storage_permission_no_granted">未获得存储权限，图片无法保存。请前往[系统设置]打开。</string>
+    <string name="common_error_no_more_data">没有更多数据</string>
+    <string name="common_playmate_price">%1$s/%2$s</string>
+    <string name="profile_create_order">下单</string>
+    <string name="photo_size_not_valid">您选择的照片分辨率较低，请重新选择</string>
+    <string name="common_video_select_duration_limit_tip">只能选择时长在 %1$s 秒以内的视频。</string>
+    <string name="common_hi">Hi</string>
+    <string name="common_choose_date">选择日期</string>
+    <string name="common_just_now">刚刚</string>
+    <string name="common_help_center">帮助中心</string>
+    <string name="web_view_page_load_error_tip">页面加载失败，请重试。</string>
+    <string name="common_settings">设置</string>
+    <string name="common_copy_id_success">复制ID成功</string>
+    <string name="common_black_tips">拉黑后将不会收到对方消息,确定拉黑?</string>
+    <string name="common_unfollow_tips">你将取消关注该用户,是否确认?</string>
+    <string name="common_unfollow_cancel_tips">再想一下</string>
+    <string name="common_unfollow_confirm_tips">不再关注</string>
 </resources>

app/src/main/res/values/strings.xml

@@ -218,9 +218,6 @@
     <string name="commonui_srl_footer_refreshing">Wait For Refreshing…</string>
     <string name="commonui_srl_footer_release">Release To Load More</string>
     <string name="commonui_no_prompt">Don\'t remind again</string>
-    <string name="commonui_list_search_empty">Oh,There is nothing here~</string>
-    <string name="common_error">Error</string>
-    <string name="common_ssl_error_tip">The security certificate of the current website is not credible. There may be security risks. Do you want to continue accessing?</string>
     <string name="imageselect_all_photos">All Photos</string>
     <string name="imageselect_crop">Crop</string>
     <string name="image_select_permission_no_granted">The storage permission has not been obtained, and the picture cannot be selected. Go to [System Settings] to open it</string>
@@ -232,13 +229,15 @@
     <string name="image_select_avatar_select_gif_tip">%1$s level ≥50 open GIF upload privilege (subject to review)</string>
     <string name="image_select_room_cover_family">%1$s You have obtained the privilege to upload room animations during family activities (requires review), and the privilege will expire in %2$s. Free upload permission 2 times a week, if more than that, you need to pay additional gold coins</string>
 
+    <string name="commonui_list_search_empty">Oh,There is nothing here~</string>
+    <string name="common_error">Error</string>
+    <string name="common_ssl_error_tip">The security certificate of the current website is not credible. There may be security risks. Do you want to continue accessing?</string>
     <string name="common_star_rank_filter">评分</string>
     <string name="common_star_rank_filter_to_low">评分高到低</string>
     <string name="common_star_rank_filter_to_high">评分低到高</string>
     <string name="common_price_rank_filter">价格</string>
     <string name="common_price_rank_filter_to_low">价格高到低</string>
     <string name="common_price_rank_filter_to_high">价格低到高</string>
-
     <string name="common_find_your_partner">Find your partner</string>
     <string name="common_online_play">Online Play</string>
     <string name="common_pc_game">PC Game</string>

module/account/src/main/java/com/adealink/weparty/account/constant/Error.kt

@@ -18,12 +18,6 @@ class AccountLoginAuthError(val statusCode: Int?) : IError(getCompatString(R.str
 //模块：account，功能：login，错误：同一个设备注册多个账号限制
 class AccountLoginRegisterLimitError : IError(getCompatString(R.string.account_register_limit))
 
-//模块：account，功能：login，错误：因为%AA，你被封禁账号%BB
-class AccountBannedError(reason: String, banTime: String) :
-    IError(msg = getCompatString(R.string.account_login_banned,
-        reason,
-        banTime))
-
 //模块：account，功能：login，错误：服务端请求第三方授权失败
 class AccountServerAuthError : IError(getCompatString(R.string.account_server_auth_failed))
 

module/account/src/main/java/com/adealink/weparty/account/login/LoginDialog.kt

@@ -183,8 +183,6 @@ class LoginDialog : BaseDialogFragment(R.layout.dialog_login) {
         binding.userAgreementTv.movementMethod = LinkMovementMethod.getInstance()
         val serviceTerms = getCompatString(R.string.account_service_terms)
         val privacyPolicyStr = getCompatString(R.string.account_privacy_policy)
-        val childPolicy = getCompatString(R.string.account_child_policy)
-        val electronicVisa = getCompatString(R.string.account_electronic_visa)
         val agreementString =
             getCompatString(R.string.account_user_agreement_tips_new)
 
@@ -214,7 +212,7 @@ class LoginDialog : BaseDialogFragment(R.layout.dialog_login) {
                     }
                 }
             )
-            append(getCompatString(R.string.account_separator))
+            append(",")
             append(
                 buildSpannedString {
                     append(privacyPolicyStr).apply {

module/account/src/main/res/values-in/strings.xml

@@ -1,3 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="account_auth_error">Otorisasi gagal, silakan coba login lain atau sambungkan VPN untuk mencoba lagi</string>
+    <string name="account_user_agreement_tips">Login berarti Anda menyetujui %1$s dan %2$s.</string>
+    <string name="account_privacy_policy">Kebijakan Privasi</string>
+    <string name="account_service_terms">Syarat dan Ketentuan Layanan</string>
+    <string name="account_user_agreement_tips_new">Login berarti Anda setuju</string>
+    <string name="account_fb">Facebook</string>
+    <string name="account_google">Google</string>
+    <string name="account_phone">Telepon</string>
+    <string name="account_kick_off">Akun Gami Anda masuk dengan %1$s di perangkat lain, jika bukan Anda yang mengoperasikannya, segera periksa apakah akun %2$s dicuri</string>
+    <string name="account_token_expire">Informasi Login tidak valid. Silakan masuk lagi</string>
+    <string name="account_feedback">Umpan Balik</string>
+    <string name="account_banned">Akun Anda diblokir</string>
+    <string name="account_register_limit">Anda hanya dapat mendaftarkan 3 akun per perangkat</string>
+    <string name="account_server_auth_failed">Otorisasi pihak ketiga gagal, silakan coba lagi</string>
+    <string name="account_server_op_failed">Operasi server gagal, silakan coba lagi</string>
+    <string name="account_server_exception">Kesalahan server, silakan coba lagi</string>
+    <string name="account_login_common_failed">Kesalahan jaringan, silakan ganti jaringan untuk mencoba lagi</string>
+    <string name="account_enter_your_phone">Masukkan nomor Anda</string>
+    <string name="account_sign_up_or_login">Daftar/Masuk</string>
+    <string name="account_login">Masuk</string>
+    <string name="account_enter_password_tip">Silakan masukkan kata sandi Anda</string>
+    <string name="account_choose_country">Pilih [Negara/Wilayah]</string>
+    <string name="account_invalid_verify_code">Kode verifikasi tidak valid</string>
+    <string name="account_password_error">Kesalahan kata sandi</string>
+    <string name="account_password_frequently_error">Sering terjadi kesalahan kata sandi, harap tunggu sebentar untuk mencoba lagi</string>
+    <string name="account_verfiy_code_limit">Pengiriman kode verifikasi mencapai batas hari ini</string>
+    <string name="account_country_not_support">Negara tidak didukung</string>
+    <string name="account_login_with_invalid_device_id">Tidak dapat masuk dengan perangkat yang tidak valid</string>
+    <string name="account_login_virtual_apk">Tidak dapat masuk dengan beberapa aplikasi</string>
+    <string name="account_copy_device_id_success">ID Perangkat berhasil disalin</string>
+    <string name="account_copy_device_id_fail">Gagal mendapatkan ID perangkat</string>
+    <string name="account_register_select_gender">Pilih jenis kelamin</string>
+    <string name="account_register_select_gender_tips">Pendaftaran tidak dapat diubah setelah pendaftaran.</string>
+    <string name="account_register_next">Langkah Selanjutnya</string>
+    <string name="account_register_nice">Bagus</string>
+    <string name="account_register_complete_userinfo">Lanjutkan memperkaya gambar Anda</string>
+    <string name="account_register_take_photo">Ambil foto</string>
+    <string name="account_register_from_album">Pilih dari album</string>
+    <string name="account_register_use_default_avatar">Gunakan avatar default</string>
+    <string name="account_register_input_nickname_hint">Masukkan nama panggilan.</string>
+    <string name="account_register_input_birthday_hint">Masukkan tanggal lahir.</string>
+    <string name="account_register_nickname_is_null">Nama panggilan tidak boleh kosong. Silakan masukkan nama panggilan.</string>
+    <string name="account_register_go_home">Masukkan %s</string>
+    <string name="account_login_tips">Masuk dan mulai perjalanan eksklusif Anda</string>
 </resources>

module/account/src/main/res/values-zh/strings.xml

@@ -1,3 +1,46 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="account_auth_error">授权失败，请尝试其他登录方式或连接 VPN 重试</string>
+    <string name="account_user_agreement_tips">登录即表示您同意%1$s和%2$s的条款。</string>
+    <string name="account_privacy_policy">隐私政策</string>
+    <string name="account_service_terms">服务条款</string>
+    <string name="account_user_agreement_tips_new">登录即表示您同意</string>
+    <string name="account_fb">Facebook</string>
+    <string name="account_google">Google</string>
+    <string name="account_phone">手机</string>
+    <string name="account_kick_off">您的Gami账号已在其他设备上使用%1$s登录，如果并非您本人操作，请立即检查%2$s的账号是否被盗。</string>
+    <string name="account_token_expire">登录信息无效。请重新登录</string>
+    <string name="account_feedback">反馈</string>
+    <string name="account_banned">您的账号已被封禁</string>
+    <string name="account_register_limit">每个设备最多只能注册 3 个账号</string>
+    <string name="account_server_auth_failed">第三方授权失败，请重试</string>
+    <string name="account_server_op_failed">服务器操作失败，请重试</string>
+    <string name="account_server_exception">服务器错误，请重试</string>
+    <string name="account_login_common_failed">网络错误，请切换网络重试</string>
+    <string name="account_enter_your_phone">请输入您的手机号码</string>
+    <string name="account_sign_up_or_login">注册/登录</string>
+    <string name="account_login">登录</string>
+    <string name="account_enter_password_tip">请输入您的密码</string>
+    <string name="account_choose_country">选择[国家/地区]</string>
+    <string name="account_invalid_verify_code">验证码无效</string>
+    <string name="account_password_error">密码错误</string>
+    <string name="account_password_frequently_error">密码频繁出错，请稍候重试</string>
+    <string name="account_country_not_support">该国家/地区不受支持</string>
+    <string name="account_login_with_invalid_device_id">无法使用无效设备登录</string>
+    <string name="account_login_virtual_apk">无法使用多个应用程序登录</string>
+    <string name="account_copy_device_id_success">设备 ID 已复制到剪贴板</string>
+    <string name="account_copy_device_id_fail">获取设备 ID 失败</string>
+    <string name="account_register_select_gender">选择性别</string>
+    <string name="account_register_select_gender_tips">注册后无法修改。</string>
+    <string name="account_register_next">下一步</string>
+    <string name="account_register_nice">精美</string>
+    <string name="account_register_complete_userinfo">继续完善您的形象</string>
+    <string name="account_register_take_photo">拍照</string>
+    <string name="account_register_from_album">从相册中选择</string>
+    <string name="account_register_use_default_avatar">使用默认头像</string>
+    <string name="account_register_input_nickname_hint">请输入昵称。</string>
+    <string name="account_register_input_birthday_hint">请输入生日。</string>
+    <string name="account_register_nickname_is_null">昵称不能为空。请输入昵称。</string>
+    <string name="account_register_go_home">请输入%s</string>
+    <string name="account_login_tips">登录，开启您的专属旅程。</string>
 </resources>

module/account/src/main/res/values/no_translate_strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="account_cn_test" translatable="false">国内测试账号登录</string>
+    <string name="account_debug" translatable="false">Debug</string>
+    <string name="account_language" translatable="false">Language</string>
+    <string name="account_area_code" translatable="false">+%1$s</string>
+</resources>

module/account/src/main/res/values/strings.xml

@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-   <string name="account_login_app_name" translatable="false">YOKI</string>
    <string name="account_auth_error">Authorization failed, please try other login or connect vpn to retry</string>
    <string name="account_user_agreement_tips">Login means you agree %1$s and %2$s.</string>
    <string name="account_privacy_policy">Privacy Policy</string>
    <string name="account_service_terms">Terms of service</string>
-   <string name="account_child_policy">Child Safety policy</string>
-   <string name="account_electronic_visa">E Signature Agreement</string>
    <string name="account_user_agreement_tips_new">Login means you agree</string>
    <string name="account_fb">Facebook</string>
    <string name="account_google">Google</string>
    <string name="account_phone">Phone</string>
-   <string name="account_kick_off">Your Yoki account is logged in with %1$s on another device, if it is not your operation, please check whether the %2$s account is stolen immediately</string>
+   <string name="account_kick_off">Your Gami account is logged in with %1$s on another device, if it is not your operation, please check whether the %2$s account is stolen immediately</string>
    <string name="account_token_expire">Login information is invalid. Please login again</string>
    <string name="account_feedback">Feedback</string>
    <string name="account_banned">Your account is blocked</string>
@@ -20,15 +17,10 @@
    <string name="account_server_op_failed">Server operate failed, please retry</string>
    <string name="account_server_exception">Server error, please retry</string>
    <string name="account_login_common_failed">Network error, please switch network to retry</string>
-   <string name="account_cn_test" translatable="false">国内测试账号登录</string>
-   <string name="account_debug" translatable="false">Debug</string>
-   <string name="account_language" translatable="false">Language</string>
-   <string name="account_login_banned">Hello, your account has a %1$s violation, and you have been restricted from logging in for %2$s. You can click \"Confirm\" to appeal</string>
    <string name="account_enter_your_phone">Enter your number</string>
    <string name="account_sign_up_or_login">Sign up/Log in</string>
    <string name="account_login">Log in</string>
    <string name="account_enter_password_tip">Please enter your password by</string>
-   <string name="account_area_code" translatable="false">+%1$s</string>
    <string name="account_choose_country">Select [Country/Region]</string>
    <string name="account_invalid_verify_code">Verify code is invalid</string>
    <string name="account_password_error">Password error</string>
@@ -39,18 +31,17 @@
    <string name="account_login_virtual_apk">Can\'t login with multiple apps</string>
    <string name="account_copy_device_id_success">Device ID copied to clipboard</string>
    <string name="account_copy_device_id_fail">Failed to obtain device ID</string>
-   <string name="account_separator">,</string>
-   <string name="account_register_select_gender">选择你的性别</string>
-   <string name="account_register_select_gender_tips">注册成功后不可修改</string>
+   <string name="account_register_select_gender">Select gender</string>
+   <string name="account_register_select_gender_tips">Registration cannot be modified after registration.</string>
    <string name="account_register_next">Next Step</string>
    <string name="account_register_nice">Nice</string>
-   <string name="account_register_complete_userinfo">继续丰富你的形象</string>
-   <string name="account_register_take_photo">拍照</string>
-   <string name="account_register_from_album">从相册选择</string>
-   <string name="account_register_use_default_avatar">使用默认头像</string>
-   <string name="account_register_input_nickname_hint">请输入昵称</string>
-   <string name="account_register_input_birthday_hint">请输入生日</string>
-   <string name="account_register_nickname_is_null">昵称不能为空,请输入昵称</string>
-   <string name="account_register_go_home">进入%s</string>
+   <string name="account_register_complete_userinfo">Continue to enrich your image</string>
+   <string name="account_register_take_photo">Take photo</string>
+   <string name="account_register_from_album">Select from album</string>
+   <string name="account_register_use_default_avatar">Use default avatar</string>
+   <string name="account_register_input_nickname_hint">Enter nickname.</string>
+   <string name="account_register_input_birthday_hint">Enter birthday.</string>
+   <string name="account_register_nickname_is_null">The nickname cannot be empty. Please enter a nickname.</string>
+   <string name="account_register_go_home">Enter%s</string>
    <string name="account_login_tips">Login in embark on your exclusive journey</string>
 </resources>

module/im/src/main/res/values-in/strings.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <string name="im_session_list_title">Pesan</string>
+    <string name="im_open_notification_title">Buka notifikasi</string>
+    <string name="im_open_notification_title_desc">Terima informasi penting</string>
+    <string name="im_turn_on_notification">Aktifkan</string>
+    <string name="im_session_input_message">Silakan masukkan teks</string>
+    <string name="im_no_suport_message">Pesan tidak didukung</string>
+    <string name="im_audio_say_time_short">Pesan terlalu singkat</string>
+    <string name="im_mic_is_being_used_cant_record">Mikrofon sedang digunakan oleh fungsi lain, tidak dapat merekam.</string>
+    <string name="im_record_audio_failed">Perekaman audio gagal.</string>
+    <string name="im_sound_play_tip_for_voice_not_download">Berkas suara tidak tersedia diunduh.</string>
+    <string name="im_official_view_now">Lihat sekarang</string>
+    <string name="im_official_session_title">Pesan Sistem</string>
+    <string name="im_setting_mute">Jangan Ganggu</string>
+    <string name="im_setting_mark">Catatan</string>
+    <string name="im_setting_black">Tambahkan ke daftar hitam</string>
+    <string name="im_setting_report">Laporkan</string>
+    <string name="im_playmate_order_title">Pesanan Playmate</string>
 </resources>

module/im/src/main/res/values-zh/strings.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <string name="im_session_list_title">消息</string>
+    <string name="im_open_notification_title">打开通知</string>
+    <string name="im_open_notification_title_desc">接收重要信息</string>
+    <string name="im_turn_on_notification">开启</string>
+    <string name="im_session_input_message">请输入文本</string>
+    <string name="im_no_suport_message">不支持的消息</string>
+    <string name="im_audio_say_time_short">消息过短</string>
+    <string name="im_mic_is_being_used_cant_record">麦克风正在被其他功能使用，无法录音。</string>
+    <string name="im_record_audio_failed">录音失败。</string>
+    <string name="im_sound_play_tip_for_voice_not_download">语音文件未下载。</string>
+    <string name="im_official_view_now">立即查看</string>
+    <string name="im_official_session_title">系统消息</string>
+    <string name="im_setting_mute">消息免打扰</string>
+    <string name="im_setting_mark">备注</string>
+    <string name="im_setting_black">拉黑</string>
+    <string name="im_setting_report">举报</string>
+    <string name="im_playmate_order_title">陪玩订单</string>
 </resources>

module/im/src/main/res/values/strings.xml

@@ -12,9 +12,9 @@
     <string name="im_sound_play_tip_for_voice_not_download">Voice file not downloaded.</string>
     <string name="im_official_view_now">View now</string>
     <string name="im_official_session_title">System Message</string>
-    <string name="im_setting_mute">消息免打扰</string>
-    <string name="im_setting_mark">备注</string>
-    <string name="im_setting_black">拉黑</string>
-    <string name="im_setting_report">举报</string>
-    <string name="im_playmate_order_title">陪玩订单</string>
+    <string name="im_setting_mute">Don\'t Disturb</string>
+    <string name="im_setting_mark">Note</string>
+    <string name="im_setting_black">Add black list</string>
+    <string name="im_setting_report">Report</string>
+    <string name="im_playmate_order_title">Playmate Orders</string>
 </resources>

module/image/src/main/res/values-ar/strings.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-   <string name="image_save_success">تم الحفظ بنجاح</string>
-   <string name="image_video_save_storage_permission_no_granted">لم يتم منح إذن التخزين، ولا يمكن حفظ الفيديو. يرجى التوجه إلى [إعدادات النظام] لتمكينه.</string>
-   <string name="image_save_failed">فشل الحفظ، يرجى المحاولة مرة أخرى</string>
-   <string name="image_save_storage_permission_no_granted">لم يتم الحصول على إذن التخزين، ولا يمكن حفظ الصورة. افتحه في [إعدادات النظام].</string>
-</resources>

module/image/src/main/res/values-in/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="image_save_success">Penyimpanan berhasil</string>
+    <string name="image_save_storage_permission_no_granted">Izin penyimpanan tidak diperoleh, tidak dapat menyimpan gambar. Silakan buka [Pengaturan Sistem] untuk mengaktifkannya</string>
+    <string name="image_video_save_storage_permission_no_granted">Izin penyimpanan tidak diperoleh, tidak dapat menyimpan video. Silakan buka [Pengaturan Sistem] untuk mengaktifkannya</string>
+    <string name="image_save_failed">Penyimpanan gagal, silakan coba lagi</string>
+</resources>

module/image/src/main/res/values-zh/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-   <string name="image_save_success">Save successful</string>
-   <string name="image_video_save_storage_permission_no_granted">Storage permission not granted, unable to save video. Please enable it in [System Settings]</string>
-   <string name="image_save_failed">Save failed, please try again</string>
+   <string name="image_save_success">保存成功</string>
+   <string name="image_video_save_storage_permission_no_granted">存储权限未授予，无法保存视频。请在【系统设置】中启用存储权限。</string>
+   <string name="image_save_failed">保存失败，请重试。</string>
    <string name="image_save_storage_permission_no_granted">存储权限未获取，无法保存图片。到 [系统设置] 里去打开吧</string>
 </resources>

module/image/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-   <string name="image_save_success">保存成功</string>
-   <string name="image_save_storage_permission_no_granted">存储权限未获取，无法保存图片。到[系统设置]里去打开吧</string>
-   <string name="image_video_save_storage_permission_no_granted">存储权限未获取，无法保存视频。到[系统设置]里去打开吧</string>
-   <string name="image_save_failed">保存失败，请重试</string>
+   <string name="image_save_success">Save successful</string>
+   <string name="image_save_storage_permission_no_granted">Storage permission not obtained, unable to save image. Please go to [System Settings] to enable it</string>
+   <string name="image_video_save_storage_permission_no_granted">Storage permission not obtained, unable to save video. Please go to [System Settings] to enable it</string>
+   <string name="image_save_failed">Save failed, please try again</string>
 </resources>

module/order/src/main/res/values-in/strings.xml

@@ -1,3 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="order_list_title">Pesanan Saya</string>
+    <string name="order_btn_finish">Selesai</string>
+    <string name="order_btn_refund">Pengembalian Dana</string>
+    <string name="order_btn_evaluate">Evaluasi</string>
+    <string name="order_refunded_success">Jumlah yang dikembalikan ke dompet Anda</string>
+    <string name="order_detail_title">Pesanan Saya</string>
+    <string name="order_product_type">Jenis Produk</string>
+    <string name="order_buy_count">Kuantitas</string>
+    <string name="order_id">Nomor Pesanan</string>
+    <string name="order_time">Waktu Pembelian</string>
+    <string name="user_order_status_refund_under_review_desc">Pengembalian dana sedang ditinjau</string>
+    <string name="user_order_status_create_order_desc">Menunggu pemrosesan</string>
+    <string name="user_order_status_wait_accept_desc">Pesanan diterima</string>
+    <string name="user_order_status_accept_desc">Diterima</string>
+    <string name="user_order_status_in_service_desc">Layanan sedang berlangsung</string>
+    <string name="user_order_status_end_service_desc">Layanan selesai</string>
+    <string name="user_order_status_playmate_refuse_desc">Ditolak</string>
+    <string name="user_order_status_complete_desc">Selesai</string>
+    <string name="user_order_status_user_refund_desc">Pesanan diterima</string>
+    <string name="user_order_status_user_cancel_desc">Dibatalkan</string>
+    <string name="order_all_cost">Total [currency]%s</string>
+    <string name="order_evaluate_title">Apakah Anda puas dengan playmate ini?</string>
+    <string name="order_evaluate_left_title">Keseluruhan</string>
+    <string name="order_evaluate_right_title">Nilai</string>
+    <string name="playmate_order_title">Catatan Pesanan</string>
+    <string name="playmate_order_submit_evidence">Kirim kredensial</string>
+    <string name="playmate_order_accept">Terima</string>
+    <string name="playmate_order_start_service">Mulai layanan</string>
+    <string name="playmate_order_complete">Selesai</string>
 </resources>

module/order/src/main/res/values-zh/strings.xml

@@ -1,3 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="order_list_title">我的订单</string>
+    <string name="order_btn_finish">完成</string>
+    <string name="order_btn_refund">退款</string>
+    <string name="order_btn_evaluate">评价</string>
+    <string name="order_refunded_success">金额已退还至您的钱包</string>
+    <string name="order_detail_title">我的订单</string>
+    <string name="order_product_type">产品类型</string>
+    <string name="order_buy_count">购买数量</string>
+    <string name="order_id">订单编号</string>
+    <string name="order_time">购买时间</string>
+    <string name="user_order_status_refund_under_review_desc">退款审核中</string>
+    <string name="user_order_status_create_order_desc">等待处理</string>
+    <string name="user_order_status_wait_accept_desc">订单已接受</string>
+    <string name="user_order_status_accept_desc">已接受</string>
+    <string name="user_order_status_in_service_desc">服务中</string>
+    <string name="user_order_status_end_service_desc">服务完成</string>
+    <string name="user_order_status_playmate_refuse_desc">拒绝</string>
+    <string name="user_order_status_complete_desc">完成</string>
+    <string name="user_order_status_user_refund_desc">接单</string>
+    <string name="user_order_status_user_cancel_desc">取消</string>
+    <string name="order_all_cost">共计[currency]%s</string>
+    <string name="order_evaluate_title">您对陪玩师满意吗?</string>
+    <string name="order_evaluate_left_title">Overall</string>
+    <string name="order_evaluate_right_title">Rate</string>
+    <string name="playmate_order_title">接单记录</string>
+    <string name="playmate_order_submit_evidence">提交凭证</string>
+    <string name="playmate_order_accept">接受</string>
+    <string name="playmate_order_start_service">开始服务</string>
+    <string name="playmate_order_complete">完成</string>
 </resources>

module/order/src/main/res/values/strings.xml

@@ -1,35 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="order_list_title">我的订单</string>
-    <string name="order_btn_finish">完成</string>
-    <string name="order_btn_refund">退款</string>
-    <string name="order_btn_evaluate">评价</string>
-    <string name="order_refunded_success">金额已退还至您的钱包</string>
-    <string name="order_detail_title">我的订单</string>
-    <string name="order_product_type">产品类型</string>
-    <string name="order_buy_count">购买数量</string>
-    <string name="order_id">订单编号</string>
-    <string name="order_time">购买时间</string>
-
-    <string name="user_order_status_refund_under_review_desc">退款审核中</string>
-    <string name="user_order_status_create_order_desc">等待处理</string>
-    <string name="user_order_status_wait_accept_desc">订单已接受</string>
-    <string name="user_order_status_accept_desc">已接受</string>
-    <string name="user_order_status_in_service_desc">服务中</string>
-    <string name="user_order_status_end_service_desc">服务完成</string>
-    <string name="user_order_status_playmate_refuse_desc">拒绝</string>
-    <string name="user_order_status_complete_desc">完成</string>
-    <string name="user_order_status_user_refund_desc">接单</string>
-    <string name="user_order_status_user_cancel_desc">取消</string>
-
-    <string name="order_all_cost">共计[currency]%s</string>
-    <string name="order_evaluate_title">您对陪玩师满意吗?</string>
+    <string name="order_list_title">My Orders</string>
+    <string name="order_btn_finish">Completed</string>
+    <string name="order_btn_refund">Refund</string>
+    <string name="order_btn_evaluate">Evaluation</string>
+    <string name="order_refunded_success">Amount refunded to your wallet</string>
+    <string name="order_detail_title">My Orders</string>
+    <string name="order_product_type">Product Type</string>
+    <string name="order_buy_count">Quantity</string>
+    <string name="order_id">Order Number</string>
+    <string name="order_time">Purchase Time</string>
+    <string name="user_order_status_refund_under_review_desc">Refund under review</string>
+    <string name="user_order_status_create_order_desc">Pending processing</string>
+    <string name="user_order_status_wait_accept_desc">Order accepted</string>
+    <string name="user_order_status_accept_desc">Accepted</string>
+    <string name="user_order_status_in_service_desc">Service in progress</string>
+    <string name="user_order_status_end_service_desc">Service completed</string>
+    <string name="user_order_status_playmate_refuse_desc">Rejected</string>
+    <string name="user_order_status_complete_desc">Completed</string>
+    <string name="user_order_status_user_refund_desc">Order accepted</string>
+    <string name="user_order_status_user_cancel_desc">Cancelled</string>
+    <string name="order_all_cost">Total [currency]%s</string>
+    <string name="order_evaluate_title">Are you satisfied with the playmate?</string>
     <string name="order_evaluate_left_title">Overall</string>
     <string name="order_evaluate_right_title">Rate</string>
-
-    <string name="playmate_order_title">接单记录</string>
-    <string name="playmate_order_submit_evidence">提交凭证</string>
-    <string name="playmate_order_accept">接受</string>
-    <string name="playmate_order_start_service">开始服务</string>
-    <string name="playmate_order_complete">完成</string>
+    <string name="playmate_order_title">Order record</string>
+    <string name="playmate_order_submit_evidence">Submit credentials</string>
+    <string name="playmate_order_accept">Accept</string>
+    <string name="playmate_order_start_service">Start service</string>
+    <string name="playmate_order_complete">Complete</string>
 </resources>

module/playmate/src/main/res/layout/layout_playmate_home_list_filter.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -76,25 +77,34 @@
         android:layout_height="36dp"
         android:background="@drawable/find_partner_button_bg"
         android:paddingHorizontal="12dp"
+        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1"
+        app:layout_constraintStart_toEndOf="@id/cl_price_filter"
         app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/tv_find_partner"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:ellipsize="end"
             android:includeFontPadding="false"
+            android:singleLine="true"
             android:text="@string/common_find_your_partner"
             android:textColor="@color/color_FF4E5969"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@id/iv_find_partner_go"
+            app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/iv_find_partner_go"
             android:layout_width="14dp"
             android:layout_height="14dp"
             app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@id/tv_find_partner"
             app:layout_constraintTop_toTopOf="parent"
             app:srcCompat="@drawable/common_find_your_partner_ic" />

module/playmate/src/main/res/values-in/strings.xml

@@ -1,3 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="playmate_find_partner_title">Temukan pasangan Anda</string>
+    <string name="playmate_find_partner_reset">Reset</string>
+    <string name="playmate_find_partner_submit">Konfirmasi</string>
+    <string name="playmate_find_partner_option_unlimited">Tidak terbatas</string>
+    <string name="playmate_find_partner_option_male">Pria</string>
+    <string name="playmate_find_partner_option_female">Wanita</string>
+    <string name="playmate_find_partner_option_age_15_25">15–25</string>
+    <string name="playmate_find_partner_option_age_25_35">25–35</string>
+    <string name="playmate_find_partner_option_age_35">Di atas 35</string>
+    <string name="playmate_find_partner_option_evaluate_high_low">tinggi ke rendah</string>
+    <string name="playmate_find_partner_option_evaluate_low_high">rendah ke tinggi</string>
+    <string name="playmate_find_partner_option_price_0_1000">0–1000</string>
+    <string name="playmate_find_partner_option_price_1000_1500">10000–1500</string>
+    <string name="playmate_find_partner_option_price_1500_2500">1500–2500</string>
+    <string name="playmate_find_partner_option_price_2500_5000">2500–5000</string>
+    <string name="playmate_find_partner_option_price_5000">Lebih dari 5000</string>
+    <string name="playmate_comment_count">(%s Ulasan)</string>
+    <string name="playmate_detail_comment_expand">perluas</string>
+    <string name="playmate_detail_comment_count">Ulasan Pengguna %s</string>
+    <string name="playmate_all_comment">Semua Ulasan</string>
 </resources>

module/playmate/src/main/res/values-zh/strings.xml

@@ -1,3 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="playmate_find_partner_title">找陪玩</string>
+    <string name="playmate_find_partner_reset">重置</string>
+    <string name="playmate_find_partner_submit">确认</string>
+    <string name="playmate_find_partner_option_unlimited">无限</string>
+    <string name="playmate_find_partner_option_male">男</string>
+    <string name="playmate_find_partner_option_female">女</string>
+    <string name="playmate_find_partner_option_age_15_25">15–25</string>
+    <string name="playmate_find_partner_option_age_25_35">25–35</string>
+    <string name="playmate_find_partner_option_age_35">35岁以上</string>
+    <string name="playmate_find_partner_option_evaluate_high_low">高到低</string>
+    <string name="playmate_find_partner_option_evaluate_low_high">从低到高</string>
+    <string name="playmate_find_partner_option_price_0_1000">0–1000</string>
+    <string name="playmate_find_partner_option_price_1000_1500">10000–1500</string>
+    <string name="playmate_find_partner_option_price_1500_2500">1500–2500</string>
+    <string name="playmate_find_partner_option_price_2500_5000">2500–5000</string>
+    <string name="playmate_find_partner_option_price_5000">5000以上</string>
+    <string name="playmate_comment_count">(%s评价)</string>
+    <string name="playmate_detail_comment_expand">展开</string>
+    <string name="playmate_detail_comment_count">用户评价 %s</string>
+    <string name="playmate_all_comment">所有评价</string>
 </resources>

module/playmate/src/main/res/values/no_translate_strings.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="playmate_find_partner_option_location_jakarta" translatable="false">Jakarta</string>
+    <string name="playmate_find_partner_option_location_timur" translatable="false">Timur</string>
+    <string name="playmate_find_partner_option_location_barat" translatable="false">Barat</string>
+    <string name="playmate_find_partner_option_location_pasut" translatable="false">Pasut</string>
+    <string name="playmate_find_partner_option_location_utare" translatable="false">Utare</string>
+    <string name="playmate_find_partner_option_location_selatan" translatable="false">Selatan</string>
+    <string name="playmate_find_partner_option_location_seribu" translatable="false">Seribu</string>
+    <string name="playmate_find_partner_option_location_kepulanuan" translatable="false">Kepulanuan</string>
+</resources>

module/playmate/src/main/res/values/strings.xml

@@ -8,29 +8,16 @@
     <string name="playmate_find_partner_option_female">Female</string>
     <string name="playmate_find_partner_option_age_15_25">15–25</string>
     <string name="playmate_find_partner_option_age_25_35">25–35</string>
-    <string name="playmate_find_partner_option_age_35">35以上</string>
-
-    <string name="playmate_find_partner_option_location_jakarta">Jakarta</string>
-    <string name="playmate_find_partner_option_location_timur">Timur</string>
-    <string name="playmate_find_partner_option_location_barat">Barat</string>
-    <string name="playmate_find_partner_option_location_pasut">Pasut</string>
-    <string name="playmate_find_partner_option_location_utare">Utare</string>
-    <string name="playmate_find_partner_option_location_selatan">Selatan</string>
-    <string name="playmate_find_partner_option_location_seribu">Seribu</string>
-    <string name="playmate_find_partner_option_location_kepulanuan">Kepulanuan</string>
-
+    <string name="playmate_find_partner_option_age_35">Over 35</string>
     <string name="playmate_find_partner_option_evaluate_high_low">high to low</string>
     <string name="playmate_find_partner_option_evaluate_low_high">low to high</string>
-
     <string name="playmate_find_partner_option_price_0_1000">0–1000</string>
     <string name="playmate_find_partner_option_price_1000_1500">10000–1500</string>
     <string name="playmate_find_partner_option_price_1500_2500">1500–2500</string>
     <string name="playmate_find_partner_option_price_2500_5000">2500–5000</string>
-    <string name="playmate_find_partner_option_price_5000">5000以上</string>
-
-    <string name="playmate_comment_count">(%s评价)</string>
-    <string name="playmate_detail_comment_expand">展开</string>
-    <string name="playmate_detail_comment_count">用户评价 %s</string>
-    <string name="playmate_all_comment">所有评价</string>
-
+    <string name="playmate_find_partner_option_price_5000">Over 5000</string>
+    <string name="playmate_comment_count">(%s Reviews)</string>
+    <string name="playmate_detail_comment_expand">expand</string>
+    <string name="playmate_detail_comment_count">User Reviews %s</string>
+    <string name="playmate_all_comment">All Reviews</string>
 </resources>

module/profile/src/main/res/values-in/strings.xml

@@ -1,3 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="profile_tab_profile">Tentang</string>
+    <string name="profile_tab_photo_wall">Dinding Foto</string>
+    <string name="profile_pay_with_her">Pesan</string>
+    <string name="profile_information">Informasi</string>
+    <string name="profile_skill">Keahlian</string>
+    <string name="profile_evaluate_title">Afinitas</string>
+    <string name="profile_go_profile"><![CDATA[Halaman Pribadi >]]></string>
+    <string name="profile_go_order"><![CDATA[Pesan >]]></string>
+    <string name="profile_generate_qr_code">Buat kode QR [IMG]</string>
+    <string name="profile_share_with_friends">Bagikan dengan teman [IMG]</string>
+    <string name="profile_me_share_your_qrcode">Bagikan Kode QR Anda</string>
+    <string name="profile_wallet">Dompet Saya</string>
+    <string name="profile_order">Pesanan Saya</string>
+    <string name="profile_playmate_order">Catatan Pesanan</string>
+    <string name="profile_order_pay_list">Pembayaran Tertunda</string>
+    <string name="profile_order_finish_list">Selesai</string>
+    <string name="profile_order_refund_list">Pengembalian Dana</string>
+    <string name="profile_order_all_list">Semua Pesanan</string>
+    <string name="profile_edit_title">Edit Profil</string>
+    <string name="profile_edit_nickname">Nama Panggilan</string>
+    <string name="profile_edit_gender">Jenis Kelamin</string>
+    <string name="profile_edit_age">Usia</string>
+    <string name="toast_profile_edit_name_empty">Nama pengguna tidak boleh kosong</string>
+    <string name="toast_profile_edit_age_empty">Usia tidak boleh kosong</string>
+    <string name="toast_profile_edit_age_invalid">Usia tidak valid</string>
+    <string name="profile_edit_avatar_upload_fail">Pembaruan avatar gagal</string>
+    <string name="profile_search_hint">Silakan masukkan kata kunci pencarian</string>
+    <string name="profile_search_history">Riwayat</string>
+    <string name="profile_search_contact">Kontak</string>
+    <string name="profile_search_user_fans">Penggemar %s</string>
+    <string name="profile_me_homepage_label">Beranda</string>
+    <string name="profile_me_follower">Pengikut</string>
+    <string name="profile_me_fans">Penggemar</string>
+    <string name="profile_me_function_center">Pusat Fungsi</string>
+    <string name="profile_edit_photo_wall_title">Dinding Foto (%1$s/%2$s)</string>
+    <string name="profile_edit_photo_wall_desc">Disarankan untuk mengunggah foto yang jelas foto untuk tampilan komprehensif gambar Anda</string>
+    <string name="profile_edit_photo_wall_tips_1">Catatan Perjalanan Saya</string>
+    <string name="profile_edit_photo_wall_tips_2">Selfie Lucu Saya</string>
+    <string name="profile_edit_photo_wall_tips_3">Kehidupan Sehari-hari Saya</string>
+    <string name="profile_edit_photo_wall_tips_4">Bakat Unik</string>
+    <string name="profile_edit_photo_wall_tips_5">Bakat Unik</string>
+    <string name="profile_edit_photo_wall_tips_6">Sudut Favorit Saya</string>
+    <string name="profile_edit_photo_wall_tips_7">Olahraga Favorit Saya</string>
+    <string name="profile_edit_photo_wall_tips_8">Hal Favorit yang Saya Lakukan</string>
+    <string name="profile_edit_photo_wall_tips_9">Pakaian Favorit Saya</string>
+    <string name="profile_edit_person_info">Informasi Pribadi</string>
+    <string name="profile_edit_person_nickname">Nama Panggilan</string>
+    <string name="profile_edit_person_nickname_limit">Jumlah karakter maksimum: %s</string>
+    <string name="profile_edit_person_gender">Jenis Kelamin</string>
+    <string name="profile_edit_person_birthday">Tanggal Lahir</string>
+    <string name="profile_edit_person_intro">Tanda Tangan Pribadi</string>
+    <string name="profile_edit_person_intro_desc">Apa yang ingin Anda sampaikan kepada teman-teman Anda?</string>
+    <string name="profile_edit_person_interest">Minat</string>
+    <string name="profile_edit_person_interest_desc">Beri tahu lebih banyak teman tentang Anda</string>
+    <string name="profile_edit_talent">Pameran Bakat</string>
+    <string name="profile_edit_talent_voice">Suara</string>
+    <string name="profile_edit_talent_voice_desc">Perkenalkan diri Anda dengan suara Anda</string>
+    <string name="profile_edit_nickname_empty">Nama panggilan tidak boleh kosong</string>
+    <string name="profile_edit_talent_voice_title">Atur suara Anda</string>
+    <string name="profile_edit_talent_voice_record">Klik untuk memulai perekaman</string>
+    <string name="profile_edit_talent_voice_stop">Klik untuk menghentikan perekaman</string>
+    <string name="profile_edit_talent_voice_re_record">Rekam ulang</string>
+    <string name="profile_edit_talent_voice_preview">Pratinjau</string>
+    <string name="profile_edit_talent_voice_delete_record">Hapus dan rekam ulang</string>
+    <string name="profile_follow_list_title">%s Diikuti</string>
+    <string name="profile_fans_list_title">%s Penggemar</string>
+    <string name="profile_playamte_charm_star">Berikan kesan yang baik</string>
 </resources>

module/profile/src/main/res/values-zh/strings.xml

@@ -1,3 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="profile_tab_profile">关于</string>
+    <string name="profile_tab_photo_wall">照片墙</string>
+    <string name="profile_pay_with_her">下单</string>
+    <string name="profile_information">信息</string>
+    <string name="profile_skill">技能</string>
+    <string name="profile_evaluate_title">你对Ta的好感度</string>
+    <string name="profile_go_profile"><![CDATA[个人页 >]]></string>
+    <string name="profile_go_order"><![CDATA[Order >]]></string>
+    <string name="profile_generate_qr_code">生成二维码 [IMG]</string>
+    <string name="profile_share_with_friends">分享给朋友 [IMG]</string>
+    <string name="profile_me_share_your_qrcode">分享你的二维码</string>
+    <string name="profile_wallet">我的钱包</string>
+    <string name="profile_order">我的订单</string>
+    <string name="profile_playmate_order">接单记录</string>
+    <string name="profile_order_pay_list">待付款</string>
+    <string name="profile_order_finish_list">已经完成</string>
+    <string name="profile_order_refund_list">退款</string>
+    <string name="profile_order_all_list">全部订单</string>
+    <string name="profile_edit_title">编辑资料</string>
+    <string name="profile_edit_nickname">昵称</string>
+    <string name="profile_edit_gender">性别</string>
+    <string name="profile_edit_age">年龄</string>
+    <string name="toast_profile_edit_name_empty">用户名不能为空</string>
+    <string name="toast_profile_edit_age_empty">年龄不能为空</string>
+    <string name="toast_profile_edit_age_invalid">年龄输入不合法,请输入0–99以内的数字</string>
+    <string name="profile_edit_avatar_upload_fail">头像更新失败</string>
+    <string name="profile_search_hint">请输入检索关键字</string>
+    <string name="profile_search_history">历史</string>
+    <string name="profile_search_contact">联系人</string>
+    <string name="profile_search_user_fans">粉丝数 %s</string>
+    <string name="profile_me_homepage_label">主页</string>
+    <string name="profile_me_follower">关注</string>
+    <string name="profile_me_fans">粉丝</string>
+    <string name="profile_me_function_center">功能中心</string>
+    <string name="profile_edit_photo_wall_title">照片墙(%1$s/%2$s)</string>
+    <string name="profile_edit_photo_wall_desc">建议上传清晰的照片,便于全方位展示形象</string>
+    <string name="profile_edit_photo_wall_tips_1">我的旅行日志</string>
+    <string name="profile_edit_photo_wall_tips_2">我的有趣自拍</string>
+    <string name="profile_edit_photo_wall_tips_3">我的日常生活</string>
+    <string name="profile_edit_photo_wall_tips_4">独一无二的才艺</string>
+    <string name="profile_edit_photo_wall_tips_5">独一无二的才艺</string>
+    <string name="profile_edit_photo_wall_tips_6">我最买的角度</string>
+    <string name="profile_edit_photo_wall_tips_7">我热爱的运动</string>
+    <string name="profile_edit_photo_wall_tips_8">我最喜欢做的事</string>
+    <string name="profile_edit_photo_wall_tips_9">我喜欢的穿搭</string>
+    <string name="profile_edit_person_info">个人信息</string>
+    <string name="profile_edit_person_nickname">昵称</string>
+    <string name="profile_edit_person_nickname_limit">最多可输入%s个字符</string>
+    <string name="profile_edit_person_gender">性别</string>
+    <string name="profile_edit_person_birthday">出生日期</string>
+    <string name="profile_edit_person_intro">个性签名</string>
+    <string name="profile_edit_person_intro_desc">有什么想说给朋友听</string>
+    <string name="profile_edit_person_interest">兴趣</string>
+    <string name="profile_edit_person_interest_desc">让更多朋友了解你</string>
+    <string name="profile_edit_talent">才艺展示</string>
+    <string name="profile_edit_talent_voice">声音</string>
+    <string name="profile_edit_talent_voice_desc">用声音介绍你自己</string>
+    <string name="profile_edit_nickname_empty">昵称不能为空</string>
+    <string name="profile_edit_talent_voice_title">设置声音</string>
+    <string name="profile_edit_talent_voice_record">点击开始录音</string>
+    <string name="profile_edit_talent_voice_stop">点击结束录音</string>
+    <string name="profile_edit_talent_voice_re_record">重录</string>
+    <string name="profile_edit_talent_voice_preview">试听</string>
+    <string name="profile_edit_talent_voice_delete_record">删除并重新录制</string>
+    <string name="profile_follow_list_title">%s 关注</string>
+    <string name="profile_fans_list_title">%s 粉丝</string>
+    <string name="profile_playamte_charm_star">给好感度</string>
 </resources>

module/profile/src/main/res/values/strings.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="profile_tab_profile">About Her</string>
+    <string name="profile_tab_profile">About</string>
     <string name="profile_tab_photo_wall">Photo Wall</string>
-    <string name="profile_pay_with_her">Pay with her</string>
+    <string name="profile_pay_with_her">Order</string>
     <string name="profile_information">Information</string>
     <string name="profile_skill">Skill</string>
-    <string name="profile_evaluate_title">你对Ta的好感度</string>
-    <string name="profile_go_profile"><![CDATA[个人页 >]]></string>
+    <string name="profile_evaluate_title">Affinity</string>
+    <string name="profile_go_profile"><![CDATA[Personal Page >]]></string>
     <string name="profile_go_order"><![CDATA[Order >]]></string>
     <string name="profile_generate_qr_code">Generate QR code [IMG]</string>
     <string name="profile_share_with_friends">Share with friends [IMG]</string>
@@ -14,57 +14,57 @@
     <string name="profile_wallet">My Wallet</string>
     <string name="profile_order">My Order</string>
     <string name="profile_playmate_order">Order Record</string>
-    <string name="profile_order_pay_list">待付款</string>
-    <string name="profile_order_finish_list">已经完成</string>
-    <string name="profile_order_refund_list">退款</string>
-    <string name="profile_order_all_list">全部订单</string>
-    <string name="profile_edit_title">编辑资料</string>
-    <string name="profile_edit_nickname">昵称</string>
-    <string name="profile_edit_gender">性别</string>
-    <string name="profile_edit_age">年龄</string>
-    <string name="toast_profile_edit_name_empty">用户名不能为空</string>
-    <string name="toast_profile_edit_age_empty">年龄不能为空</string>
-    <string name="toast_profile_edit_age_invalid">年龄输入不合法,请输入0–99以内的数字</string>
-    <string name="profile_edit_avatar_upload_fail">头像更新失败</string>
+    <string name="profile_order_pay_list">Payment Pending</string>
+    <string name="profile_order_finish_list">Completed</string>
+    <string name="profile_order_refund_list">Refund</string>
+    <string name="profile_order_all_list">All Orders</string>
+    <string name="profile_edit_title">Edit Profile</string>
+    <string name="profile_edit_nickname">Nickname</string>
+    <string name="profile_edit_gender">Gender</string>
+    <string name="profile_edit_age">Age</string>
+    <string name="toast_profile_edit_name_empty">Username cannot be empty</string>
+    <string name="toast_profile_edit_age_empty">Age cannot be empty</string>
+    <string name="toast_profile_edit_age_invalid">Invalid age input, please enter a number between 0 and 99</string>
+    <string name="profile_edit_avatar_upload_fail">Avatar update failed</string>
     <string name="profile_search_hint">Please enter search keywords</string>
     <string name="profile_search_history">History</string>
-    <string name="profile_search_contact">联系人</string>
-    <string name="profile_search_user_fans">粉丝数 %s</string>
+    <string name="profile_search_contact">Contact</string>
+    <string name="profile_search_user_fans">Fans %s</string>
     <string name="profile_me_homepage_label">Homepage</string>
     <string name="profile_me_follower">Follower</string>
     <string name="profile_me_fans">Fans</string>
     <string name="profile_me_function_center">Function Center</string>
-    <string name="profile_edit_photo_wall_title">照片墙(%1$s/%2$s)</string>
-    <string name="profile_edit_photo_wall_desc">建议上传清晰的照片,便于全方位展示形象</string>
-    <string name="profile_edit_photo_wall_tips_1">我的旅行日志</string>
-    <string name="profile_edit_photo_wall_tips_2">我的有趣自拍</string>
-    <string name="profile_edit_photo_wall_tips_3">我的日常生活</string>
-    <string name="profile_edit_photo_wall_tips_4">独一无二的才艺</string>
-    <string name="profile_edit_photo_wall_tips_5">独一无二的才艺</string>
-    <string name="profile_edit_photo_wall_tips_6">我最买的角度</string>
-    <string name="profile_edit_photo_wall_tips_7">我热爱的运动</string>
-    <string name="profile_edit_photo_wall_tips_8">我最喜欢做的事</string>
-    <string name="profile_edit_photo_wall_tips_9">我喜欢的穿搭</string>
-    <string name="profile_edit_person_info">个人信息</string>
-    <string name="profile_edit_person_nickname">昵称</string>
-    <string name="profile_edit_person_nickname_limit">最多可输入%s个字符</string>
-    <string name="profile_edit_person_gender">性别</string>
-    <string name="profile_edit_person_birthday">出生日期</string>
-    <string name="profile_edit_person_intro">个性签名</string>
-    <string name="profile_edit_person_intro_desc">有什么想说给朋友听</string>
-    <string name="profile_edit_person_interest">兴趣</string>
-    <string name="profile_edit_person_interest_desc">让更多朋友了解你</string>
-    <string name="profile_edit_talent">才艺展示</string>
-    <string name="profile_edit_talent_voice">声音</string>
-    <string name="profile_edit_talent_voice_desc">用声音介绍你自己</string>
-    <string name="profile_edit_nickname_empty">昵称不能为空</string>
-    <string name="profile_edit_talent_voice_title">设置声音</string>
-    <string name="profile_edit_talent_voice_record">点击开始录音</string>
-    <string name="profile_edit_talent_voice_stop">点击结束录音</string>
-    <string name="profile_edit_talent_voice_re_record">重录</string>
-    <string name="profile_edit_talent_voice_preview">试听</string>
-    <string name="profile_edit_talent_voice_delete_record">删除并重新录制</string>
+    <string name="profile_edit_photo_wall_title">Photo Wall (%1$s/%2$s)</string>
+    <string name="profile_edit_photo_wall_desc">It is recommended to upload clear photos for a comprehensive view of your image</string>
+    <string name="profile_edit_photo_wall_tips_1">My Travel Log</string>
+    <string name="profile_edit_photo_wall_tips_2">My Funny Selfies</string>
+    <string name="profile_edit_photo_wall_tips_3">My Daily Life</string>
+    <string name="profile_edit_photo_wall_tips_4">Unique Talents</string>
+    <string name="profile_edit_photo_wall_tips_5">Unique Talents</string>
+    <string name="profile_edit_photo_wall_tips_6">My Favorite Angles</string>
+    <string name="profile_edit_photo_wall_tips_7">My Favorite Sport</string>
+    <string name="profile_edit_photo_wall_tips_8">My Favorite Things to Do</string>
+    <string name="profile_edit_photo_wall_tips_9">My Favorite Outfits</string>
+    <string name="profile_edit_person_info">Personal Information</string>
+    <string name="profile_edit_person_nickname">Nickname</string>
+    <string name="profile_edit_person_nickname_limit">Maximum number of characters: %s</string>
+    <string name="profile_edit_person_gender">Gender</string>
+    <string name="profile_edit_person_birthday">Date of Birth</string>
+    <string name="profile_edit_person_intro">Personal Signature</string>
+    <string name="profile_edit_person_intro_desc">What do you want to say to your friends?</string>
+    <string name="profile_edit_person_interest">Interests</string>
+    <string name="profile_edit_person_interest_desc">Let more friends know about you</string>
+    <string name="profile_edit_talent">Talent Showcase</string>
+    <string name="profile_edit_talent_voice">Voice</string>
+    <string name="profile_edit_talent_voice_desc">Introduce yourself with your voice</string>
+    <string name="profile_edit_nickname_empty">Nickname cannot be empty</string>
+    <string name="profile_edit_talent_voice_title">Set your voice</string>
+    <string name="profile_edit_talent_voice_record">Click to start recording</string>
+    <string name="profile_edit_talent_voice_stop">Click to stop recording</string>
+    <string name="profile_edit_talent_voice_re_record">Re-record</string>
+    <string name="profile_edit_talent_voice_preview">Preview</string>
+    <string name="profile_edit_talent_voice_delete_record">Delete and re-record</string>
     <string name="profile_follow_list_title">%s Followed</string>
     <string name="profile_fans_list_title">%s Fans</string>
-    <string name="profile_playamte_charm_star">给好感度</string>
+    <string name="profile_playamte_charm_star">Give a good impression</string>
 </resources>

module/setting/src/main/res/values-in/strings.xml

@@ -1,3 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="setting_language">Bahasa</string>
+    <string name="setting_clear_cache">Bersihkan cache</string>
+    <string name="setting_about">Tentang %s</string>
+    <string name="setting_logout">Keluar</string>
+    <string name="setting_privacy_policy">Kebijakan privasi</string>
+    <string name="setting_terms_service">Ketentuan Layanan</string>
+    <string name="setting_community_covenant">Perjanjian Komunitas</string>
+    <string name="setting_version_update">Pembaruan versi</string>
+    <string name="setting_help_input_title">Silakan berikan deskripsi masalah yang Anda butuhkan umpan baliknya, kami akan menanganinya sesegera mungkin!</string>
+    <string name="setting_help_input_desc">Silakan masukkan</string>
+    <string name="setting_help_picture_title">Bukti gambar (hingga 9 gambar)</string>
+    <string name="setting_help_picture_desc">Unggah gambar untuk menampilkan bukti Anda</string>
+    <string name="setting_clear_cache_confirm_title">Bersihkan Cache</string>
+    <string name="setting_clear_cache_confirm_desc">Permintaan untuk Membersihkan Cache</string>
+    <string name="setting_logout_confirm_title">Keluar?</string>
+    <string name="setting_report_content">Silakan isi konten laporan terperinci</string>
+    <string name="setting_report_evidence">Bukti gambar (maksimum 6 gambar)</string>
+    <string name="setting_report_evidence_desc">Unggah gambar untuk menampilkan bukti Anda</string>
+    <string name="setting_report_submit_success">Anda telah mengirimkan laporan. Tim resmi akan memverifikasi situasi dan melanjutkan sesuai dengan prosedur</string>
 </resources>

module/setting/src/main/res/values-zh/strings.xml

@@ -1,3 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="setting_language">语言</string>
+    <string name="setting_clear_cache">清理缓存</string>
+    <string name="setting_about">关于 %s</string>
+    <string name="setting_logout">登出</string>
+    <string name="setting_privacy_policy">隐私协议</string>
+    <string name="setting_terms_service">服务协议</string>
+    <string name="setting_community_covenant">社区约定</string>
+    <string name="setting_version_update">版本更新</string>
+    <string name="setting_help_input_title">请留下您需要反馈的问题描述，我们会尽快处理！</string>
+    <string name="setting_help_input_desc">请输入</string>
+    <string name="setting_help_picture_title">图片证据(最多9张)</string>
+    <string name="setting_help_picture_desc">上传图片以展示您的证据</string>
+    <string name="setting_clear_cache_confirm_title">清理缓存</string>
+    <string name="setting_clear_cache_confirm_desc">清理缓存提示词</string>
+    <string name="setting_logout_confirm_title">是否退出登录?</string>
+    <string name="setting_report_content">请填写详细的举报内容</string>
+    <string name="setting_report_evidence">图片证明(最多6张)</string>
+    <string name="setting_report_evidence_desc">上传图片显示你的证据</string>
+    <string name="setting_report_submit_success">您已提交举报,待官方核实情况后会周青进行</string>
 </resources>

module/setting/src/main/res/values/strings.xml

@@ -4,22 +4,19 @@
     <string name="setting_clear_cache">Clear cache</string>
     <string name="setting_about">About %s</string>
     <string name="setting_logout">Logout</string>
-
     <string name="setting_privacy_policy">Privacy policy</string>
     <string name="setting_terms_service">Terms of Service</string>
     <string name="setting_community_covenant">Community Covenant</string>
     <string name="setting_version_update">Version update</string>
-
     <string name="setting_help_input_title">Please leave a description of the issue you need feedback on，we will handle it as soon as possible!</string>
     <string name="setting_help_input_desc">Please enter</string>
     <string name="setting_help_picture_title">Picture proof (up to 9 images)</string>
     <string name="setting_help_picture_desc">Upload a picture to display your evidence</string>
-    <string name="setting_clear_cache_confirm_title">清理缓存</string>
-    <string name="setting_clear_cache_confirm_desc">清理缓存提示词</string>
-    <string name="setting_logout_confirm_title">是否退出登录?</string>
-    <string name="setting_report_content">请填写详细的举报内容</string>
-    <string name="setting_report_evidence">图片证明(最多6张)</string>
-    <string name="setting_report_evidence_desc">上传图片显示你的证据</string>
-    <string name="setting_report_submit_success">您已提交举报,待官方核实情况后会周青进行</string>
-
+    <string name="setting_clear_cache_confirm_title">Clear Cache</string>
+    <string name="setting_clear_cache_confirm_desc">Clear Cache Prompt</string>
+    <string name="setting_logout_confirm_title">Logout?</string>
+    <string name="setting_report_content">Please fill in the detailed report content</string>
+    <string name="setting_report_evidence">Image proof (maximum 6 images)</string>
+    <string name="setting_report_evidence_desc">Upload images to display your evidence</string>
+    <string name="setting_report_submit_success">You have submitted a report. The official team will verify the situation and proceed accordingly</string>
 </resources>

module/share/src/main/res/values-in/strings.xml

@@ -1,3 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="share_save_image">Simpan gambar</string>
+    <string name="share_copy_link">Salin tautan</string>
+    <string name="share_input_price">Jumlah layanan</string>
+    <string name="share_special_time">Waktu (dalam jam)</string>
+    <string name="share_generate_qr_code">Buat kode QR</string>
+    <string name="share_common_qr_code">Kode umum</string>
+    <string name="share_common_special_code">Kode khusus</string>
+    <string name="share_friend_title">Buat poster pribadi Anda</string>
+    <string name="share_share_poster">Bagikan poster</string>
+    <string name="share_share_poster_game_title">Pindai kode untuk bermain dengan saya</string>
+    <string name="share_save_poster_success">Poster telah disimpan ke album Anda</string>
+    <string name="share_save_poster_fail">Pembuatan poster gagal, silakan coba lagi</string>
 </resources>

module/share/src/main/res/values-zh/strings.xml

@@ -1,3 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="share_save_image">保存图片</string>
+    <string name="share_copy_link">复制链接</string>
+    <string name="share_input_price">输入服务金额</string>
+    <string name="share_special_time">时间(小时)</string>
+    <string name="share_generate_qr_code">生成二维码</string>
+    <string name="share_common_qr_code">通用码</string>
+    <string name="share_common_special_code">特定码</string>
+    <string name="share_friend_title">生成你的专属海报</string>
+    <string name="share_share_poster">分享海报</string>
+    <string name="share_share_poster_game_title">扫码跟我一起玩</string>
+    <string name="share_save_poster_success">海报已保存到相册</string>
+    <string name="share_save_poster_fail">海报生成失败,请重试</string>
 </resources>

module/share/src/main/res/values/strings.xml

@@ -2,14 +2,14 @@
 <resources>
     <string name="share_save_image">Save image</string>
     <string name="share_copy_link">Copy link</string>
-    <string name="share_input_price">输入服务金额</string>
+    <string name="share_input_price">Service amount</string>
     <string name="share_special_time">Time(in hours)</string>
-    <string name="share_generate_qr_code">生成二维码</string>
-    <string name="share_common_qr_code">通用码</string>
-    <string name="share_common_special_code">特定码</string>
-    <string name="share_friend_title">生成你的专属海报</string>
-    <string name="share_share_poster">分享海报</string>
-    <string name="share_share_poster_game_title">扫码跟我一起玩</string>
-    <string name="share_save_poster_success">海报已保存到相册</string>
-    <string name="share_save_poster_fail">海报生成失败,请重试</string>
+    <string name="share_generate_qr_code">Generate QR code</string>
+    <string name="share_common_qr_code">General code</string>
+    <string name="share_common_special_code">Specific code</string>
+    <string name="share_friend_title">Generate your personalized poster</string>
+    <string name="share_share_poster">Share poster</string>
+    <string name="share_share_poster_game_title">Scan the code to play with me</string>
+    <string name="share_save_poster_success">Poster has been saved to your album</string>
+    <string name="share_save_poster_fail">Poster generation failed, please try again</string>
 </resources>

module/wallet/src/main/res/layout/layout_recharge_header_bean.xml

@@ -83,7 +83,7 @@
             android:gravity="center"
             android:includeFontPadding="false"
             android:singleLine="true"
-            android:text="@string/wallet_withdraw_crash"
+            android:text="@string/wallet_withdraw_cash"
             android:textColor="@color/white"
             android:textSize="14sp"
             android:visibility="gone"

module/wallet/src/main/res/values-in/strings.xml

@@ -1,3 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="wallet_top_up_title">Isi Ulang</string>
+    <string name="wallet_balance">Saldo:</string>
+    <string name="wallet_payment_title">Silakan pilih metode pembayaran Anda</string>
+    <string name="wallet_top_up_button">Isi Ulang</string>
+    <string name="wallet_title">Dompet Saya</string>
+    <string name="wallet_my_balance">Saldo Saya</string>
+    <string name="wallet_my_income">Penghasilan Saya</string>
+    <string name="wallet_go_top_up"><![CDATA[Isi Ulang >]]></string>
+    <string name="wallet_go_detail"><![CDATA[Detail >]]></string>
+    <string name="wallet_go_convert"><![CDATA[Konversi >]]></string>
+    <string name="wallet_detail_title">Detail</string>
+    <string name="wallet_your_balance">Anda saldo</string>
+    <string name="wallet_coin_convert_to_diamond"><![CDATA[Konversi ke Berlian >]]></string>
+    <string name="wallet_diamond_convert_to_coin"><![CDATA[Konversi ke Koin >]]></string>
+    <string name="wallet_withdraw_cash"><![CDATA[Penarikan Tunai >]]></string>
+    <string name="wallet_topup_instruction_title">Instruksi Isi Ulang</string>
+    <string name="wallet_topup_instruction_1">1. Setelah isi ulang berhasil, pasti akan ada penundaan dalam kedatangan dana di akun Anda. Mohon bersabar.</string>
+    <string name="wallet_topup_instruction_2">2. Jika Anda mengalami masalah selama proses pengisian ulang, silakan klik "Umpan Balik".</string>
+    <string name="wallet_recharge_not_selected">Silakan pilih paket pengisian ulang.</string>
+    <string name="wallet_convert_currency_title">Konversi ke %s</string>
+    <string name="wallet_all_convert_button">Semua</string>
+    <string name="wallet_confirm_convert">Konfirmasi Penukaran</string>
+    <string name="wallet_convert_from_coin">Dari Koin</string>
+    <string name="wallet_convert_to_coin">Ke Koin</string>
+    <string name="wallet_convert_from_diamond">Dari Berlian</string>
+    <string name="wallet_convert_to_diamond">Ke Berlian</string>
+    <string name="wallet_convert_from_bean">Dari Kacang</string>
+    <string name="wallet_convert_to_bean">Ke Kacang</string>
+    <string name="wallet_convert_please_fill">Silakan isi</string>
 </resources>

module/wallet/src/main/res/values-zh/strings.xml

@@ -1,3 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <string name="wallet_top_up_title">充值</string>
+    <string name="wallet_balance">余额：</string>
+    <string name="wallet_payment_title">请选择您的付款方式</string>
+    <string name="wallet_top_up_button">充值</string>
+    <string name="wallet_title">我的钱包</string>
+    <string name="wallet_my_balance">我的余额</string>
+    <string name="wallet_my_income">我的收入</string>
+    <string name="wallet_go_top_up"><![CDATA[充值 >]]></string>
+    <string name="wallet_go_detail"><![CDATA[详情 >]]></string>
+    <string name="wallet_go_convert"><![CDATA[转换 >]]></string>
+    <string name="wallet_detail_title">详情</string>
+    <string name="wallet_your_balance">您的余额</string>
+    <string name="wallet_coin_convert_to_diamond"><![CDATA[转换为钻石 >]]></string>
+    <string name="wallet_diamond_convert_to_coin"><![CDATA[转换为金币 >]]></string>
+    <string name="wallet_withdraw_cash"><![CDATA[提现 >]]></string>
+    <string name="wallet_topup_instruction_title">充值说明</string>
+    <string name="wallet_topup_instruction_1">1.充值成功后，账户会有延迟到账，请耐心等待；</string>
+    <string name="wallet_topup_instruction_2">2.如果您在充值过程中遇到任何问题，请点击“反馈”</string>
+    <string name="wallet_recharge_not_selected">请选择充值套餐</string>
+    <string name="wallet_convert_currency_title">兑换为 %s</string>
+    <string name="wallet_all_convert_button">全部兑换</string>
+    <string name="wallet_confirm_convert">确认兑换</string>
+    <string name="wallet_convert_from_coin">从金币兑换</string>
+    <string name="wallet_convert_to_coin">兑换为金币</string>
+    <string name="wallet_convert_from_diamond">从钻石兑换</string>
+    <string name="wallet_convert_to_diamond">兑换为钻石</string>
+    <string name="wallet_convert_from_bean">从金豆转换</string>
+    <string name="wallet_convert_to_bean">转换为金豆</string>
+    <string name="wallet_convert_please_fill">请填写</string>
 </resources>

module/wallet/src/main/res/values/strings.xml

@@ -11,16 +11,16 @@
     <string name="wallet_go_detail"><![CDATA[Detail >]]></string>
     <string name="wallet_go_convert"><![CDATA[Convert >]]></string>
     <string name="wallet_detail_title">Details</string>
-    <string name="wallet_your_balance">您的余额</string>
+    <string name="wallet_your_balance">Your balance</string>
     <string name="wallet_coin_convert_to_diamond"><![CDATA[Convert to Diamonds >]]></string>
     <string name="wallet_diamond_convert_to_coin"><![CDATA[Convert to Coin >]]></string>
-    <string name="wallet_withdraw_crash"><![CDATA[Withdraw Crash >]]></string>
+    <string name="wallet_withdraw_cash"><![CDATA[Withdraw Crash >]]></string>
     <string name="wallet_topup_instruction_title">Recharge Instructions</string>
-    <string name="wallet_topup_instruction_1">1. After the recharge is successful, there will definitelybe a delay in the account, please wait；</string>
-    <string name="wallet_topup_instruction_2">2.lf you encounter any problems with the rechargeplease click Feedback</string>
-    <string name="wallet_recharge_not_selected">请选择充值套餐</string>
+    <string name="wallet_topup_instruction_1">1. After a successful top-up, there will definitely be a delay in the funds arriving in your account. Please wait patiently.</string>
+    <string name="wallet_topup_instruction_2">2. If you encounter any problems during the recharge process, please click "Feedback".</string>
+    <string name="wallet_recharge_not_selected">Please select recharge package.</string>
     <string name="wallet_convert_currency_title">Convert to %s</string>
-    <string name="wallet_all_convert_button">全部兑换</string>
+    <string name="wallet_all_convert_button">All</string>
     <string name="wallet_confirm_convert">Confirm Exchange</string>
     <string name="wallet_convert_from_coin">From Coins</string>
     <string name="wallet_convert_to_coin">To Coins</string>
@@ -28,6 +28,5 @@
     <string name="wallet_convert_to_diamond">To Diamonds</string>
     <string name="wallet_convert_from_bean">From Bean</string>
     <string name="wallet_convert_to_bean">To Bean</string>
-
     <string name="wallet_convert_please_fill">Please fill in</string>
 </resources>