Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
Change-Id: Ib543768946e7401314efbcdeba0fd0ee8df31583
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 535b29c..37fcd70 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -357,9 +357,9 @@
<string name="pref_video_quality_entry_high" msgid="1613578418842803393">"Alta"</string>
<string name="pref_video_quality_entry_qcif" msgid="1717816794399266216">"QCIF"</string>
<string name="pref_video_quality_entry_cif" msgid="645414019445016434">"CIF"</string>
- <string name="pref_video_quality_entry_480p" msgid="5880250731066854583">"SD 480 p"</string>
- <string name="pref_video_quality_entry_720p" msgid="4076146428148167262">"HD 720 p"</string>
- <string name="pref_video_quality_entry_1080p" msgid="4539958891524211120">"HD 1080 p"</string>
+ <string name="pref_video_quality_entry_480p" msgid="5880250731066854583">"SD 480p"</string>
+ <string name="pref_video_quality_entry_720p" msgid="4076146428148167262">"HD 720p"</string>
+ <string name="pref_video_quality_entry_1080p" msgid="4539958891524211120">"HD 1080p"</string>
<string name="pref_video_quality_entry_qvga" msgid="342600517453781430">"QVGA"</string>
<string name="pref_video_quality_entry_2160p" msgid="4522927631413184505">"UHD de 4K"</string>
<string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s megapíxeles"</string>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 215098c..3dfd5fa 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -347,7 +347,7 @@
<string name="setting_back_camera_video" msgid="5220819479408164689">"Video ya kamera ya nyuma"</string>
<string name="setting_front_camera_photo" msgid="4131886734622868637">"Picha ya kamera ya mbele"</string>
<string name="setting_front_camera_video" msgid="2178799452805359752">"Video ya kamera ya mbele"</string>
- <string name="setting_default_camera" msgid="6954076799301004779">"Kamera ya chaguo msingi"</string>
+ <string name="setting_default_camera" msgid="6954076799301004779">"Kamera ya chaguomsingi"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Usaidizi na maoni"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"Inachakata HDR+ ..."</string>
<string name="open_source_licenses" msgid="2169711954264883060">"Leseni za programu huria"</string>