Merge change Iead6e21b into eclair

* changes:
  Clean up live wallpaper picker list.
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 631c417..c30ee75 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -17,14 +17,11 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="application_name" msgid="4119979710394894209">"动态壁纸选择器"</string>
     <string name="live_wallpaper_picker_title" msgid="7738370557178100072">"动态壁纸"</string>
-    <!-- no translation found for live_wallpaper_preview_title (1130080613611954763) -->
-    <skip />
+    <string name="live_wallpaper_preview_title" msgid="1130080613611954763">"当前壁纸预览"</string>
     <string name="configure_wallpaper" msgid="7396598925806288258">"设置..."</string>
     <string name="wallpaper_instructions" msgid="4215640646180727542">"设置壁纸"</string>
     <string name="live_wallpaper_empty" msgid="4278728108785853407">"无当前壁纸。"</string>
     <string name="set_live_wallpaper" msgid="2381437614949033266">"设置壁纸"</string>
-    <!-- no translation found for wallpaper_title_and_author (8891734217843935304) -->
-    <skip />
-    <!-- no translation found for live_wallpaper_loading (7133792272608415456) -->
-    <skip />
+    <string name="wallpaper_title_and_author" msgid="8891734217843935304">"<xliff:g id="TITLE">%1$s</xliff:g>提供者:<xliff:g id="AUTHOR">%2$s</xliff:g>"</string>
+    <string name="live_wallpaper_loading" msgid="7133792272608415456">"正在载入当前壁纸..."</string>
 </resources>