Bug 1792730 - Migrate styles of dialogs to use min-width
authorYFdyh000 <yfdyh000@gmail.com>
Sun, 02 Oct 2022 18:18:08 -1000
changeset 5063 fd342e8e02124fd73c936534352ea6f8624e75a4
parent 5062 e912ac916c5bdfc90ad88953f0ce2e1245347b80
child 5064 20f9235067da7b04a7b6f84d6892b425b525a04d
push id3697
push userflodolo@mozilla.com
push dateMon, 03 Oct 2022 04:18:12 +0000
bugs1792730
Bug 1792730 - Migrate styles of dialogs to use min-width
browser/browser/preferences/clearSiteData.ftl
browser/browser/preferences/connection.ftl
browser/browser/preferences/containers.ftl
browser/browser/preferences/languages.ftl
browser/browser/preferences/permissions.ftl
--- a/browser/browser/preferences/clearSiteData.ftl
+++ b/browser/browser/preferences/clearSiteData.ftl
@@ -1,56 +1,50 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 clear-site-data-window =
     .title = 清除数据
     .style = width: 35em
-
+clear-site-data-window2 =
+    .title = 清除数据
+    .style = min-width: 35em
 clear-site-data-description = 清除 { -brand-short-name } 存储的所有 Cookie 和网站数据可能使您的网站登录状态丢失,还会删除离线网页内容。仅清除缓存数据则不会影响您的登录状态。
-
 clear-site-data-close-key =
     .key = w
-
 # The parameters in parentheses in this string describe disk usage
 # in the format ($amount $unit), e.g. "Cookies and Site Data (24 KB)"
 # Variables:
 #   $amount (Number) - Amount of site data currently stored on disk
 #   $unit (String) - Abbreviation of the unit that $amount is in, e.g. "MB"
 clear-site-data-cookies-with-data =
     .label = Cookie 和网站数据 ({ $amount } { $unit })
     .accesskey = S
-
 # This string is a placeholder for while the data used to fill
 # clear-site-data-cookies-with-data is loading. This placeholder is usually
 # only shown for a very short time (< 1s), so it should be very similar
 # or the same as clear-site-data-cookies-with-data (except the amount and unit),
 # to avoid flickering.
 clear-site-data-cookies-empty =
     .label = Cookie 和网站数据
     .accesskey = S
-
 clear-site-data-cookies-info = 如果清除,您的网站登录状态可能丢失
-
 # The parameters in parentheses in this string describe disk usage
 # in the format ($amount $unit), e.g. "Cached Web Content (24 KB)"
 # Variables:
 #   $amount (Number) - Amount of cache currently stored on disk
 #   $unit (String) - Abbreviation of the unit that $amount is in, e.g. "MB"
 clear-site-data-cache-with-data =
     .label = 已缓存网络数据 ({ $amount } { $unit })
     .accesskey = W
-
 # This string is a placeholder for while the data used to fill
 # clear-site-data-cache-with-data is loading. This placeholder is usually
 # only shown for a very short time (< 1s), so it should be very similar
 # or the same as clear-site-data-cache-with-data (except the amount and unit),
 # to avoid flickering.
 clear-site-data-cache-empty =
     .label = 已缓存网络内容
     .accesskey = W
-
 clear-site-data-cache-info = 将重新载入网站的图像等数据
-
 clear-site-data-dialog =
     .buttonlabelaccept = 清除
     .buttonaccesskeyaccept = l
--- a/browser/browser/preferences/connection.ftl
+++ b/browser/browser/preferences/connection.ftl
@@ -4,99 +4,86 @@
 
 connection-window =
     .title = 连接设置
     .style =
         { PLATFORM() ->
             [macos] width: 44em
            *[other] width: 49em
         }
-
+connection-window2 =
+    .title = 连接设置
+    .style =
+        { PLATFORM() ->
+            [macos] min-width: 44em
+           *[other] min-width: 49em
+        }
 connection-close-key =
     .key = w
-
 connection-disable-extension =
     .label = 禁用扩展
-
 connection-proxy-configure = 配置访问互联网的代理服务器
-
 connection-proxy-option-no =
     .label = 不使用代理服务器
     .accesskey = y
 connection-proxy-option-system =
     .label = 使用系统代理设置
     .accesskey = U
 connection-proxy-option-auto =
     .label = 自动检测此网络的代理设置
     .accesskey = w
 connection-proxy-option-manual =
     .label = 手动配置代理
     .accesskey = m
-
 connection-proxy-http = HTTP 代理
     .accesskey = x
 connection-proxy-http-port = 端口
     .accesskey = P
-
 connection-proxy-https-sharing =
     .label = 也将此代理用于 HTTPS
     .accesskey = S
-
 connection-proxy-https = HTTPS Proxy
     .accesskey = H
 connection-proxy-ssl-port = 端口
     .accesskey = o
-
 connection-proxy-socks = SOCKS 主机
     .accesskey = C
 connection-proxy-socks-port = 端口
     .accesskey = t
-
 connection-proxy-socks4 =
     .label = SOCKS v4
     .accesskey = K
 connection-proxy-socks5 =
     .label = SOCKS v5
     .accesskey = v
 connection-proxy-noproxy = 不使用代理
     .accesskey = n
-
 connection-proxy-noproxy-desc = 例如:.mozilla.org, .net.nz, 192.168.1.0/24
-
 # Do not translate "localhost", "127.0.0.1/8" and "::1". (You can translate "and".)
 connection-proxy-noproxy-localhost-desc-2 = 与 localhost、127.0.0.1/8 和 ::1 的连接永不经过代理。
-
 connection-proxy-autotype =
     .label = 自动代理配置的 URL(PAC)
     .accesskey = A
-
 connection-proxy-reload =
     .label = 重新载入
     .accesskey = e
-
 connection-proxy-autologin =
     .label = 如果密码已保存,不提示身份验证
     .accesskey = i
     .tooltip = 此选项将允许在您已保存凭据的情况下自动向代理进行身份验证,如果验证失败再提示您输入信息。
-
 connection-proxy-socks-remote-dns =
     .label = 使用 SOCKS v5 时代理 DNS 查询
     .accesskey = D
-
 connection-dns-over-https =
     .label = 启用基于 HTTPS 的 DNS
     .accesskey = H
-
 connection-dns-over-https-url-resolver = 选用提供商
     .accesskey = P
-
 # Variables:
 #   $name (String) - Display name or URL for the DNS over HTTPS provider
 connection-dns-over-https-url-item-default =
     .label = { $name }(默认值)
     .tooltiptext = 使用默认 URL 完成基于 HTTPS 的 DNS 解析
-
 connection-dns-over-https-url-custom =
     .label = 自定义
     .accesskey = C
     .tooltiptext = 输入您偏好的 URL,用来完成基于 HTTPS 的 DNS 解析
-
 connection-dns-over-https-custom-label = 自定义
--- a/browser/browser/preferences/containers.ftl
+++ b/browser/browser/preferences/containers.ftl
@@ -1,55 +1,49 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 containers-window-new =
     .title = 添加新身份
     .style = width: 45em
-
 # Variables
 #   $name (String) - Name of the container
 containers-window-update-settings =
     .title = { $name } 身份设置
     .style = width: 45em
-
+containers-window-new2 =
+    .title = 添加新身份
+    .style = min-width: 45em
 containers-window-close =
     .key = w
-
 # This is a term to store style to be applied
 # on the three labels in the containers add/edit dialog:
 #   - name
 #   - icon
 #   - color
 #
 # Using this term and referencing it in the `.style` attribute
 # of the three messages ensures that all three labels
 # will be aligned correctly.
 -containers-labels-style = min-width: 4rem
-
 containers-name-label = 名称
     .accesskey = N
     .style = { -containers-labels-style }
-
 containers-name-text =
     .placeholder = 请输入身份名称
-
 containers-icon-label = 图标
     .accesskey = I
     .style = { -containers-labels-style }
-
 containers-color-label = 颜色
     .accesskey = o
     .style = { -containers-labels-style }
-
 containers-dialog =
     .buttonlabelaccept = 完成
     .buttonaccesskeyaccept = D
-
 containers-color-blue =
     .label = 蓝色
 containers-color-turquoise =
     .label = 青色
 containers-color-green =
     .label = 绿色
 containers-color-yellow =
     .label = 黄色
@@ -58,17 +52,16 @@ containers-color-orange =
 containers-color-red =
     .label = 红色
 containers-color-pink =
     .label = 粉色
 containers-color-purple =
     .label = 紫色
 containers-color-toolbar =
     .label = 匹配工具栏
-
 containers-icon-fence =
     .label = 篱笆
 containers-icon-fingerprint =
     .label = 指纹
 containers-icon-briefcase =
     .label = 公文包
 # String represents a money sign but currently uses a dollar sign
 # so don't change to local currency. See Bug 1291672.
--- a/browser/browser/preferences/languages.ftl
+++ b/browser/browser/preferences/languages.ftl
@@ -1,15 +1,18 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 webpage-languages-window =
     .title = 网页语言设置
     .style = width: 40em
+webpage-languages-window2 =
+    .title = 网页语言设置
+    .style = min-width: 40em
 languages-close-key =
     .key = w
 languages-description = 某些网页有多种语言可供选择。请选择此类网页应显示的语言,按偏好从上到下排列:
 languages-customize-spoof-english =
     .label = 请求英文版网页,强化隐私保护
 languages-customize-moveup =
     .label = 上移
     .accesskey = U
@@ -36,16 +39,19 @@ languages-customize-add =
 #   $code (String) - Locale code of the locale (for example: "is", "es-CL")
 languages-code-format =
     .label = { $locale }  [{ $code }]
 languages-active-code-format =
     .value = { languages-code-format.label }
 browser-languages-window =
     .title = { -brand-short-name } 语言设置
     .style = width: 40em
+browser-languages-window2 =
+    .title = { -brand-short-name } 语言设置
+    .style = min-width: 40em
 browser-languages-description = { -brand-short-name } 将显示的第一个语言作为您的默认语言,并在必要时按语言的顺序显示备用语言。
 browser-languages-search = 搜索更多语言…
 browser-languages-searching =
     .label = 正在搜索语言…
 browser-languages-downloading =
     .label = 正在下载…
 browser-languages-select-language =
     .label = 选择要添加的语言…
--- a/browser/browser/preferences/permissions.ftl
+++ b/browser/browser/preferences/permissions.ftl
@@ -75,16 +75,19 @@ permissions-exceptions-etp-window =
     .style = { permissions-window.style }
 permissions-exceptions-etp-desc = 你已关闭对下列网站的保护。
 
 ## Exceptions - Cookies
 
 permissions-exceptions-cookie-window =
     .title = 例外 - Cookie 和网站数据
     .style = { permissions-window.style }
+permissions-exceptions-cookie-window2 =
+    .title = 例外 - Cookie 和网站数据
+    .style = { permissions-window2.style }
 permissions-exceptions-cookie-desc = 您可以指定一律允许或不允许哪些网站使用 Cookie 和网站数据。请输入所要指定的完整网址,然后点击“阻止”、“在这次浏览期间允许”或“允许”。
 
 ## Exceptions - HTTPS-Only Mode
 
 permissions-exceptions-https-only-window =
     .title = 例外 - HTTPS-Only 模式
     .style = { permissions-window.style }
 permissions-exceptions-https-only-desc = 您可以关闭特定网站的 HTTPS-Only 模式。{ -brand-short-name } 将不再尝试将这些网站的连接升级为安全的 HTTPS。“例外”不会应用至隐私窗口。
@@ -99,16 +102,19 @@ permissions-exceptions-popup-window2 =
     .style = { permissions-window2.style }
 permissions-exceptions-popup-desc = 您可以指定哪些网站可以打开弹出式窗口。请输入所要指定的完整网址,然后点击“允许”。
 
 ## Exceptions - Saved Logins
 
 permissions-exceptions-saved-logins-window =
     .title = 例外 - 已保存的登录信息
     .style = { permissions-window.style }
+permissions-exceptions-saved-logins-window2 =
+    .title = 例外 - 已保存的登录信息
+    .style = { permissions-window2.style }
 permissions-exceptions-saved-logins-desc = 下列网站的登录信息将不被保存
 
 ## Exceptions - Add-ons
 
 permissions-exceptions-addons-window =
     .title = 有特殊权限的网站 - 附加组件安装
     .style = { permissions-window.style }
 permissions-exceptions-addons-window2 =