Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@DaVinci9196
DaVinci9196 committed Nov 22, 2024
1 parent 4c0eae3 commit 09c685a
Showing 1 changed file with 15 additions and 16 deletions.
31 changes: 15 additions & 16 deletions play-services-core/src/main/res/values-zh-rCN/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,22 +226,6 @@ microG GmsCore 内置一套自由的 SafetyNet 实现，但是官方服务器要
<string name="service_name_snet">Google SafetyNet</string>
<string name="pref_safetynet_recent_recaptcha_summary">ReCaptcha: %s</string>
<string name="pref_safetynet_recent_recaptcha_enterprise_summary">ReCaptcha Enterprise: %s</string>
<string name="credentials_assisted_cancel">取消</string>
<string name="credentials_assisted_continue">继续</string>
<string name="credentials_assisted_confirmation_header">正在登录</string>
<string name="credentials_assisted_continue_as_user_button_label">继续以%1$s的身份登录</string>
<string name="credentials_assisted_sign_back_title">通过 Google 重新登录 %1$s</string>
<string name="credentials_assisted_signin_consent_header">登录%1$s</string>
<string name="credentials_assisted_signin_consent">如果您继续操作，Google 会将您的姓名、电子邮件地址和个人资料照片提供给 %1$s。请参阅 %1$s 的隐私权政策和服务条款。</string>
<string name="credentials_assisted_signin_description">您可以在您的 Google 账号中管理“使用 Google 账号登录”功能。</string>
<string name="credentials_assisted_choose_account_label">选择账号</string>
<string name="credentials_assisted_choose_account_subtitle">以继续使用 %1$s</string>
<string name="credentials_assisted_signin_button_text_long">使用 Google 账号登录</string>
<string name="auth_package_override_request_title">允许 <b><xliff:g example="F-Droid">%1$s</xliff:g></b> 访问<xliff:g example="[email protected]">%2$s</xliff:g>？</string>
<string name="auth_package_override_request_message">&lt;b&gt;&lt;xliff:g example=\"F-Droid\"&gt;%1$s&lt;/xliff:g&gt;&lt;/b&gt; 想以 &lt;xliff:g example=\"F-Droid Inc.\"&gt;%3$s&lt;/xliff:g&gt;&lt;/b&gt; 的 &lt;b&gt;&lt;xliff:g example=\"F-Droid\"&gt;%2$s&lt;/xliff:g&gt; 访问你的账户。这可能授予访问你账户的权限。</string>
<string name="pref_vending_licensing_purchase_free_apps_switch">自动添加免费应用到库中</string>
<string name="pref_vending_licensing_purchase_free_apps_summary">免费应用可能会检查它们是否曾经从 Google Play 被下载过。自动添加免费应用到你的账户库中可以让你一直通过当前对你可用的所有免费应用的检查。</string>

<string name="games_achievement_list_title">成就</string>
<string name="games_achievements_empty_text">此游戏没有成就</string>
<string name="games_api_access_denied">此设备上没有可访问 Games API 的账号</string>
Expand All @@ -260,4 +244,19 @@ microG GmsCore 内置一套自由的 SafetyNet 实现，但是官方服务器要
<string name="games_delete_snapshot_dialog_cancel">取消</string>
<string name="games_delete_snapshot_dialog_ok">确定</string>
<string name="games_delete_snapshot_error">删除失败，请稍后重试</string>
<string name="credentials_assisted_cancel">取消</string>
<string name="credentials_assisted_continue">继续</string>
<string name="credentials_assisted_confirmation_header">正在登录</string>
<string name="credentials_assisted_continue_as_user_button_label">继续以%1$s的身份登录</string>
<string name="credentials_assisted_sign_back_title">通过 Google 重新登录 %1$s</string>
<string name="credentials_assisted_signin_consent_header">登录%1$s</string>
<string name="credentials_assisted_signin_consent">如果您继续操作，Google 会将您的姓名、电子邮件地址和个人资料照片提供给 %1$s。请参阅 %1$s 的隐私权政策和服务条款。</string>
<string name="credentials_assisted_signin_description">您可以在您的 Google 账号中管理“使用 Google 账号登录”功能。</string>
<string name="credentials_assisted_choose_account_label">选择账号</string>
<string name="credentials_assisted_choose_account_subtitle">以继续使用 %1$s</string>
<string name="credentials_assisted_signin_button_text_long">使用 Google 账号登录</string>
<string name="auth_package_override_request_title">允许 <b><xliff:g example="F-Droid">%1$s</xliff:g></b> 访问<xliff:g example="[email protected]">%2$s</xliff:g>？</string>
<string name="auth_package_override_request_message">&lt;b&gt;&lt;xliff:g example=\"F-Droid\"&gt;%1$s&lt;/xliff:g&gt;&lt;/b&gt; 想以 &lt;xliff:g example=\"F-Droid Inc.\"&gt;%3$s&lt;/xliff:g&gt;&lt;/b&gt; 的 &lt;b&gt;&lt;xliff:g example=\"F-Droid\"&gt;%2$s&lt;/xliff:g&gt; 访问你的账户。这可能授予访问你账户的权限。</string>
<string name="pref_vending_licensing_purchase_free_apps_switch">自动添加免费应用到库中</string>
<string name="pref_vending_licensing_purchase_free_apps_summary">免费应用可能会检查它们是否曾经从 Google Play 被下载过。自动添加免费应用到你的账户库中可以让你一直通过当前对你可用的所有免费应用的检查。</string>
</resources>

0 comments on commit 09c685a

Please sign in to comment.