commit a978261764bdc18224c67d2f699945c8e598d4f0
author The Android Open Source Project <initial-contribution@android.com> Tue Nov 06 12:40:06 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Tue Nov 06 12:40:06 2012 -0800
tree 152b501788a5279f3baf903dacdd35be984816d0
parent 559b30a10ef57d318caa22c336d912ffc03a6970
parent 56b45f79ba56644dff55c19459dbd59bc6850e9a

am 56b45f79: (-s ours) Reconcile with jb-mr1.1-release - do not merge

* commit '56b45f79ba56644dff55c19459dbd59bc6850e9a':

res/values-zh-rCN/strings.xml

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 08e628a..f10bbf7 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,7 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name" msgid="6441943862284988546">"照片屏幕保护程序"</string>
-    <string name="table_screensaver_name" msgid="1150228032617397055">"照片表格"</string>
+    <string name="table_screensaver_name" msgid="1150228032617397055">"照片桌面"</string>
     <string name="flipper_screensaver_name" msgid="6988572107391523141">"相框"</string>
     <string name="posts_album_name" msgid="5628151551239729515">"信息中的照片"</string>
     <string name="uploads_album_name" msgid="4057519060978630370">"即时上传"</string>