Format the megapixel value on the start screen same as settings.

  Bug: 14955075

Change-Id: I1a57a0f9c884ce62cae97c77323c19c390fe2ee7

29 files changed, 64 insertions, 60 deletions

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2b9dd0575..12e2d6f3d 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Edita amb"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"SEGÜENT"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"D\'ACORD"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d megapíxel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d megapíxel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s megapíxel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s megapíxel \n(16:9)"</string>
 </resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index d67c2b309..739b5bae0 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Upravit ve službě"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"DALŠÍ"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK, ROZUMÍM"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Mpx \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Mpx \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Mpx \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Mpx \n(16:9)"</string>
 </resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b3034009a..22aee220f 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Rediger med"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"NÆSTE"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK, FORSTÅET"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d megapixel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d megapixel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s megapixel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s megapixel \n(16:9)"</string>
 </resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 8ef0813f2..357c3bf4d 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Bearbeiten mit"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"Weiter"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Megapixel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Megapixel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Megapixel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Megapixel \n(16:9)"</string>
 </resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 0316ddeaa..37d9b6e79 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Επεξεργασία με"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"ΕΠΟΜΕΝΟ"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"ΤΟ ΚΑΤΑΛΑΒΑ"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Megapixel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Megapixel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Megapixel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Megapixel \n(16:9)"</string>
 </resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index c2a340404..768f4c092 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Edit with"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"NEXT"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK, GOT IT"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Megapixel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Megapixel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Megapixel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Megapixel \n(16:9)"</string>
 </resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index c2a340404..768f4c092 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Edit with"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"NEXT"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK, GOT IT"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Megapixel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Megapixel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Megapixel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Megapixel \n(16:9)"</string>
 </resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index ee909a55c..1f14d80e2 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Editar con"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"SIGUIENTE"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"ENTENDIDO"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d MP \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d MP \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s MP \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s MP \n(16:9)"</string>
 </resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 54245e90b..147e02689 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Editar con"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"SIGUIENTE"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"ENTENDIDO"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d MP \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d MP \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s MP \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s MP \n(16:9)"</string>
 </resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml
index 0cbfeb8a8..88a84dc84 100644
--- a/res/values-et-rEE/strings.xml
+++ b/res/values-et-rEE/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Muutmine:"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"JÄRGMINE"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK, SELGE"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d MP \n(4 : 3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d MP \n(16 : 9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s MP \n(4 : 3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s MP \n(16 : 9)"</string>
 </resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index d75b137e1..185aca7f0 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Modifier avec"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"SUIVANT"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d mégapixels \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d mégapixels \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s mégapixels \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s mégapixels \n(16:9)"</string>
 </resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index a4838aee8..c1204f998 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"इससे संपादित करें:"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"अगला"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"ठीक है, समझ लिया"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d मेगापिक्सल \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d मेगापिक्सल \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s मेगापिक्सल \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s मेगापिक्सल \n(16:9)"</string>
 </resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 6e7f55029..8cacfd2e8 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Szerkesztés a következővel"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"KÖVETKEZŐ"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"RENDBEN, ÉRTEM"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d megapixel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d megapixel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s megapixel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s megapixel \n(16:9)"</string>
 </resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index c1c51ff3c..60875e503 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Modifica con"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"AVANTI"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Megapixel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Megapixel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Megapixel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Megapixel \n(16:9)"</string>
 </resources>
diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml
index 28e87de67..8daabb023 100644
--- a/res/values-km-rKH/strings.xml
+++ b/res/values-km-rKH/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"កែសម្រួល​ជាមួយ"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"បន្ទាប់"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"យល់​ហើយ"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d មេហ្គាភីកសែល \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d មេហ្គាភីកសែល \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s មេហ្គាភីកសែល \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s មេហ្គាភីកសែល \n(16:9)"</string>
 </resources>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml
index b2738313c..e38c70b18 100644
--- a/res/values-lo-rLA/strings.xml
+++ b/res/values-lo-rLA/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"​ແກ້​ໄຂ​ໃນ"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"​ຕໍ່​ໄປ"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"ໂອເຄ, ເຂົ້າໃຈແລ້ວ"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d ​ລ້ານ​ພິກ​ເຊວ \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d ລ້ານ​ພິກ​ເຊວ \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s ​ລ້ານ​ພິກ​ເຊວ \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s ລ້ານ​ພິກ​ເຊວ \n(16:9)"</string>
 </resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 82769c137..40ac46e40 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Redaguoti naudojant"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"KITAS"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"GERAI, SUPRATAU"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d megapiks.\n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d megapiks.\n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s megapiks.\n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s megapiks.\n(16:9)"</string>
 </resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 1d1203c10..c619d0781 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Rediģēt ar:"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"TĀLĀK"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"LABI, SAPRATU!"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d megapikseļi\n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d megapikseļi\n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s megapikseļi\n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s megapikseļi\n(16:9)"</string>
 </resources>
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml
index 51b9aee83..8f61f7c25 100644
--- a/res/values-mn-rMN/strings.xml
+++ b/res/values-mn-rMN/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Засварлах"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"ДАРААХ"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"ТИЙМ, ОЙЛГОЛОО"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Мегапиксел \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Мегапиксел \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Мегапиксел \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Мегапиксел \n(16:9)"</string>
 </resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index bec620ded..20b7d681d 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Rediger med"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"NESTE"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK, SKJØNNER."</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Megapiksel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Megapiksel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Megapiksel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Megapiksel \n(16:9)"</string>
 </resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 2d37bec38..c234f32f2 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Bewerken met"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"VOLGENDE"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d megapixel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d megapixel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s megapixel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s megapixel \n(16:9)"</string>
 </resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 11ad8328e..ac131b04c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Edytuj"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"DALEJ"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Mpx \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Mpx \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Mpx \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Mpx \n(16:9)"</string>
 </resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 45109800c..62de1c85b 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Editar com"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"SEGUINTE"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK, JÁ PERCEBI"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Megapíxel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Megapíxel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Megapíxel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Megapíxel \n(16:9)"</string>
 </resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 47dc558e3..37b7fa738 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Redigera med"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"NÄSTA"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"OK, JAG FÖRSTÅR"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d megapixel \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d megapixel \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s megapixel \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s megapixel \n(16:9)"</string>
 </resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 684419e70..2efb9f509 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Чим редагувати:"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"ДАЛІ"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"ЗРОЗУМІЛО"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Мпікс. \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Мпікс. \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Мпікс. \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Мпікс. \n(16:9)"</string>
 </resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 3aea7c744..1110aa4d5 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"使用以下選擇器編輯："</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"下一頁"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"好，我明白了"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d 百萬像素 \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d 百萬像素 \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s 百萬像素 \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s 百萬像素 \n(16:9)"</string>
 </resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 3ef0e1124..9e0612b28 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -373,6 +373,6 @@
     <string name="edit_with" msgid="615569327230783971">"Hlela nge-"</string>
     <string name="startup_dialog_button_next" msgid="1011831256978228993">"OKULANDELAYO"</string>
     <string name="confirm_button_text" msgid="7389949384482206814">"KULUNGILE, NGIYITHOLILE"</string>
-    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%d Megaphikiseli \n(4:3)"</string>
-    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%d Megaphikiseli \n(16:9)"</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio" msgid="6975319610522670241">"%s Megaphikiseli \n(4:3)"</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio" msgid="2855896529748779201">"%s Megaphikiseli \n(16:9)"</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 913f095c5..955c58fbb 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -913,9 +913,9 @@ CHAR LIMIT=NONE] -->
     <string name="confirm_button_text">OK, GOT IT</string>
 
     <!-- Text on the photo size selection page for the megapixel count of the 4:3 picture size. [CHAR LIMIT=20] -->
-    <string name="megapixel_text_for_4x3_aspect_ratio">%d Megapixel \n(4:3)</string>
+    <string name="megapixel_text_for_4x3_aspect_ratio">%s Megapixel \n(4:3)</string>
 
     <!-- Text on the photo size selection page for the megapixel count of the 16:9 picture size. [CHAR LIMIT=20] -->
-    <string name="megapixel_text_for_16x9_aspect_ratio">%d Megapixel \n(16:9)</string>
+    <string name="megapixel_text_for_16x9_aspect_ratio">%s Megapixel \n(16:9)</string>
 
  </resources>
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 43a921c82..69701e332 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -89,6 +89,7 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.ref.WeakReference;
+import java.text.DecimalFormat;
 import java.util.List;
 import java.util.Vector;
 
@@ -123,6 +124,8 @@ public class PhotoModule
 
     private static final String DEBUG_IMAGE_PREFIX = "DEBUG_";
 
+    private static DecimalFormat sMegaPixelFormat = new DecimalFormat("##0.0");
+
     private CameraActivity mActivity;
     private CameraProxy mCameraDevice;
     private int mCameraId;
@@ -476,6 +479,7 @@ public class PhotoModule
         if (locationPrompt) {
             // Show both location and aspect ratio selection dialog.
             mUI.showLocationAndAspectRatioDialog(new LocationDialogCallback(){
+                @Override
                 public void onLocationTaggingSelected(boolean selected) {
                     settingsManager.setLocation(selected, mActivity.getLocationManager());
                 }
@@ -529,8 +533,6 @@ public class PhotoModule
                 }
             }
         }
-        aspectRatio16x9Resolution /= 1000000;
-        aspectRatio4x3Resolution /= 1000000;
 
         // Use the largest 4x3 and 16x9 sizes as candidates for picture size selection.
         final Size size4x3ToSelect = largestSize4x3;
@@ -538,9 +540,11 @@ public class PhotoModule
 
         Resources res = mAppController.getAndroidContext().getResources();
         final String aspectRatio4x3Text = res.getString(
-                R.string.megapixel_text_for_4x3_aspect_ratio, aspectRatio4x3Resolution);
+                R.string.megapixel_text_for_4x3_aspect_ratio,
+                sMegaPixelFormat.format(aspectRatio4x3Resolution / 1e6));
         final String aspectRatio16x9Text = res.getString(
-                R.string.megapixel_text_for_16x9_aspect_ratio, aspectRatio16x9Resolution);
+                R.string.megapixel_text_for_16x9_aspect_ratio,
+                sMegaPixelFormat.format(aspectRatio16x9Resolution / 1e6));
 
         AspectRatioDialogCallback callback = new AspectRatioDialogCallback() {
             @Override