diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index 490f9b03..3ca1afe3 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -2,8 +2,8 @@
 	<string name="app_name">Poker Analytics</string>
 
 
-	<string name="_ago">%@前</string>
-	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%@不能访问你的联系人且不能检索你的现有好友姓名。通过iPhone首选项可授权防止任何\'陌生用户\'名访问。</string>
+	<string name="_ago">%s前</string>
+	<string name="_doesn_t_have_access_to_your_contacts_alert_message">%s不能访问你的联系人且不能检索你的现有好友姓名。通过iPhone首选项可授权防止任何\'陌生用户\'名访问。</string>
 	<string name="_indicates_that_the_file_is_on_your_icloud_account_">一颗星表示一个文件存储在你的iCloud帐户上。</string>
 	<string name="activate">启用</string>
 	<string name="activate_icloud_storage_detailed_explaination">iCloud在你的所有设备上保存你的数据并保持最新。启用时，你的数据被移至iCloud，在其它设备访问你的数据前，这可能要花费一段时间。</string>
@@ -137,7 +137,7 @@
 	<string name="end">结束</string>
 	<string name="end_all_the_games_validation_popup_title">你要结束所有游戏？</string>
 	<string name="end_date">结束日期</string>
-	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">未设置结束日期！该格式可能不正确。这里是用于分析的值：%@</string>
+	<string name="end_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">未设置结束日期！该格式可能不正确。这里是用于分析的值：%s</string>
 	<string name="end_of_rebuy_period_and_blinds_level_up">重新购买周期结束，盲注增加</string>
 	<string name="end_of_rebuy_period_in_less_than_one_minute">一分钟内重新购买周期结束</string>
 	<string name="end_of_session_is_close_press_details_to_stop_your_session_and_set_results">进程结束已关闭，触按详情停止你的进程并设置结果	</string>
@@ -156,7 +156,7 @@
 	<string name="export_popup_title">选择类型</string>
 	<string name="feature_locked_and_inapp_purchase_disabled">此功能已锁定，很遗憾你已禁用应用内购买。请核查设置。</string>
 	<string name="file_directory_creation_error">导入失败。某些用来导入的文件无法创建，这可能由于空间不够</string>
-	<string name="file_named_was_successfully_saved_on_your_icloud_account">名为%@的文件已成功保存在你的iCloud帐户上。</string>
+	<string name="file_named_was_successfully_saved_on_your_icloud_account">名为%s的文件已成功保存在你的iCloud帐户上。</string>
 	<string name="filter">筛选</string>
 	<string name="filter_selection">筛选启用</string>
 	<string name="filter_used_in_one_or_more_reports_you_can_t_delete_it_">此筛选无法删除，因为它链接1个或多个报告。</string>
@@ -203,7 +203,7 @@
 	<string name="import_str">导入</string>
 	<string name="import_from_address_book">使用通讯录</string>
 	<string name="import_not_successfull">识别出问题</string>
-	<string name="import_session_save_error_">保存进程时出错：%@</string>
+	<string name="import_session_save_error_">保存进程时出错：%s</string>
 	<string name="import_successfull">导入成功</string>
 	<string name="imported_session">导入进程</string>
 	<string name="in">在</string>
@@ -230,7 +230,7 @@
 	<string name="live_online_room">在线/房间</string>
 	<string name="load_from_db">打开&#8230;</string>
 	<string name="location">位置</string>
-	<string name="location_">位置：%@， </string>
+	<string name="location_">位置：%s， </string>
 	<string name="location_empty_field_error">你需要命名此位置。</string>
 	<string name="location_not_track">未追踪的位置</string>
 	<string name="location_track">追踪的位置</string>
@@ -324,7 +324,7 @@
 	<string name="player">玩家</string>
 	<string name="players">玩家</string>
 	<string name="please_check_if_your_values_are_valid">请检查你的值是否有效</string>
-	<string name="please_confirm_the_import_start_">请确认导入\'%@\'？</string>
+	<string name="please_confirm_the_import_start_">请确认导入\'%s\'？</string>
 	<string name="please_select_the_field_corresponding_to">请选择相应的字段：</string>
 	<string name="please_type_your_pin_code">请输入你的PIN码</string>
 	<string name="plus">加</string>
@@ -364,11 +364,11 @@
 	<string name="restart_timer">重新开始定时器</string>
 	<string name="result">结果</string>
 	<string name="room">房间</string>
-	<string name="room_">房间：%@</string>
+	<string name="room_">房间：%s</string>
 	<string name="room_empty_field_error">你需要命名此房间</string>
 	<string name="rooms">房间</string>
 	<string name="running_session_state">运行中</string>
-	<string name="same_name_different_kind_custom_field_log_">自定义字段\'%@\'已存在于你的数据库中，但类型不同。此字段和它的所有值将被忽略。若你真要保留此值，请取消此导入，重命名自定义字段并重试该导入。</string>
+	<string name="same_name_different_kind_custom_field_log_">自定义字段\'%s\'已存在于你的数据库中，但类型不同。此字段和它的所有值将被忽略。若你真要保留此值，请取消此导入，重命名自定义字段并重试该导入。</string>
 	<string name="save_report_error_popup_message">你需要命名它并选择至少一个统计保存此报告	</string>
 	<string name="saving_imported_data_please_wait_">正在保存导入数据，请等待&#8230;</string>
 	<string name="security">安全</string>
@@ -379,7 +379,7 @@
 	<string name="services">设置</string>
 	<string name="session">进程</string>
 	<string name="session_duration">进程时长</string>
-	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">未设置进程获胜数量！这是被用来分析的值：%@</string>
+	<string name="session_won_amount_have_not_been_set_here_is_the_value_used_for_parsing_">未设置进程获胜数量！这是被用来分析的值：%s</string>
 	<string name="session_s_comments_updated_">进程的评论已更新</string>
 	<string name="sessions">进程</string>
 	<string name="share_chart">分享图表</string>
@@ -398,7 +398,7 @@
 	<string name="standard_deviation">标准偏差</string>
 	<string name="start">开始</string>
 	<string name="start_date">开始日期</string>
-	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">未设置开始日期，格式可能错误。这是导入时使用的值：%@</string>
+	<string name="start_date_have_not_been_set_the_format_may_not_be_correct_here_is_the_value_used_for_parsing_">未设置开始日期，格式可能错误。这是导入时使用的值：%s</string>
 	<string name="start_import">是</string>
 	<string name="statistics">统计</string>
 	<string name="stats">统计</string>
@@ -417,11 +417,11 @@
 	<string name="tap_or_slide">点击或滑动</string>
 	<string name="thank_you_message">恭喜，该内容现在可用。</string>
 	<string name="the_at_">%1$@，%2$@</string>
-	<string name="the_location_named_already_have_these_coordinates">名为%@的位置已有这些坐标。</string>
+	<string name="the_location_named_already_have_these_coordinates">名为%s的位置已有这些坐标。</string>
 	<string name="the_rate_wasn_t_able_to_be_found_a_rate_of_1_will_be_used_by_default_you_can_still_edit_the_rate_by_yourself_">当前评分无法检索。默认将使用的评分为1。你仍能单独编辑该评分。</string>
 	<string name="the_session_already_exists_start_date_end_date_amount_won_">该进程已存在！开始日期：%1$@，结束日期：%2$@，获胜数量 ：%3$@	</string>
 	<string name="the_session_already_exists_start_date_end_date_net_result_">该进程已存在！开始日期：%1$@，结束日期：%2$@，净结果：%3$@</string>
-	<string name="this_game_started_">你的进程已开始：%@</string>
+	<string name="this_game_started_">你的进程已开始：%s</string>
 	<string name="this_month">本月</string>
 	<string name="this_week">本周</string>
 	<string name="this_year">今年</string>
@@ -451,14 +451,14 @@
 	<string name="twitter">Twitter</string>
 	<string name="type">类型</string>
 	<string name="type_de_limite">限制类型</string>
-	<string name="unable_to_get_from_fixer_io_">无法从雅虎获得评分- %@</string>
+	<string name="unable_to_get_from_fixer_io_">无法从雅虎获得评分- %s</string>
 	<string name="unfollowed_">已取消关注！</string>
 	<string name="unknown_import_format_popup_message">文件格式无法识别</string>
 	<string name="unknown_user">未知用户</string>
 	<string name="user_empty_field_error">你需要命名你的好友</string>
 	<string name="validate">验证</string>
 	<string name="value">值</string>
-	<string name="variant_">游戏：%@， </string>
+	<string name="variant_">游戏：%s， </string>
 	<string name="variant_empty_name_error">你需要命名该游戏</string>
 	<string name="variant_empty_shortname_error">你需要为该游戏进行简短命名</string>
 	<string name="version">版本</string>
@@ -470,7 +470,7 @@
 	<string name="week_days">工作日</string>
 	<string name="weekdays_or_weekend">工作日或周末</string>
 	<string name="weekend">周末</string>
-	<string name="welcome_in_">欢迎使用%@</string>
+	<string name="welcome_in_">欢迎使用%s</string>
 	<string name="win_ratio">获胜率</string>
 	<string name="with">利用</string>
 	<string name="withdrawal">提款</string>
@@ -488,7 +488,7 @@
 	<string name="yes_use_icloud">是</string>
 	<string name="yesterday">昨天</string>
 	<string name="yesterday_and_today">今天和昨天</string>
-	<string name="you_can_retrieve_the_generated_file_named_within_itunes">你能检索iTunes内生成的名为%@的文件。</string>
+	<string name="you_can_retrieve_the_generated_file_named_within_itunes">你能检索iTunes内生成的名为%s的文件。</string>
 	<string name="you_can_t_have_more_than_i_comparison_keys_selected">抱歉，你不能同时启用超过%i个的比较密匙！</string>
 	<string name="your_are_going_to_affect_the_following_values_to_all_imported_sessions_please_check_the_following_">你要对所有导入的进程指定以下值。请检查以下项目： </string>
 	<string name="your_attention">警告</string>
@@ -561,7 +561,7 @@
 	<string name="from_hour_">来自</string>
 	<string name="to_hour_">到</string>
 	<string name="maximum">最大值</string>
-	<string name="whats_new_in_">%@有何新功能？</string>
+	<string name="whats_new_in_">%s有何新功能？</string>
 	<string name="releasenote_question">喜欢Poker Analytics？</string>
 	<string name="releasenote_invitation">请反馈本应用如何</string>
 	<string name="releasenote_rating">在App Store给我们评分</string>
@@ -569,12 +569,12 @@
 	<string name="stop_notification_body">时间到！</string>
 	<string name="stop_notification_title">根据你的历史记录，好像你开始累了。可能该停止了！</string>
 	<string name="stop_notifications">停止通知</string>
-	<string name="stop_notification_in_">在%@中已设置停止通知</string>
+	<string name="stop_notification_in_">在%s中已设置停止通知</string>
 	<string name="save_authorize">保存和授权</string>
 	<string name="select_a_color">选择颜色</string>
 	<string name="spotlight_indexing">聚焦索引</string>
-	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">未授权%@访问摄像头。若修改隐私设置，请注意自动关闭应用将失去未保存的数据。</string>
-	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">未授权%@访问照片库。若修改隐私设置，请注意自动关闭应用将失去未保存的数据。</string>
+	<string name="_is_not_authorize_to_access_the_camera_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">未授权%s访问摄像头。若修改隐私设置，请注意自动关闭应用将失去未保存的数据。</string>
+	<string name="_is_not_authorize_to_access_your_library_be_aware_that_the_app_will_be_terminated_if_you_modify_the_privacy_setting_">未授权%s访问照片库。若修改隐私设置，请注意自动关闭应用将失去未保存的数据。</string>
 	<string name="new_hand">新手</string>
 	<string name="new_note">新备注</string>
 	<string name="tap_to_learn_more">触按一个项目了解详情</string>
@@ -594,9 +594,9 @@
 	<string name="autorenewable_subcription">自动续订订阅</string>
 	<string name="terms">条件</string>
 	<string name="stop_notifications_explanation">Poker Analytics尝试估算您的最佳进程时长并在你到达该时长时发送通知。需要约50局。</string>
-	<string name="_icloud_sync_wasn_t_able_to_be_enabled">不能启动iCloud同步。也许你在iCloud上有旧%@数据。</string>
+	<string name="_icloud_sync_wasn_t_able_to_be_enabled">不能启动iCloud同步。也许你在iCloud上有旧%s数据。</string>
 	<string name="icloud_reset_and_retry">清牌后重试</string>
-	<string name="_icloud_reset_warning">你将重置iCloud上%@的数据，你的本地数据不会更改，但你必需中止所有其它设备上的iCloud同步。确定这么做？</string>
+	<string name="_icloud_reset_warning">你将重置iCloud上%s的数据，你的本地数据不会更改，但你必需中止所有其它设备上的iCloud同步。确定这么做？</string>
 	<string name="remove_picture">删除图片</string>
 	<string name="icloud_is_syncing">同步中</string>
 	<string name="icloud_update_issue">错误</string>
@@ -607,7 +607,7 @@
 	<string name="icloud_ok_and_ready">好</string>
 	<string name="icloud_migration_failure_error_message">由于数据库出现重要变更，出于安全考虑已在应用上禁用iCloud，你的数据已被移回你的本地设备。请在所有其它设备上禁用iCloud同步。若要重新启动iCloud，必须提前删除iCloud数据。</string>
 	<string name="icloud_sync_wasn_t_able_to_be_disabled">不能禁用iCloud同步。</string>
-	<string name="currently_having_chips">当前有%@个筹码</string>
+	<string name="currently_having_chips">当前有%s个筹码</string>
 	<string name="icloud_timeout">iCloud请求超时。</string>
 	<string name="vs">对战</string>
 	<string name="open_privacy_settings">打开隐私设置</string>