Merge branch 'cm-11.0' of https://github.com/CyanogenMod/android_pack…

…ages_apps_Camera2 into cd-4.4
CyanDreamProject · May 13, 2014 · ec4078d · ec4078d
2 parents e3c810d + 6d84132
commit ec4078d
Show file tree

Hide file tree

Showing 55 changed files with 676 additions and 251 deletions.
diff --git a/res/values-af/cm_caf.xml b/res/values-af/cm_caf.xml
@@ -16,5 +16,5 @@
      limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_picturesize_entry_12mp">12M pixels</string>
+  <string name="pref_camera_picturesize_entry_12mp">12 M pieksels</string>
 </resources>
diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml
@@ -16,23 +16,23 @@
      limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_picturesize_entry_20_7mp">20.7M pixels</string>
-  <string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12.8M pixels</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12.7M pixels</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11.5M pixels</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10.4M pixels</string>
-  <string name="pref_camera_picturesize_entry_10mp">10M pixels</string>
-  <string name="pref_camera_picturesize_entry_9mp">9M pixels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8.2M pixels</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7M pixels (4x3)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4M pixels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M pixels</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4.5M pixels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3.7M pixels</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2.5M pixels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2.1M pixels</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1.9M pixels</string>
+  <string name="pref_camera_picturesize_entry_20_7mp">20.7 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_18mp">18 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_12_8mp">12.8 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_12_7mp">12.7 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_11_5mp">11.5 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_10_4mp">10.4 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_10mp">10 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_9mp">9 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_8_2mp">8.2 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_7_7mp">7.7 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_6_4mp">6.4 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_6mp">6 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_4_5mp">4.5 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_3_7mp">3.7 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_2_5mp">2.5 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_2_1mp">2.1 M pieksels</string>
+  <string name="pref_camera_picturesize_entry_1_9mp">1.9 M pieksels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>

diff --git a/res/values-ar/cm_caf.xml b/res/values-ar/cm_caf.xml
@@ -16,5 +16,5 @@
      limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_picturesize_entry_12mp">12 ميجا بكسل</string>
+  <string name="pref_camera_picturesize_entry_12mp">12 ميغا بكسل</string>
 </resources>
diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml
@@ -17,17 +17,17 @@
 -->
 <resources>
   <string name="pref_camera_picturesize_entry_20_7mp">20.7 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 ميجا بكسل</string>
+  <string name="pref_camera_picturesize_entry_18mp">18 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_12_8mp">12.8 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_12_7mp">12.7 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_11_5mp">11.5 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_10_4mp">10.4 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_10mp">10 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_9mp">9  ميغابكسل</string>
+  <string name="pref_camera_picturesize_entry_9mp">9 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_8_2mp">8.2 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7.7 ميغا بكسل (4:3)</string>
+  <string name="pref_camera_picturesize_entry_7_7mp">7.7 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6.4 ميغا بكسل</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 ميجا بكسل</string>
+  <string name="pref_camera_picturesize_entry_6mp">6 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4.5 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_3_7mp">3.7 ميغا بكسل</string>
   <string name="pref_camera_picturesize_entry_2_5mp">2.5 ميغا بكسل</string>

diff --git a/res/values-ca/cm_caf.xml b/res/values-ca/cm_caf.xml
@@ -16,5 +16,5 @@
      limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_picturesize_entry_12mp">12M píxels</string>
+  <string name="pref_camera_picturesize_entry_12mp">12 Mp</string>
 </resources>
diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml
@@ -16,23 +16,23 @@
      limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7M píxels</string>
-  <string name="pref_camera_picturesize_entry_18mp">18M píxels</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8M píxels</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7M píxels</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5M píxels</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4M píxels</string>
-  <string name="pref_camera_picturesize_entry_10mp">10M píxels</string>
-  <string name="pref_camera_picturesize_entry_9mp">9M píxels</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2M píxels</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7M píxels (4:3)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6.4M píxels</string>
-  <string name="pref_camera_picturesize_entry_6mp">6M píxels</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5M píxels</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7M píxels</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5M píxels</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1M píxels</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9M píxels</string>
+  <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mp</string>
+  <string name="pref_camera_picturesize_entry_18mp">18 Mp</string>
+  <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mp</string>
+  <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mp</string>
+  <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mp</string>
+  <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mp</string>
+  <string name="pref_camera_picturesize_entry_10mp">10 Mp</string>
+  <string name="pref_camera_picturesize_entry_9mp">9 Mp</string>
+  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mp</string>
+  <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mp</string>
+  <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mp</string>
+  <string name="pref_camera_picturesize_entry_6mp">6 Mp</string>
+  <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mp</string>
+  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mp</string>
+  <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mp</string>
+  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mp</string>
+  <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mp</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>

diff --git a/res/values-ca/qcomstrings.xml b/res/values-ca/qcomstrings.xml
@@ -45,13 +45,13 @@
   <string name="pref_camera_selectablezoneaf_entry_centerweighted">Ponderada al centre</string>
   <string name="pref_camera_selectablezoneaf_entry_frameaverage">Mitjana del marc</string>
   <string name="pref_camera_zsl_entry_off">Desactivat</string>
-  <string name="pref_camera_zsl_entry_on">Encés</string>
+  <string name="pref_camera_zsl_entry_on">Encès</string>
   <string name="pref_camera_video_hdr_entry_off">Desactivat</string>
-  <string name="pref_camera_video_hdr_entry_on">Encés</string>
+  <string name="pref_camera_video_hdr_entry_on">Encès</string>
   <string name="pref_camera_video_hdr_title">Vídeo HDR</string>
   <string name="pref_camera_facedetection_title">Detecció de cares</string>
   <string name="pref_camera_facedetection_entry_off">Desactivat</string>
-  <string name="pref_camera_facedetection_entry_on">Encés</string>
+  <string name="pref_camera_facedetection_entry_on">Encès</string>
   <string name="pref_camera_redeyereduction_title">Reducció d\'ulls vermells</string>
   <string name="pref_camera_redeyereduction_entry_enable">Activa</string>
   <string name="pref_camera_redeyereduction_entry_disable">Desactiva</string>
@@ -62,7 +62,7 @@
   <string name="error_app_unsupported_hdr_zsl">HDR no suportat en el mode zsl</string>
   <string name="pref_camera_ae_bracket_hdr_entry_ae_bracket">AE-Bracket</string>
   <string name="pref_camera_ae_bracket_hdr_title">Bracketing Auto Exposició</string>
-  <string name="pref_camera_ae_bracket_hdr_entry_on">Encés</string>
+  <string name="pref_camera_ae_bracket_hdr_entry_on">Encès</string>
   <string name="pref_camera_ae_bracket_hdr_entry_off">Desactivat</string>
   <string name="err_app_unsupport_ae_bracket_code">Ara no hi ha suport per AE bracket per part de les Apps</string>
   <string name="snapshot_lower_than_video">La mida de la captura de vídeo és més baixa que la mida del vídeo. Redimensionant a la mida del vídeo. Si us plau selecciona una resolució més gran o igual a la mida del vídeo actual.</string>
@@ -75,7 +75,7 @@
   <string name="pref_camera_hfr_entry_4x">120 FPS</string>
   <string name="pref_camera_denoise_title">Mode de neteja de soroll d\'ondeta</string>
   <string name="pref_camera_denoise_entry_off">Desactivat</string>
-  <string name="pref_camera_denoise_entry_on">Encés</string>
+  <string name="pref_camera_denoise_entry_on">Encès</string>
   <string name="pref_camera_iso_title">ISO</string>
   <string name="pref_camera_iso_entry_auto">Auto</string>
   <string name="pref_camera_iso_entry_isodeblur">Auto (HJR)</string>
@@ -107,13 +107,13 @@
   <string name="pref_camera_coloreffect_entry_greentint">Tinta verda</string>
   <string name="pref_camera_touchafaec_title">AF/AEC tàctil</string>
   <string name="pref_camera_touchafaec_entry_off">No</string>
-  <string name="pref_camera_touchafaec_entry_on">Si</string>
+  <string name="pref_camera_touchafaec_entry_on">Sí</string>
   <string name="pref_camera_dis_title">Estabilització d\'imatge digital</string>
   <string name="pref_camera_dis_entry_off">No</string>
-  <string name="pref_camera_dis_entry_on">Si</string>
+  <string name="pref_camera_dis_entry_on">Sí</string>
   <string name="pref_camera_facerc_title">Reconeixement de cares</string>
   <string name="pref_camera_facerc_entry_off">No</string>
-  <string name="pref_camera_facerc_entry_on">Si</string>
+  <string name="pref_camera_facerc_entry_on">Sí</string>
   <string name="pref_camera_sharpness_entry_level0">Nivell 0</string>
   <string name="pref_camera_sharpness_entry_level1">Nivell 1</string>
   <string name="pref_camera_sharpness_entry_level2">Nivell 2 (Predefinit)</string>
@@ -163,6 +163,6 @@
   <string name="pref_camera_focusmode_entry_continuous">Continu</string>
   <string name="pref_camera_scenedetect_title">Auto Detecció d\'Escenes</string>
   <string name="pref_camera_scenedetect_entry_off">Desactivat</string>
-  <string name="pref_camera_scenedetect_entry_on">Encés</string>
+  <string name="pref_camera_scenedetect_entry_on">Encès</string>
   <string name="time_lapse_error">Mida del vídeo invàlida per a la gravació time-lapse.</string>
 </resources>
diff --git a/res/values-cs/cm_caf.xml b/res/values-cs/cm_caf.xml
@@ -16,5 +16,5 @@
      limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_picturesize_entry_12mp">12Mpx</string>
+  <string name="pref_camera_picturesize_entry_12mp">12 Mpx</string>
 </resources>
diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml
@@ -16,23 +16,23 @@
      limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7Mpx</string>
-  <string name="pref_camera_picturesize_entry_18mp">18Mpx</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8Mpx</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7Mpx</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5Mpx</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4Mpx</string>
-  <string name="pref_camera_picturesize_entry_10mp">10Mpx</string>
-  <string name="pref_camera_picturesize_entry_9mp">9Mpx</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2Mpx</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7Mpx (4:3)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4Mpx</string>
-  <string name="pref_camera_picturesize_entry_6mp">6Mpx</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5Mpx</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7Mpx</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5Mpx</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1Mpx</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9Mpx</string>
+  <string name="pref_camera_picturesize_entry_20_7mp">20,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_18mp">18 Mpx</string>
+  <string name="pref_camera_picturesize_entry_12_8mp">12,8 Mpx</string>
+  <string name="pref_camera_picturesize_entry_12_7mp">12,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_11_5mp">11,5 Mpx</string>
+  <string name="pref_camera_picturesize_entry_10_4mp">10,4 Mpx</string>
+  <string name="pref_camera_picturesize_entry_10mp">10 Mpx</string>
+  <string name="pref_camera_picturesize_entry_9mp">9 Mpx</string>
+  <string name="pref_camera_picturesize_entry_8_2mp">8,2 Mpx</string>
+  <string name="pref_camera_picturesize_entry_7_7mp">7,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_6_4mp">6,4 Mpx</string>
+  <string name="pref_camera_picturesize_entry_6mp">6 Mpx</string>
+  <string name="pref_camera_picturesize_entry_4_5mp">4,5 Mpx</string>
+  <string name="pref_camera_picturesize_entry_3_7mp">3,7 Mpx</string>
+  <string name="pref_camera_picturesize_entry_2_5mp">2,5 Mpx</string>
+  <string name="pref_camera_picturesize_entry_2_1mp">2,1 Mpx</string>
+  <string name="pref_camera_picturesize_entry_1_9mp">1,9 Mpx</string>
   <string name="pref_camera_scenemode_entry_antimotionblur">Redukce rozmazání</string>
   <string name="pref_camera_scenemode_entry_aqua">Voda</string>
   <string name="pref_camera_scenemode_entry_ar">Rozšířená realita</string>

diff --git a/res/values-da/cm_caf.xml b/res/values-da/cm_caf.xml
@@ -16,5 +16,5 @@
      limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_picturesize_entry_12mp">12 megapixel</string>
+  <string name="pref_camera_picturesize_entry_12mp">12 megapixels</string>
 </resources>
diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml
@@ -16,23 +16,23 @@
      limitations under the License.
 -->
 <resources>
-  <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapixel</string>
-  <string name="pref_camera_picturesize_entry_18mp">18 megapixel</string>
-  <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapixel</string>
-  <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapixel</string>
-  <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapixel</string>
-  <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_10mp">10 megapixel</string>
-  <string name="pref_camera_picturesize_entry_9mp">9 megapixel</string>
-  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixel</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixel (4:3)</string>
-  <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixel</string>
-  <string name="pref_camera_picturesize_entry_6mp">6 megapixel</string>
-  <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixel</string>
-  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixel</string>
-  <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixel</string>
-  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixel</string>
-  <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixel</string>
+  <string name="pref_camera_picturesize_entry_20_7mp">20,7 megapixels</string>
+  <string name="pref_camera_picturesize_entry_18mp">18 megapixels</string>
+  <string name="pref_camera_picturesize_entry_12_8mp">12,8 megapixels</string>
+  <string name="pref_camera_picturesize_entry_12_7mp">12,7 megapixels</string>
+  <string name="pref_camera_picturesize_entry_11_5mp">11,5 megapixels</string>
+  <string name="pref_camera_picturesize_entry_10_4mp">10,4 megapixels</string>
+  <string name="pref_camera_picturesize_entry_10mp">10 megapixels</string>
+  <string name="pref_camera_picturesize_entry_9mp">9 megapixels</string>
+  <string name="pref_camera_picturesize_entry_8_2mp">8,2 megapixels</string>
+  <string name="pref_camera_picturesize_entry_7_7mp">7,7 megapixels</string>
+  <string name="pref_camera_picturesize_entry_6_4mp">6,4 megapixels</string>
+  <string name="pref_camera_picturesize_entry_6mp">6 megapixels</string>
+  <string name="pref_camera_picturesize_entry_4_5mp">4,5 megapixels</string>
+  <string name="pref_camera_picturesize_entry_3_7mp">3,7 megapixels</string>
+  <string name="pref_camera_picturesize_entry_2_5mp">2,5 megapixels</string>
+  <string name="pref_camera_picturesize_entry_2_1mp">2,1 megapixels</string>
+  <string name="pref_camera_picturesize_entry_1_9mp">1,9 megapixels</string>
   <string name="pref_camera_picturesize_entry_wxga">WXGA</string>
   <string name="pref_camera_picturesize_entry_xga">XGA</string>
   <string name="pref_camera_picturesize_entry_svga">SVGA</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
@@ -120,7 +120,7 @@
     <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapixels"</string>
     <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapixels"</string>
     <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapixels"</string>
-    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string>
+    <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixels"</string>
     <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixels"</string>
     <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixels (16:9)"</string>
     <string name="pref_camera_picturesize_entry_1_5mp" msgid="7089801019442294745">"1,5 megapixels"</string>

diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml
@@ -25,7 +25,7 @@
   <string name="pref_camera_picturesize_entry_10mp">10 MP</string>
   <string name="pref_camera_picturesize_entry_9mp">9 MP</string>
   <string name="pref_camera_picturesize_entry_8_2mp">8,2 MP</string>
-  <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP (4:3)</string>
+  <string name="pref_camera_picturesize_entry_7_7mp">7,7 MP</string>
   <string name="pref_camera_picturesize_entry_6_4mp">6,4 MP</string>
   <string name="pref_camera_picturesize_entry_6mp">6 MP</string>
   <string name="pref_camera_picturesize_entry_4_5mp">4,5 MP</string>