Merging upstream version 115.11.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 10 insertions, 10 deletions

diff --git a/l10n-zh-CN/browser/browser/preferences/formAutofill.ftl b/l10n-zh-CN/browser/browser/preferences/formAutofill.ftl
index 7e7e53b082..d137a483f8 100644
--- a/l10n-zh-CN/browser/browser/preferences/formAutofill.ftl
+++ b/l10n-zh-CN/browser/browser/preferences/formAutofill.ftl
@@ -39,8 +39,6 @@ address-capture-manage-address-button =
     .label = 地址设置
 address-capture-learn-more-button =
     .label = 详细了解
-# The dialog title for creating addresses in browser preferences.
-autofill-add-new-address-title = 添加新地址
 address-capture-open-menu-button =
     .aria-label = 打开菜单
 address-capture-edit-address-button =
@@ -102,7 +100,7 @@ autofill-address-oblast = 州
 # Used in IN
 autofill-address-pin = 邮政编码
 autofill-address-postal-code = 邮政编码
-autofill-address-zip = Zip 编码
+autofill-address-zip = ZIP 编码
 # Used in IE
 autofill-address-eircode = Eircode 邮政编码
 
@@ -111,22 +109,19 @@ autofill-address-eircode = Eircode 邮政编码
 
 ##
 
+# The dialog title for creating addresses in browser preferences.
+autofill-add-new-address-title = 添加新地址
 autofill-address-country = 国家/地区
 autofill-address-country-only = 国家/地区
 autofill-address-tel = 电话号码
-autofill-address-email = 电子邮箱
+autofill-address-email = 邮箱地址
 autofill-cancel-button = 取消
 autofill-save-button = 保存
-autofill-country-warning-message = 表单自动填写目前仅适用于部分地区。
+autofill-country-warning-message = 表单自动填写目前仅部分国家/地区可用。
 # The dialog title for creating credit cards in browser preferences.
 autofill-add-new-card-title = 添加新信用卡
 # The dialog title for editing credit cards in browser preferences.
 autofill-edit-card-title = 编辑信用卡
-autofill-message-tooltip = 查看关于自动填写的信息
-# The dialog title for creating credit cards in browser preferences.
-autofill-add-card-title = 添加卡片
-# The dialog title for editing credit cards in browser preferences.
-autofill-edit-card-title2 = 编辑卡片
 # In macOS, this string is preceded by the operating system with "Firefox is trying to ",
 # and has a period added to its end. Make sure to test in your locale.
 autofill-edit-card-password-prompt =
@@ -135,6 +130,11 @@ autofill-edit-card-password-prompt =
         [windows] { -brand-short-name } 正尝试显示信用卡信息。请在下方登录此 Windows 账户确认。
        *[other] { -brand-short-name } 正尝试显示信用卡信息。
     }
+autofill-message-tooltip = 查看关于自动填写的信息
+# The dialog title for creating credit cards in browser preferences.
+autofill-add-card-title = 添加卡片
+# The dialog title for editing credit cards in browser preferences.
+autofill-edit-card-title2 = 编辑卡片
 autofill-card-number = 卡号
 autofill-card-invalid-number = 请输入有效的卡号
 autofill-card-name-on-card = 持卡人姓名