am 98a810d8: am 8a6077ce: am f994bd37: am 8bf124f0: (-s ours) am ae812451: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '98a810d8ad8a968136eb7fa2d5c8ca7b25a08f28':
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9b1392b..497fdc2 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -20,7 +20,7 @@
<string name="table_screensaver_name" msgid="1150228032617397055">"Jedwali la Picha"</string>
<string name="flipper_screensaver_name" msgid="6988572107391523141">"Fremu ya Picha"</string>
<string name="posts_album_name" msgid="5628151551239729515">"Picha kutoka kwenye Machapisho"</string>
- <string name="uploads_album_name" msgid="4057519060978630370">"Vipakiaji vya Papo hapo"</string>
+ <string name="uploads_album_name" msgid="4057519060978630370">"Vipakiwa vya papo hapo"</string>
<string name="unknown_album_name" msgid="2135521368192091267">"Albamu Isiyo na Jina"</string>
<string name="stock_photo_album_name" msgid="3150527596227525460">"Picha za Akiba"</string>
<string name="local_source_name" msgid="6487253091085518505">"Picha katika Kifaa"</string>
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>
