sync fennec aurora FENNEC_14_0b1_BUILD2 FENNEC_14_0b1_BUILD3 FENNEC_14_0b1_RELEASE FENNEC_14_0b2_BUILD1 FENNEC_14_0b2_RELEASE FENNEC_14_0b3_BUILD1 FENNEC_14_0b3_BUILD2 FENNEC_14_0b3_RELEASE FENNEC_14_0b4_BUILD1 FENNEC_14_0b4_RELEASE FENNEC_14_0b5_BUILD1 FENNEC_14_0b5_RELEASE
authorShaohua Wen <shaohua.wen@gmail.com>
Thu, 03 May 2012 22:05:17 +0800
changeset 404 f760728bf43225862da726c88e5eb72435a9a72f
parent 403 aeb723a727310fcc2e823c75992fdf7badf31c12
child 405 54e0c89e3c18c30c51ab3c9eeda32c5be1cdc9fd
child 407 d72ea5717c8e0fe9da52a876bffb486b5829ae99
child 408 54a5005c6443a926215f8a701a2cdd23329ac2fb
child 410 68af3629284940152bd9beb9c05e0d8d84899196
child 411 e865f502d66d70d85a7104c3b50169e4cbd56779
child 412 a9df9c34dc620110af136e8b0a915327d0b16ad7
child 413 0565c4d350b9b91d079ceb29258cff3e57f8687c
child 414 ee65032675c550c95d3e03e1989b6294d0086318
child 415 9ebbd9330c5f895a74a95d4c16e5b00b571db23b
child 616 a69b440927986cb1875621cf41c92344c3605714
push id74
push usershaohua.wen@gmail.com
push dateThu, 03 May 2012 14:05:25 +0000
sync fennec aurora
mobile/android/base/sync_strings.dtd
mobile/android/chrome/about.dtd
mobile/android/chrome/aboutApps.dtd
mobile/android/chrome/aboutApps.properties
mobile/android/chrome/aboutDownloads.dtd
mobile/android/chrome/aboutDownloads.properties
mobile/android/chrome/browser.properties
mobile/android/chrome/webapps.dtd
mobile/overrides/netError.dtd
mobile/xul/chrome/about.dtd
--- a/mobile/android/base/sync_strings.dtd
+++ b/mobile/android/base/sync_strings.dtd
@@ -64,9 +64,12 @@
 <!ENTITY bookmarks.folder.places.label ''>
 <!ENTITY bookmarks.folder.tags.label '标签'>
 <!ENTITY bookmarks.folder.toolbar.label '书签工具栏'>
 <!ENTITY bookmarks.folder.unfiled.label '未分类书签'>
 <!ENTITY bookmarks.folder.desktop.label '桌面书签'>
 <!ENTITY bookmarks.folder.mobile.label '移动书签'>
 
 <!-- Notification strings -->
-<!ENTITY sync.notification.oneaccount.label '仅支持一个 &syncBrand.fullName.label; 帐号。'>
\ No newline at end of file
+<!ENTITY sync.notification.oneaccount.label '仅支持一个 &syncBrand.fullName.label; 帐号。'>
+
+<!-- Incorrect settings and changing credentials. -->
+<!ENTITY sync.new.recoverykey.status.incorrect '恢复密钥不正确。请重试。'>
--- a/mobile/android/chrome/about.dtd
+++ b/mobile/android/chrome/about.dtd
@@ -1,9 +1,13 @@
 <!ENTITY aboutPage.title                        "关于 &brandShortName;">
+<!ENTITY aboutPage.warningVersion               "&brandShortName; 是实验性的,可能不稳定。">
+<!ENTITY aboutPage.telemetryStart               " 它会自动回传有关性能、硬件、使用情况和定制的信息到 ">
+<!ENTITY aboutPage.telemetryMozillaLink         "&vendorShortName;">
+<!ENTITY aboutPage.telemetryEnd                 " 以帮助 &brandShortName; 变得更好。">
 <!ENTITY aboutPage.checkForUpdates.link         "检查更新»">
 <!ENTITY aboutPage.checkForUpdates.checking     "查找更新…">
 <!ENTITY aboutPage.checkForUpdates.none         "没有可用的更新">
 <!ENTITY aboutPage.checkForUpdates.found        "有可用更新">
 <!ENTITY aboutPage.faq.label                    "常见问题">
 <!ENTITY aboutPage.support.label                "支持">
 <!ENTITY aboutPage.privacyPolicy.label          "隐私条款">
 <!ENTITY aboutPage.rights.label                 "了解您的权利">
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutApps.dtd
@@ -0,0 +1,8 @@
+<!ENTITY aboutApps.title "您的应用">
+
+<!-- LOCALIZATION NOTE (aboutApps.noApps.pre): include a trailing space as needed -->
+<!-- LOCALIZATION NOTE (aboutApps.noApps.middle): avoid leading/trailing spaces, this text is a link -->
+<!-- LOCALIZATION NOTE (aboutApps.noApps.post): include a starting space as needed -->
+<!ENTITY aboutApps.noApps.pre "还未安装 Web 应用。获取一些,从 ">
+<!ENTITY aboutApps.noApps.middle "应用商店">
+<!ENTITY aboutApps.noApps.post ".">
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutApps.properties
@@ -0,0 +1,2 @@
+appsContext.uninstall=卸载
+appsContext.shortcut=添加到主屏幕
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutDownloads.dtd
@@ -0,0 +1,3 @@
+<!ENTITY aboutDownloads.title                      "下载项">
+<!ENTITY aboutDownloads.header                     "您的下载">
+<!ENTITY aboutDownloads.empty                      "没有下载">
new file mode 100644
--- /dev/null
+++ b/mobile/android/chrome/aboutDownloads.properties
@@ -0,0 +1,2 @@
+downloadAction.open=打开
+downloadAction.remove=删除
--- a/mobile/android/chrome/browser.properties
+++ b/mobile/android/chrome/browser.properties
@@ -220,20 +220,29 @@ stacktrace.anonymousFunction=<匿名>
 stacktrace.outputMessage=跟踪 %S 堆栈,函数 %S,行 %S。
 timer.start=%S: 计时器开始
 
 # LOCALIZATION NOTE (timer.end):
 # This string is used to display the result of the console.timeEnd() call.
 # %1$S=name of timer, %2$S=number of milliseconds
 timer.end=%1$S: %2$Sms
 
+# Webapps
+webapps.installTitle=安装应用
+
 # Click to play plugins
-clickToPlayPlugins.message=此页面包含插件内容。您想要播放它吗?
+clickToPlayPlugins.message1=%S 包含插件内容。您想要播放吗?
 clickToPlayPlugins.yes=是
 clickToPlayPlugins.no=否
+# LOCALIZATION NOTE (clickToPlayPlugins.dontAskAgain): This label appears next to a
+# checkbox to indicate whether or not the user wants to make a permanent decision.
+clickToPlayPlugins.dontAskAgain=不再询问此网站
+# LOCALIZATION NOTE (clickToPlayPlugins.playPlugins): Label that
+# will be used in site settings dialog.
+clickToPlayPlugins.playPlugins=播放插件
 
 # Site settings dialog
 # LOCALIZATION NOTE (siteSettings.labelToValue): This string will be used to
 # dislay a list of current permissions settings for a site.
 # Example: "Store Offline Data: Allow"
 siteSettings.labelToValue=%S: %S
 
 masterPassword.incorrect=错误的密码
deleted file mode 100644
--- a/mobile/android/chrome/webapps.dtd
+++ /dev/null
@@ -1,7 +0,0 @@
-<!ENTITY webapps.title.placeholder "输入标题">
-<!ENTITY webapps.permissions "允许访问:">
-<!ENTITY webapps.perm.geolocation "方位感知浏览">
-<!ENTITY webapps.perm.offline "离线数据存储">
-<!ENTITY webapps.perm.notifications "桌面通知">
-<!ENTITY webapps.perm.requestedHint "(已请求)">
-<!ENTITY webapps.add-homescreen "添加到主屏幕">
--- a/mobile/overrides/netError.dtd
+++ b/mobile/overrides/netError.dtd
@@ -28,17 +28,17 @@
   <li>请检查文件是否被移动,重命名或者删除。</li>
 </ul>
 ">
 
 
 <!ENTITY generic.title "哎呀。">
 <!ENTITY generic.longDesc "<p>&brandShortName; 因未知原因无法载入此页面。</p>">
 
-<!ENTITY malformedURI.title "非法地址">
+<!ENTITY malformedURI.title "无效的地址">
 <!ENTITY malformedURI.longDesc "
 <ul>
   <li>网页地址通常格式为
     <strong>http://www.example.com/</strong></li>
   <li>请确认您使用了正斜杠 (即
     <strong>/</strong>).</li>
 </ul>
 ">
--- a/mobile/xul/chrome/about.dtd
+++ b/mobile/xul/chrome/about.dtd
@@ -1,9 +1,13 @@
 <!ENTITY aboutPage.title                        "关于 &brandShortName;">
+<!ENTITY aboutPage.warningVersion               "&brandShortName; 是实验性的,可能不稳定。">
+<!ENTITY aboutPage.telemetryStart               " 它会自动回传有关性能、硬件、使用情况和定制的信息到 ">
+<!ENTITY aboutPage.telemetryMozillaLink         "&vendorShortName;">
+<!ENTITY aboutPage.telemetryEnd                 " 以帮助 &brandShortName; 变得更好。">
 <!ENTITY aboutPage.faq.label                    "常见问题">
 <!ENTITY aboutPage.support.label                "支持">
 <!ENTITY aboutPage.privacyPolicy.label          "隐私条款">
 <!ENTITY aboutPage.rights.label                 "了解您的权利">
 <!ENTITY aboutPage.relNotes.label               "发行说明">
 <!ENTITY aboutPage.credits.label                "贡献者">
 <!ENTITY aboutPage.checkForUpdates.button       "检查更新">
 <!ENTITY aboutPage.checkForUpdates.checking     "查找更新…">