Merge changes I0d44e948,I1db7a972 into eclair
* changes:
Fix 2260199 - App icons placed in folder widget are doubled after rebooting phone.
Fix bug 2261637 - Workspace previews home screens on long pressing at the bottom of app drawer
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>