commit b40d29cb41c302387b2794b214fe2522073d957d
author Android (Google) Code Review <android-gerrit@google.com> Tue Nov 17 08:30:02 2009 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Nov 17 08:30:02 2009 -0800
tree 5a96f247e1882d8ea37a27c409d9e20b206e8e6d
parent 71a3228be6b4a060999fd5832b06691f639ef42f
parent 478730f3c1d6e5c4d02d9a620e8b0accee4218b8

Merge change I478730f3 into eclair

* changes:
  fix 2261526 - Trackball doesn't work in 3D all-apps if you opened it using trackball

res/values-zh-rCN/strings.xml

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ba3cc8a..9e78e7e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -15,8 +15,7 @@
 -->
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- no translation found for application_name (8424725141379931883) -->
-    <skip />
+    <string name="application_name" msgid="8424725141379931883">"启动程序"</string>
     <string name="uid_name" msgid="3371120195364560632">"Android 核心应用程序"</string>
     <string name="folder_name" msgid="4588446541914685904">"文件夹"</string>
     <string name="chooser_wallpaper" msgid="5988031014201479733">"选择壁纸来源"</string>