merge in mnc-dr-ryu-release history after reset to mnc-dr-ryu-dev
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 20fde56..99fe58f 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -81,7 +81,7 @@
<string name="device_owner_error_installation_failed" msgid="684566845601079360">"برنامه سرپرستی نصب نشد"</string>
<string name="device_owner_error_package_not_installed" msgid="6095079346537408556">"برنامه سرپرستی روی دستگاهتان نصب نشده است"</string>
<string name="profile_owner_cancel_message" msgid="6868736915633023477">"راهاندازی متوقف شود؟"</string>
- <string name="profile_owner_cancel_cancel" msgid="1035206963979858009">"خیر"</string>
+ <string name="profile_owner_cancel_cancel" msgid="1035206963979858009">"نه"</string>
<string name="profile_owner_cancel_ok" msgid="4915817426681209592">"بله"</string>
<string name="profile_owner_cancelling" msgid="5679573829145112822">"در حال لغو…"</string>
<string name="work_profile_setup_later_title" msgid="9069148190226279892">"راهاندازی متوقف شود؟"</string>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 5b0636a..4f4e194 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -96,6 +96,6 @@
<string name="setup_device_start_setup" msgid="4351340224000741826">"設定您的裝置：開始設定"</string>
<string name="setup_device_encryption" msgid="7852944465414197103">"設定您的裝置：加密"</string>
<string name="setup_device_progress" msgid="7035335208571175393">"設定您的裝置：正在顯示進度"</string>
- <string name="learn_more_label" msgid="2723716758654655009">"暸解詳情按鈕"</string>
+ <string name="learn_more_label" msgid="2723716758654655009">" 瞭解詳情按鈕"</string>
<string name="mdm_icon_label" msgid="3399134595549660561">"<xliff:g id="ICON_LABEL">%1$s</xliff:g>圖示"</string>
</resources>
