am 67436bf1: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '67436bf1a195bc7b5ad4e6f3e7fbf5f5d889642e':
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index ceb215a..9ab7cf4 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -79,7 +79,7 @@
<string name="permdesc_install_shortcut" msgid="8634424803272077038">"Allows an app to add shortcuts without user intervention."</string>
<string name="permlab_uninstall_shortcut" msgid="7696645932555926449">"uninstall shortcuts"</string>
<string name="permdesc_uninstall_shortcut" msgid="274355570620220977">"Allows the app to remove shortcuts without user intervention."</string>
- <string name="permlab_read_settings" msgid="3452408290738106747">"read Home settings and short cuts"</string>
+ <string name="permlab_read_settings" msgid="3452408290738106747">"read Home settings and shortcuts"</string>
<string name="permdesc_read_settings" msgid="5788109303585403679">"Allows an app to read the settings and shortcuts in Home."</string>
<string name="permlab_write_settings" msgid="1360567537236705628">"write Home settings and shortcuts"</string>
<string name="permdesc_write_settings" msgid="8530105489115785531">"Allows the app to change the settings and shortcuts in Home."</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index fe30775..d35e284 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -83,7 +83,7 @@
<string name="permdesc_read_settings" msgid="5788109303585403679">"允许应用读取主屏幕中的设置和快捷方式。"</string>
<string name="permlab_write_settings" msgid="1360567537236705628">"写入主屏幕的设置和快捷方式"</string>
<string name="permdesc_write_settings" msgid="8530105489115785531">"允许应用更改主屏幕中的设置和快捷方式。"</string>
- <string name="gadget_error_text" msgid="8359351016167075858">"载入小部件时出现问题"</string>
+ <string name="gadget_error_text" msgid="8359351016167075858">"加载小部件时出现问题"</string>
<string name="uninstall_system_app_text" msgid="6429814133777046491">"这是系统应用，无法卸载。"</string>
<string name="dream_name" msgid="2847171357608437154">"Rocket Launcher"</string>
<string name="folder_hint_text" msgid="8633351560105748141">"未命名文件夹"</string>