Fix various message issues

  Bug: 10568697
  Bug: 10589224
  Bug: 10561095
  Bug: 10589353
  Bug: 10570925

Change-Id: I1affdf37d74bef37e099c70775f669ee0ff33acf

1 files changed, 19 insertions, 13 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index cce3b1831..d9fb38c99 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -15,6 +15,7 @@
 -->
 
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- The name of the Android Camera application. [CHAR LIMIT=16] -->
     <string name="app_name">Camera</string>
     <!-- Used to format short video duration in Details dialog. minutes:seconds e.g. 00:30 -->
     <string name="details_ms">%1$02d:%2$02d</string>
@@ -252,27 +253,28 @@
     <!-- Settings screen, Picture size title -->
     <string name="pref_camera_picturesize_title">Picture size</string>
 
-    <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for 13 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_13mp">13M pixels</string>
-    <!-- Settings screen, dialog choice for 8 megapixels picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for 8 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_8mp">8M pixels</string>
-    <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_5mp">5M pixels</string>
-    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_4mp">4M pixels</string>
-    <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_3mp">3M pixels</string>
-    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_2mp">2M pixels</string>
-    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_2mp_wide">2M pixels (16:9)</string>
-    <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for 1.3 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_1_3mp">1.3M pixels</string>
-    <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for 1 megapixels picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_1mp">1M pixels</string>
-    <!-- Settings screen, dialog choice for VGA picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for VGA picture size [CHAR LIMIT=20] -->
     <string name="pref_camera_picturesize_entry_vga">VGA</string>
-    <!-- Settings screen, dialog choice for QVGA picture size [CHAR LIMIT=15] -->
+    <!-- Settings screen, dialog choice for QVGA picture size [CHAR LIMIT=20] -->
+
     <string name="pref_camera_picturesize_entry_qvga">QVGA</string>
 
     <!-- Settings screen, Focus mode title -->
@@ -280,7 +282,9 @@
 
     <!-- Settings screen, Focus mode dialog radio button choices -->
     <string name="pref_camera_focusmode_entry_auto">Auto</string>
+    <!-- A setting that lets the camera focus into infinity. [CHAR LIMIT=20] -->
     <string name="pref_camera_focusmode_entry_infinity">Infinity</string>
+    <!-- A setting that lets the camera operate in macro focus mode for nearby objects. [CHAR LIMIT=20] -->
     <string name="pref_camera_focusmode_entry_macro">Macro</string>
 
     <!-- Menu, focus mode labels [CHAR LIMIT=50] -->
@@ -299,9 +303,11 @@
         <!-- flash label [CHAR LIMIT=50] -->
     <string name="pref_camera_flashmode_label">FLASH MODE</string>
 
-    <!-- Settings screen, Flash mode dialog radio button choices -->
+    <!-- Settings screen, Flash mode 'auto'. [CHAR LIMIT=12] -->
     <string name="pref_camera_flashmode_entry_auto">Auto</string>
+    <!-- Settings screen, Flash mode 'alway on'. [CHAR LIMIT=12] -->
     <string name="pref_camera_flashmode_entry_on">On</string>
+    <!-- Settings screen, Flash mode 'always off'. [CHAR LIMIT=12] -->
     <string name="pref_camera_flashmode_entry_off">Off</string>
 
     <!-- Menu, flash mode labels [CHAR LIMIT=50] -->
@@ -417,7 +423,7 @@
     <!-- The message shown when video record reaches size limit. -->
     <string name="video_reach_size_limit">Size limit reached.</string>
 
-    <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=12] -->
+    <!-- The text shown when the panorama panning speed is to fast [CHAR LIMIT=16] -->
     <string name="pano_too_fast_prompt">Too fast</string>
 
     <!-- The text shown in the progress dialog when panorama preview is generating in the background [CHAR LIMIT=30] -->