summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjumoog <kilianvonpflugk@gmail.com>2014-10-21 22:28:37 +0200
committerKilian von Pflugk <kilianvonpflugk@gmail.com>2014-10-21 20:52:08 +0000
commit34cee56980f16e205a2f9e06389cb29a0167f888 (patch)
tree286b6eaa0083771accd5368840c6f70806da76b4
parentcd9fe44e1a42dcb328772b44c6ca0434a1c7a49f (diff)
downloadandroid_packages_apps_Camera2-34cee56980f16e205a2f9e06389cb29a0167f888.tar.gz
android_packages_apps_Camera2-34cee56980f16e205a2f9e06389cb29a0167f888.tar.bz2
android_packages_apps_Camera2-34cee56980f16e205a2f9e06389cb29a0167f888.zip
Add 16:9 to strings
to calc this you can use this: "=(A1/GCD(A1;B1))&":"&(B1/GCD(A1;B1))" in LibreOffice Change-Id: If298c91ad6c2e7ca8228bb9dda788ebe18e7f30f
-rw-r--r--res/values/arrays.xml14
-rw-r--r--res/values/cm_strings.xml14
2 files changed, 14 insertions, 14 deletions
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 2ff34e3f6..4907faa74 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -177,7 +177,7 @@
<string-array name="pref_camera_picturesize_entries" translatable="false">
<item>@string/pref_camera_picturesize_entry_20_7mp</item>
<item>@string/pref_camera_picturesize_entry_18mp</item>
- <item>@string/pref_camera_picturesize_entry_15_9mp</item>
+ <item>@string/pref_camera_picturesize_entry_15_9mp_wide</item>
<item>@string/pref_camera_picturesize_entry_13mp</item>
<item>@string/pref_camera_picturesize_entry_13mp</item>
<item>@string/pref_camera_picturesize_entry_12_8mp</item>
@@ -187,13 +187,13 @@
<item>@string/pref_camera_picturesize_entry_11_5mp</item>
<item>@string/pref_camera_picturesize_entry_10_4mp</item>
<item>@string/pref_camera_picturesize_entry_10mp</item>
- <item>@string/pref_camera_picturesize_entry_9_7mp</item>
+ <item>@string/pref_camera_picturesize_entry_9_7mp_wide</item>
<item>@string/pref_camera_picturesize_entry_9mp</item>
- <item>@string/pref_camera_picturesize_entry_8_2mp</item>
+ <item>@string/pref_camera_picturesize_entry_8_2mp_wide</item>
<item>@string/pref_camera_picturesize_entry_8mp</item>
<item>@string/pref_camera_picturesize_entry_7_7mp</item>
<item>@string/pref_camera_picturesize_entry_6_4mp</item>
- <item>@string/pref_camera_picturesize_entry_6mp</item>
+ <item>@string/pref_camera_picturesize_entry_6mp_wide</item>
<item>@string/pref_camera_picturesize_entry_6mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
<item>@string/pref_camera_picturesize_entry_5mp</item>
@@ -201,11 +201,11 @@
<item>@string/pref_camera_picturesize_entry_4_5mp</item>
<item>@string/pref_camera_picturesize_entry_4mp_wide</item>
<item>@string/pref_camera_picturesize_entry_4mp</item>
- <item>@string/pref_camera_picturesize_entry_3_7mp</item>
+ <item>@string/pref_camera_picturesize_entry_3_7mp_wide</item>
<item>@string/pref_camera_picturesize_entry_3mp</item>
<item>@string/pref_camera_picturesize_entry_3mp</item>
<item>@string/pref_camera_picturesize_entry_2_5mp</item>
- <item>@string/pref_camera_picturesize_entry_2_1mp</item>
+ <item>@string/pref_camera_picturesize_entry_2_1mp_wide</item>
<item>@string/pref_camera_picturesize_entry_2mp</item>
<item>@string/pref_camera_picturesize_entry_2mp_wide</item>
<item>@string/pref_camera_picturesize_entry_1_9mp</item>
@@ -217,7 +217,7 @@
<item>@string/pref_camera_picturesize_entry_svga</item>
<item>@string/pref_camera_picturesize_entry_wvga</item>
<item>@string/pref_camera_picturesize_entry_vga</item>
- <item>@string/pref_camera_picturesize_entry_nhd</item>
+ <item>@string/pref_camera_picturesize_entry_nhd_wide</item>
<item>@string/pref_camera_picturesize_entry_wqvga</item>
<item>@string/pref_camera_picturesize_entry_qvga</item>
</string-array>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 15c883a37..47911f226 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -20,7 +20,7 @@
<!-- Settings screen, dialog choice for 18 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_18mp">18M pixels</string>
<!-- Settings screen, dialog choice for 15.9 megapixels picture size [CHAR LIMIT=15] -->
- <string name="pref_camera_picturesize_entry_15_9mp">15.9M pixels</string>
+ <string name="pref_camera_picturesize_entry_15_9mp_wide">15.9M pixels (16:9)</string>
<!-- Settings screen, dialog choice for 12.8 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_12_8mp">12.8M pixels</string>
<!-- Settings screen, dialog choice for 12.7 megapixels picture size [CHAR LIMIT=15] -->
@@ -36,27 +36,27 @@
<!-- Settings screen, dialog choice for 10 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_10mp">10M pixels</string>
<!-- Settings screen, dialog choice for 9.7 megapixels picture size [CHAR LIMIT=15] -->
- <string name="pref_camera_picturesize_entry_9_7mp">9.7M pixels</string>
+ <string name="pref_camera_picturesize_entry_9_7mp_wide">9.7M pixels (16:9)</string>
<!-- Settings screen, dialog choice for 9 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_9mp">9M pixels</string>
<!-- Settings screen, dialog choice for 8.2 megapixels picture size [CHAR LIMIT=15] -->
- <string name="pref_camera_picturesize_entry_8_2mp">8.2M pixels</string>
+ <string name="pref_camera_picturesize_entry_8_2mp_wide">8.2M pixels (16:9)</string>
<!-- Settings screen, dialog choice for 7.7 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_7_7mp">7.7M pixels</string>
<!-- Settings screen, dialog choice for 6.4 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_6_4mp">6.4M pixels</string>
<!-- Settings screen, dialog choice for 6 megapixels picture size [CHAR LIMIT=15] -->
- <string name="pref_camera_picturesize_entry_6mp">6M pixels</string>
+ <string name="pref_camera_picturesize_entry_6mp_wide">6M pixels (16:9)</string>
<!-- Settings screen, dialog choice for 4.5 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_4_5mp">4.5M pixels</string>
<!-- 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.7 megapixels picture size [CHAR LIMIT=15] -->
- <string name="pref_camera_picturesize_entry_3_7mp">3.7M pixels</string>
+ <string name="pref_camera_picturesize_entry_3_7mp_wide">3.7M pixels (16:9)</string>
<!-- Settings screen, dialog choice for 2.5 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_2_5mp">2.5M pixels</string>
<!-- Settings screen, dialog choice for 2.1 megapixels picture size [CHAR LIMIT=15] -->
- <string name="pref_camera_picturesize_entry_2_1mp">2.1M pixels</string>
+ <string name="pref_camera_picturesize_entry_2_1mp_wide">2.1M pixels (16:9)</string>
<!-- Settings screen, dialog choice for 1.9 megapixels picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_1_9mp">1.9M pixels</string>
<!-- Settings screen, dialog choice for WXGA picture size [CHAR LIMIT=15] -->
@@ -66,7 +66,7 @@
<!-- Settings screen, dialog choice for SVGA picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_svga">SVGA</string>
<!-- Settings screen, dialog choice for nHD picture size [CHAR LIMIT=15] -->
- <string name="pref_camera_picturesize_entry_nhd">nHD</string>
+ <string name="pref_camera_picturesize_entry_nhd_wide">nHD (16:9)</string>
<!-- Settings screen, dialog choice for WVGA picture size [CHAR LIMIT=15] -->
<string name="pref_camera_picturesize_entry_wvga">WVGA</string>
<!-- Settings screen, dialog choice for WQVGA picture size [CHAR LIMIT=15] -->