From 203aba2c71c2bf3a557a5ecf6ed3ed10142d35e3 Mon Sep 17 00:00:00 2001 From: Wilhelm Fitzpatrick Date: Fri, 14 Nov 2014 16:31:35 -0800 Subject: CameraNext: dynamically generate available photo resolutions Instead of depending on a large matching table, generated the list of picture sizes to show to the user directly from the supported list returned by the camera. The list is filtered to remove uselessly small resolutions on modern devices, to group resolutions by aspect ratio, and to filter out fairly similar sizes. Change-Id: I47a67a89786543baec133cf7e71df9819793ebac --- res/values-af/cm_strings.xml | 129 +--------------- res/values-am/cm_strings.xml | 64 -------- res/values-ar/cm_strings.xml | 119 +-------------- res/values-as-rIN/cm_strings.xml | 118 --------------- res/values-ast-rES/cm_strings.xml | 118 --------------- res/values-az-rAZ/cm_strings.xml | 64 -------- res/values-be/cm_strings.xml | 118 --------------- res/values-bg/cm_strings.xml | 128 ---------------- res/values-bn-rBD/cm_strings.xml | 64 -------- res/values-br-rFR/cm_strings.xml | 64 -------- res/values-bs-rBA/cm_strings.xml | 64 -------- res/values-ca/cm_strings.xml | 129 +--------------- res/values-cs/cm_strings.xml | 129 +--------------- res/values-csb-rPL/cm_strings.xml | 64 -------- res/values-cy/cm_strings.xml | 64 -------- res/values-da/cm_strings.xml | 129 +--------------- res/values-de/cm_strings.xml | 129 +--------------- res/values-el/cm_strings.xml | 129 +--------------- res/values-en-rAU/cm_strings.xml | 64 -------- res/values-en-rGB/cm_strings.xml | 64 -------- res/values-en-rIN/cm_strings.xml | 64 -------- res/values-en-rPT/cm_strings.xml | 64 -------- res/values-eo/cm_strings.xml | 64 -------- res/values-es-rCO/cm_strings.xml | 64 -------- res/values-es-rMX/cm_strings.xml | 118 --------------- res/values-es-rUS/cm_strings.xml | 128 ---------------- res/values-es/cm_strings.xml | 129 +--------------- res/values-et-rEE/cm_strings.xml | 64 -------- res/values-eu-rES/cm_strings.xml | 128 ---------------- res/values-fa/cm_strings.xml | 64 -------- res/values-fi/cm_strings.xml | 129 +--------------- res/values-fil-rPH/cm_strings.xml | 64 -------- res/values-fr-rCA/cm_strings.xml | 64 -------- res/values-fr/cm_strings.xml | 125 +--------------- res/values-frp-rIT/cm_strings.xml | 64 -------- res/values-fy-rNL/cm_strings.xml | 64 -------- res/values-ga-rIE/cm_strings.xml | 64 -------- res/values-gd-rGB/cm_strings.xml | 64 -------- res/values-gl-rES/cm_strings.xml | 128 ---------------- res/values-gu-rIN/cm_strings.xml | 118 --------------- res/values-hi/cm_strings.xml | 64 -------- res/values-hr/cm_strings.xml | 128 ---------------- res/values-hu/cm_strings.xml | 129 +--------------- res/values-hy-rAM/cm_strings.xml | 64 -------- res/values-in/cm_strings.xml | 129 +--------------- res/values-is-rIS/cm_strings.xml | 64 -------- res/values-it/cm_strings.xml | 129 +--------------- res/values-iw/cm_strings.xml | 129 +--------------- res/values-ja/cm_strings.xml | 129 +--------------- res/values-ka-rGE/cm_strings.xml | 64 -------- res/values-kk-rKZ/cm_strings.xml | 64 -------- res/values-km-rKH/cm_strings.xml | 64 -------- res/values-kn-rIN/cm_strings.xml | 118 --------------- res/values-ko/cm_strings.xml | 119 +-------------- res/values-ku/cm_strings.xml | 65 +-------- res/values-ky-rKG/cm_strings.xml | 64 -------- res/values-lb/cm_strings.xml | 124 +--------------- res/values-lo-rLA/cm_strings.xml | 64 -------- res/values-lt/cm_strings.xml | 65 +-------- res/values-lv/cm_strings.xml | 65 +-------- res/values-mk-rMK/cm_strings.xml | 64 -------- res/values-ml-rIN/cm_strings.xml | 118 --------------- res/values-mn-rMN/cm_strings.xml | 64 -------- res/values-mr-rIN/cm_strings.xml | 118 --------------- res/values-ms-rMY/cm_strings.xml | 64 -------- res/values-my-rMM/cm_strings.xml | 64 -------- res/values-nb/cm_strings.xml | 129 +--------------- res/values-ne-rNP/cm_strings.xml | 64 -------- res/values-nl/cm_strings.xml | 129 +--------------- res/values-oc-rFR/cm_strings.xml | 64 -------- res/values-or-rIN/cm_strings.xml | 118 --------------- res/values-pa-rIN/cm_strings.xml | 64 -------- res/values-pl/cm_strings.xml | 129 +--------------- res/values-pt-rBR/cm_strings.xml | 129 +--------------- res/values-pt-rPT/cm_strings.xml | 129 +--------------- res/values-rm/cm_strings.xml | 64 -------- res/values-ro/cm_strings.xml | 129 +--------------- res/values-ru/cm_strings.xml | 129 +--------------- res/values-si-rLK/cm_strings.xml | 64 -------- res/values-sk/cm_strings.xml | 129 +--------------- res/values-sl/cm_strings.xml | 128 ---------------- res/values-sq-rAL/cm_strings.xml | 64 -------- res/values-sr/cm_strings.xml | 129 +--------------- res/values-sv/cm_strings.xml | 129 +--------------- res/values-sw/cm_strings.xml | 64 -------- res/values-ta-rIN/cm_strings.xml | 118 --------------- res/values-te-rIN/cm_strings.xml | 120 --------------- res/values-th/cm_strings.xml | 119 +-------------- res/values-tr/cm_strings.xml | 129 +--------------- res/values-ug/cm_strings.xml | 118 --------------- res/values-uk/cm_strings.xml | 64 -------- res/values-ur-rPK/cm_strings.xml | 64 -------- res/values-uz-rUZ/cm_strings.xml | 64 -------- res/values-vi/cm_strings.xml | 118 --------------- res/values-zh-rCN/cm_strings.xml | 130 +---------------- res/values-zh-rHK/cm_strings.xml | 66 +-------- res/values-zh-rTW/cm_strings.xml | 130 +---------------- res/values-zu/cm_strings.xml | 64 -------- res/values/arrays.xml | 152 ------------------- res/values/cm_strings.xml | 144 ++---------------- res/values/config.xml | 2 + res/xml/camera_preferences.xml | 4 +- res/xml/video_preferences.xml | 4 +- src/com/android/camera/CameraSettings.java | 226 ++++++++++++++++++++++++++--- src/com/android/camera/util/MultiMap.java | 45 ++++++ 105 files changed, 310 insertions(+), 9610 deletions(-) create mode 100644 src/com/android/camera/util/MultiMap.java diff --git a/res/values-af/cm_strings.xml b/res/values-af/cm_strings.xml index ed0597515..6050a0c58 100644 --- a/res/values-af/cm_strings.xml +++ b/res/values-af/cm_strings.xml @@ -16,136 +16,9 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ + (%1$s) %2$1.1f M pieksels Verminder vervaag beweging Aqua Augmented realiteit diff --git a/res/values-am/cm_strings.xml b/res/values-am/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-am/cm_strings.xml +++ b/res/values-am/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-ar/cm_strings.xml b/res/values-ar/cm_strings.xml index 8f7aaa14f..764ed62e2 100644 --- a/res/values-ar/cm_strings.xml +++ b/res/values-ar/cm_strings.xml @@ -16,128 +16,11 @@ limitations under the License. --> - - 21 ميجا بيكسل - - 20.7 ميجابايت - - 20.1 ميجابايت (16:9) - - - 18 ميجا بيكسل - - 16.2 ميجابايت (16:9) - - 16.1 ميجابايت (16:9) - - - 16 ميجابايت - - 15.9 ميجابايت (16:9) - - - 13 ميجابايت - - 12.8 ميجا بيكسل - - 12.7 ميجا بيكسل - - 12.6 ميجابايت - - - 12.2 ميجابايت - - - 12 ميجابايت - - 11.9 ميجابايت (16:9) - - 11.9 ميجابايت - - 11.5 ميجابايت - - 10.4 ميجابايت - - 10 ميجابايت - - 9.7 ميجابايت (16:9) - - - 9.4 ميجابايت (16:9) - - - 9 ميجابايت - - 8.9 ميجابايت - - 8.2 ميجابايت (16:9) - - 8 ميجابايت - - 7.7 ميجابايت - - 7.5 ميجابايت (16:9) - - 6.4 ميجابايت - - - 6 ميجابايت (16:9) - - - 5 ميجابايت - - 4.5 ميجابايت - - 4 ميجابايت (16:9) - - 4 ميجابايت - - 3.7 ميجابايت (16:9) - - 3 ميجابايت - - 2.5 ميجابايت (16:9) - - 2.5 ميجابايت - - 2.1 ميجابايت (16:9) - - 2 ميجابايت (16:9) - - 2 ميجابايت - - 1.9 ميجابايت - - 1.6 ميجابايت - - 1.5 ميجابايت - - 1.3 ميجابايت - - - 1.2 ميجابايت (16:9) - - 1 ميجابايت - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ خفض عدم وضوح الحركة أكوا + (%1$s) %2$1.1f ميغا بكسل واقع بزيادة أفضل لقطة رضيع diff --git a/res/values-as-rIN/cm_strings.xml b/res/values-as-rIN/cm_strings.xml index 0ea04f3f7..c66644915 100644 --- a/res/values-as-rIN/cm_strings.xml +++ b/res/values-as-rIN/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA মেক্ৰ’+ মোচন দাগ, অস্পষ্ট হ্ৰাসকৰণ diff --git a/res/values-ast-rES/cm_strings.xml b/res/values-ast-rES/cm_strings.xml index 15e392534..3c3089e7c 100644 --- a/res/values-ast-rES/cm_strings.xml +++ b/res/values-ast-rES/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ Reductor de desenfoque diff --git a/res/values-az-rAZ/cm_strings.xml b/res/values-az-rAZ/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-az-rAZ/cm_strings.xml +++ b/res/values-az-rAZ/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-be/cm_strings.xml b/res/values-be/cm_strings.xml index 696e43837..380ae78a7 100644 --- a/res/values-be/cm_strings.xml +++ b/res/values-be/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 МП - - 20,7 Мп - - 20,1 Мп (16:9) - - - 18 Мп - - 16,2 Мп (16:9) - - 16,1 Мп (16:9) - - - 16 Мп - - 15,9 Мп (16:9) - - - 13 Мп - - 12,8 Мп - - 12,7 Мп - - 12,6 Мп - - - 12.2 МП - - - 12 Мп - - 11.9 МП (16:9) - - 11,9 Мп - - 11,5 Мп - - 10,4 Мп - - 10 Мп - - 9,7 Мп (16:9) - - - 9,4 Мп (16:9) - - - 9 Мп - - 8.9 МП - - 8,2 Мп (16:9) - - 8 Мп - - 7,7 Мп - - 7,5 Мп (16:9) - - 6,4 Мп - - - 6 Мп (16:9) - - - 5 Мп - - 4,5 Мп - - 4 Мп (16:9) - - 4 Мп - - 3,7 Мп (16:9) - - 3 Мп - - 2,5 Мп (16:9) - - 2,5 Мп - - 2,1 Мп (16:9) - - 2 Мп (16:9) - - 2 Мп - - 1,9 Мп - - 1.6 МП - - 1,5 Мп - - 1,3 Мп - - - 1.2 МП (16:9) - - 1 Мп - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Макра+ Зменшыць размыццё падчас руху diff --git a/res/values-bg/cm_strings.xml b/res/values-bg/cm_strings.xml index 1d47ccebc..c79d55219 100644 --- a/res/values-bg/cm_strings.xml +++ b/res/values-bg/cm_strings.xml @@ -16,134 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 2.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.2 MP (16:9) - - 12.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12.7 MP - - 12,6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 2.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Макро+ Намаляване на замъгляването diff --git a/res/values-bn-rBD/cm_strings.xml b/res/values-bn-rBD/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-bn-rBD/cm_strings.xml +++ b/res/values-bn-rBD/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-br-rFR/cm_strings.xml b/res/values-br-rFR/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-br-rFR/cm_strings.xml +++ b/res/values-br-rFR/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-bs-rBA/cm_strings.xml b/res/values-bs-rBA/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-bs-rBA/cm_strings.xml +++ b/res/values-bs-rBA/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-ca/cm_strings.xml b/res/values-ca/cm_strings.xml index e1ea4e9ef..a8950561d 100644 --- a/res/values-ca/cm_strings.xml +++ b/res/values-ca/cm_strings.xml @@ -16,136 +16,9 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ + (%1$s) %2$1.1f Mp Reducció del difuminat del moviment Aigua Realitat augmentada diff --git a/res/values-cs/cm_strings.xml b/res/values-cs/cm_strings.xml index 0d77bac01..535722b99 100644 --- a/res/values-cs/cm_strings.xml +++ b/res/values-cs/cm_strings.xml @@ -16,136 +16,9 @@ limitations under the License. --> - - 21 Mpx - - 20,7 Mpx - - 20,1 Mpx (16:9) - - 20 Mpx (16:9) - - 18 Mpx - - 16,2 Mpx (16:9) - - 16,1 Mpx (16:9) - - 16,1 Mpx - - 16 Mpx - - 15,9 Mpx (16:9) - - 15 Mpx - - 13 Mpx - - 12,8 Mpx - - 12,7 Mpx - - 12,6 Mpx - - 12,2 Mpx (1:1) - - 12,2 Mpx - - 12,1 MP (16:9) - - 12 Mpx - - 11,9 Mpx (16:9) - - 11,9 Mpx - - 11,5 Mpx - - 10,4 Mpx - - 10 Mpx - - 9,7 Mpx (16:9) - - 9,6 Mpx (16:9) - - 9,4 Mpx (16:9) - - 9 Mpx (1:1) - - 9 Mpx - - 8,9 Mpx - - 8,2 Mpx (16:9) - - 8 Mpx - - 7,7 Mpx - - 7,5 Mpx (16:9) - - 6,4 Mpx - - 6 Mpx (1:1) - - 6 Mpx (16:9) - - 5 Mpx (1:1) - - 5 Mpx - - 4,5 Mpx - - 4 Mpx (16:9) - - 4 Mpx - - 3,7 Mpx (16:9) - - 3 Mpx - - 2,5 Mpx (16:9) - - 2,5 Mpx - - 2,1 Mpx (16:9) - - 2 Mpx (16:9) - - 2 Mpx - - 1,9 Mpx - - 1,6 Mpx - - 1,5 Mpx - - 1,3 Mpx - - 1,2 Mpx (1:1) - - 1,2 Mpx (16:9) - - 1 Mpx - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Makro+ + (%1$s) %2$1.1f Mpx Redukce rozmazání Voda Rozšířená realita diff --git a/res/values-csb-rPL/cm_strings.xml b/res/values-csb-rPL/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-csb-rPL/cm_strings.xml +++ b/res/values-csb-rPL/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-cy/cm_strings.xml b/res/values-cy/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-cy/cm_strings.xml +++ b/res/values-cy/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-da/cm_strings.xml b/res/values-da/cm_strings.xml index c7e03d9ba..596bb9a98 100644 --- a/res/values-da/cm_strings.xml +++ b/res/values-da/cm_strings.xml @@ -16,136 +16,9 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Makro+ + (%1$s) %2$1.1f megapixels Reduktion af bevægelsesslør Vand Udvidet virkelighed diff --git a/res/values-de/cm_strings.xml b/res/values-de/cm_strings.xml index 7ef37512d..4ac250d7f 100644 --- a/res/values-de/cm_strings.xml +++ b/res/values-de/cm_strings.xml @@ -16,136 +16,9 @@ limitations under the License. --> - - 21 MP - - 20,7 MP - - 20,1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16,2 MP (16:9) - - 16,1 MP (16:9) - - 16,1 MP - - 16 MP - - 15,9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12,2 MP (1:1) - - 12,2 MP - - 12,1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10,4 MP - - 10 MP - - 9,7 MP (16:9) - - 9,6 MP (16:9) - - 9,4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8,9 MP - - 8,2 MP (16:9) - - 8 MP - - 7,7 MP - - 7,5 MP (16:9) - - 6,4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4,5 MP - - 4 MP (16:9) - - 4 MP - - 3,7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2,5 MP - - 2,1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1,6 MP - - 1,5 MP - - 1,3 MP - - 1,2 MP (1:1) - - 1,2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Makro+ + (%1$s) %2$1.1f MP Bewegungsunschärfe-Reduktion Wasser Erweiterte Realität diff --git a/res/values-el/cm_strings.xml b/res/values-el/cm_strings.xml index e862c86a8..c86e0f18d 100644 --- a/res/values-el/cm_strings.xml +++ b/res/values-el/cm_strings.xml @@ -16,136 +16,9 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Μακροφωτογραφία+ + (%1$s) %2$1.1f MP Μείωση motion blur Νερό Επαυξημένη πραγματικότητα diff --git a/res/values-en-rAU/cm_strings.xml b/res/values-en-rAU/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-en-rAU/cm_strings.xml +++ b/res/values-en-rAU/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-en-rGB/cm_strings.xml b/res/values-en-rGB/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-en-rGB/cm_strings.xml +++ b/res/values-en-rGB/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-en-rIN/cm_strings.xml b/res/values-en-rIN/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-en-rIN/cm_strings.xml +++ b/res/values-en-rIN/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-en-rPT/cm_strings.xml b/res/values-en-rPT/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-en-rPT/cm_strings.xml +++ b/res/values-en-rPT/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-eo/cm_strings.xml b/res/values-eo/cm_strings.xml index 2cc638432..9044e8a76 100644 --- a/res/values-eo/cm_strings.xml +++ b/res/values-eo/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Dokumento diff --git a/res/values-es-rCO/cm_strings.xml b/res/values-es-rCO/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-es-rCO/cm_strings.xml +++ b/res/values-es-rCO/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-es-rMX/cm_strings.xml b/res/values-es-rMX/cm_strings.xml index b1667f34c..ba6857369 100644 --- a/res/values-es-rMX/cm_strings.xml +++ b/res/values-es-rMX/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 2.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro + Reductor de desenfoque diff --git a/res/values-es-rUS/cm_strings.xml b/res/values-es-rUS/cm_strings.xml index ef712748e..df1399a4f 100644 --- a/res/values-es-rUS/cm_strings.xml +++ b/res/values-es-rUS/cm_strings.xml @@ -16,134 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 2.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 6 MP (16:9) - - 4 MP - - 9.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 6 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro + Reductor de desenfoque diff --git a/res/values-es/cm_strings.xml b/res/values-es/cm_strings.xml index c32f61a24..5a258233e 100644 --- a/res/values-es/cm_strings.xml +++ b/res/values-es/cm_strings.xml @@ -16,136 +16,9 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.4 MP (16:9) - - 9.4 MP (16:9) - - 9 P.M. (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ + (%1$s) %2$1.1f MP Reductor de desenfoque Aqua Realidad aumentada diff --git a/res/values-et-rEE/cm_strings.xml b/res/values-et-rEE/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-et-rEE/cm_strings.xml +++ b/res/values-et-rEE/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-eu-rES/cm_strings.xml b/res/values-eu-rES/cm_strings.xml index ee00803c0..03a5b3412 100644 --- a/res/values-eu-rES/cm_strings.xml +++ b/res/values-eu-rES/cm_strings.xml @@ -16,134 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Makro+ Desenfoke murriztailea diff --git a/res/values-fa/cm_strings.xml b/res/values-fa/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-fa/cm_strings.xml +++ b/res/values-fa/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-fi/cm_strings.xml b/res/values-fi/cm_strings.xml index 4449b6dbc..0ba36bf61 100644 --- a/res/values-fi/cm_strings.xml +++ b/res/values-fi/cm_strings.xml @@ -16,136 +16,9 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ + (%1$s) %2$1.1f megapikseliä Liikkeen sumennuksen vähentäminen Vesi Lisätty todellisuus diff --git a/res/values-fil-rPH/cm_strings.xml b/res/values-fil-rPH/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-fil-rPH/cm_strings.xml +++ b/res/values-fil-rPH/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-fr-rCA/cm_strings.xml b/res/values-fr-rCA/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-fr-rCA/cm_strings.xml +++ b/res/values-fr-rCA/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-fr/cm_strings.xml b/res/values-fr/cm_strings.xml index 696c1429b..9cf5b73e2 100644 --- a/res/values-fr/cm_strings.xml +++ b/res/values-fr/cm_strings.xml @@ -16,133 +16,10 @@ limitations under the License. --> - - 21 MP - - 20,7 MP - - 20,1 MP (16:9) - - - 18 MP - - 16,2 MP (16:9) - - 16,1 MP (16:9) - - 16.1 MP - - 16 MP - - 15,9 MP (16:9) - - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12.2 MP (1:1) - - 12,2 MP - - 12.1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10,4 MP - - 10 MP - - 9,7 MP (16:9) - - 9.6 MP (16:9) - - 9,4 MP (16:9) - - - 9 MP - - 8,9 MP - - 8,2 MP (16:9) - - 8 MP - - 7,7 MP - - 7,5 MP (16:9) - - 6,4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - - 5 MP - - 4,5 MP - - 4 MP (16:9) - - 4 MP - - 3,7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2,5 MP - - 2,1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1,6 MP - - 1,5 MP - - 1,3 MP - - 1.2 MP (1:1) - - 1,2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ Réduction du flou de mouvement + (%1$s) %2$1.1f mégapixels Eau Réalité augmentée Meilleure prise diff --git a/res/values-frp-rIT/cm_strings.xml b/res/values-frp-rIT/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-frp-rIT/cm_strings.xml +++ b/res/values-frp-rIT/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-fy-rNL/cm_strings.xml b/res/values-fy-rNL/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-fy-rNL/cm_strings.xml +++ b/res/values-fy-rNL/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-ga-rIE/cm_strings.xml b/res/values-ga-rIE/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-ga-rIE/cm_strings.xml +++ b/res/values-ga-rIE/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-gd-rGB/cm_strings.xml b/res/values-gd-rGB/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-gd-rGB/cm_strings.xml +++ b/res/values-gd-rGB/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-gl-rES/cm_strings.xml b/res/values-gl-rES/cm_strings.xml index 095f308f6..ba9d6a71f 100644 --- a/res/values-gl-rES/cm_strings.xml +++ b/res/values-gl-rES/cm_strings.xml @@ -16,134 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ Redución do desenfoque diff --git a/res/values-gu-rIN/cm_strings.xml b/res/values-gu-rIN/cm_strings.xml index f7af02878..238384267 100644 --- a/res/values-gu-rIN/cm_strings.xml +++ b/res/values-gu-rIN/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.9 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ મોશન બ્લર રિડકશન diff --git a/res/values-hi/cm_strings.xml b/res/values-hi/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-hi/cm_strings.xml +++ b/res/values-hi/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-hr/cm_strings.xml b/res/values-hr/cm_strings.xml index f83a0df5b..a5dbae892 100644 --- a/res/values-hr/cm_strings.xml +++ b/res/values-hr/cm_strings.xml @@ -16,134 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ Redukcija zamagljenja zbog gibanja diff --git a/res/values-hu/cm_strings.xml b/res/values-hu/cm_strings.xml index 5e83cb53a..a92da8c85 100644 --- a/res/values-hu/cm_strings.xml +++ b/res/values-hu/cm_strings.xml @@ -16,136 +16,9 @@ limitations under the License. --> - - 21 MP - - 20,7 MP - - 20,1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16,2 MP (16:9) - - 16,1 MP (16:9) - - 16,1 MP - - 16 MP - - 15,9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12,2 MP (1:1) - - 12,2 MP - - 12,1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10,4 MP - - 10 MP - - 9,7 MP (16:9) - - 9,6 MP (16:9) - - 9,4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8,9 MP - - 8,2 MP (16:9) - - 8 MP - - 7,7 MP - - 7,5 MP (16:9) - - 6,4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4,5 MP - - 4 MP (16:9) - - 4 MP - - 3,7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2,5 MP - - 2,1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1,6 MP - - 1,5 MP - - 1,3 MP - - 1,2 MP (1:1) - - 1,2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Makró+ + (%1$s) %2$1.1f megapixel Elmosódás csökkentés Víz Kiterjesztett valóság diff --git a/res/values-hy-rAM/cm_strings.xml b/res/values-hy-rAM/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-hy-rAM/cm_strings.xml +++ b/res/values-hy-rAM/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-in/cm_strings.xml b/res/values-in/cm_strings.xml index 5158fbe83..8d036bcba 100644 --- a/res/values-in/cm_strings.xml +++ b/res/values-in/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 2.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.2 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.7 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7,7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 6 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 7.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f M piksel Makro+ Reduksi gerakan kabur diff --git a/res/values-is-rIS/cm_strings.xml b/res/values-is-rIS/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-is-rIS/cm_strings.xml +++ b/res/values-is-rIS/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-it/cm_strings.xml b/res/values-it/cm_strings.xml index 63743f49b..b8b16799c 100644 --- a/res/values-it/cm_strings.xml +++ b/res/values-it/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16.9) - - 15 MP - - 13 MP - - 12.8 MP - - 12,7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f Mpixel Macro+ Riduzione sfocatura da movimento diff --git a/res/values-iw/cm_strings.xml b/res/values-iw/cm_strings.xml index 8db36c6dc..203fa124e 100644 --- a/res/values-iw/cm_strings.xml +++ b/res/values-iw/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f מגה פיקסל מאקרו+ הפחתת טשטוש תנועה diff --git a/res/values-ja/cm_strings.xml b/res/values-ja/cm_strings.xml index 813a53fee..6df8ca9ce 100644 --- a/res/values-ja/cm_strings.xml +++ b/res/values-ja/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP（16:9） - - 20 MP（16:9） - - 18 MP - - 16.2 MP（16:9） - - 16.1 MP（16:9） - - 16.1 MP - - 16 MP - - 15.9 MP（16:9） - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP（1:1） - - 12.2 MP - - 12.1 MP（16:9） - - 12 MP - - 11.9 MP（16:9） - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP（16:9） - - 9.6 MP（16:9） - - 9.4 MP（16:9） - - 9 MP（1:1） - - 9 MP - - 8.9 MP - - 8.2 MP（16:9） - - 8 MP - - 7.7 MP - - 7.5 MP（16:9） - - 6.4 MP - - 6 MP（1:1） - - 6 MP（16:9） - - 5 MP（1:1） - - 5 MP - - 4.5 MP - - 4 MP（16:9） - - 4 MP - - 3.7 MP（16:9） - - 3 MP - - 2.5 MP（16:9） - - 2.5 MP - - 2.1 MP（16:9） - - 2 MP（16:9） - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP（1:1） - - 1.2 MP（16:9） - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD（16:9） - - WQVGA - - QVGA + (%1$s) %2$1.1fメガピクセル マクロ+ 被写体ブレ軽減 diff --git a/res/values-ka-rGE/cm_strings.xml b/res/values-ka-rGE/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-ka-rGE/cm_strings.xml +++ b/res/values-ka-rGE/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-kk-rKZ/cm_strings.xml b/res/values-kk-rKZ/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-kk-rKZ/cm_strings.xml +++ b/res/values-kk-rKZ/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-km-rKH/cm_strings.xml b/res/values-km-rKH/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-km-rKH/cm_strings.xml +++ b/res/values-km-rKH/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-kn-rIN/cm_strings.xml b/res/values-kn-rIN/cm_strings.xml index ffc252978..4036df2e3 100644 --- a/res/values-kn-rIN/cm_strings.xml +++ b/res/values-kn-rIN/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA ಮ್ಯಾಕ್ರೋ+ ಚಲನೆ ಮಂದ ಕಡಿತ diff --git a/res/values-ko/cm_strings.xml b/res/values-ko/cm_strings.xml index 2c49321a0..52282b701 100644 --- a/res/values-ko/cm_strings.xml +++ b/res/values-ko/cm_strings.xml @@ -16,124 +16,7 @@ limitations under the License. --> - - 21 메가픽셀 - - 20.7 메가픽셀 - - 20.1 메가픽셀 (16:9) - - - 18 메가픽셀 - - 16.2 메가픽셀 (16:9) - - 16.1 메가픽셀 (16:9) - - - 16 메가픽셀 - - 15.9 메가픽셀 (16:9) - - - 13 메가픽셀 - - 12.8 메가픽셀 - - 12.7 메가픽셀 - - 12.6 메가픽셀 - - - 12.2 메가픽셀 - - - 12 메가픽셀 - - 11.9 메가픽셀 (16:9) - - 11.9 메가픽셀 - - 11.5 메가픽셀 - - 10.4 메가픽셀 - - 10 메가픽셀 - - 9.7 메가픽셀 (16:9) - - - 9.4 메가픽셀 (16:9) - - - 9 메가픽셀 - - 8.9 메가픽셀 - - 8.2 메가픽셀 (16:9) - - 8 메가픽셀 - - 7.7 메가픽셀 - - 7.5 메가픽셀 (16:9) - - 6.4 메가픽셀 - - - 6 메가픽셀 (16:9) - - - 5 메가픽셀 - - 4.5 메가픽셀 - - 4 메가픽셀 (16:9) - - 4 메가픽셀 - - 3.7 메가픽셀 (16:9) - - 3 메가픽셀 - - 2.5 메가픽셀 (16:9) - - 2.5 메가픽셀 - - 2.1 메가픽셀 (16:9) - - 2 메가픽셀 (16:9) - - 2 메가픽셀 - - 1.9 메가픽셀 - - 1.6 메가픽셀 - - 1.5 메가픽셀 - - 1.3 메가픽셀 - - - 1.2 메가픽셀 (16:9) - - 1 메가픽셀 - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.0f만 화소 매크로+ 모션 블러 감소 diff --git a/res/values-ku/cm_strings.xml b/res/values-ku/cm_strings.xml index 44632ce76..0051ab5cc 100644 --- a/res/values-ku/cm_strings.xml +++ b/res/values-ku/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -89,4 +25,5 @@ + (%1$s) %2$1.1f مێگاپێکسڵ diff --git a/res/values-ky-rKG/cm_strings.xml b/res/values-ky-rKG/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-ky-rKG/cm_strings.xml +++ b/res/values-ky-rKG/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-lb/cm_strings.xml b/res/values-lb/cm_strings.xml index 89766f5d1..e1848021d 100644 --- a/res/values-lb/cm_strings.xml +++ b/res/values-lb/cm_strings.xml @@ -16,129 +16,6 @@ limitations under the License. --> - - 21 MP - - 20,7 MP - - 20,1 MP (16:9) - - - 18 MP - - 16,2 MP (16:9) - - 16,1 MP (16:9) - - 16,1 MP - - 16 MP - - 15,9 MP (16:9) - - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12,2 MP (1:1) - - 12,2 MP - - 12,1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10,4 MP - - 10 MP - - 9,7 MP (16:9) - - - 9,4 MP (16:9) - - - 9 MP - - 8,9 MP - - 8,2 MP (16:9) - - 8 MP - - 7,7 MP - - 7,5 MP (16:9) - - 6,4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - - 5 MP - - 4,5 MP - - 4 MP (16:9) - - 4 MP - - 3,7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2,5 MP - - 2,1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1,6 MP - - 1,5 MP - - 1,3 MP - - 1,2 MP (1:1) - - 1,2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ Reduktioun vun der Beweegungsonschäerft @@ -219,4 +96,5 @@ Verschlosszäit Auto-HDR aktivéiert + (%1$s) %2$1.1fM Pixelen diff --git a/res/values-lo-rLA/cm_strings.xml b/res/values-lo-rLA/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-lo-rLA/cm_strings.xml +++ b/res/values-lo-rLA/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-lt/cm_strings.xml b/res/values-lt/cm_strings.xml index 44632ce76..fcddbdd8d 100644 --- a/res/values-lt/cm_strings.xml +++ b/res/values-lt/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -89,4 +25,5 @@ + (%1$s) %2$1.1f MP diff --git a/res/values-lv/cm_strings.xml b/res/values-lv/cm_strings.xml index 44632ce76..552f1553e 100644 --- a/res/values-lv/cm_strings.xml +++ b/res/values-lv/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -89,4 +25,5 @@ + (%1$s) %2$1.1fM punkti diff --git a/res/values-mk-rMK/cm_strings.xml b/res/values-mk-rMK/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-mk-rMK/cm_strings.xml +++ b/res/values-mk-rMK/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-ml-rIN/cm_strings.xml b/res/values-ml-rIN/cm_strings.xml index dc41a90e8..45fc19cea 100644 --- a/res/values-ml-rIN/cm_strings.xml +++ b/res/values-ml-rIN/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 എം പി - - 1.5 MP - - 1.3 MP - - - 1.2 എം പി (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ മോഷൻ ബ്ലര്‍ റിഡക്ഷൻ diff --git a/res/values-mn-rMN/cm_strings.xml b/res/values-mn-rMN/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-mn-rMN/cm_strings.xml +++ b/res/values-mn-rMN/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-mr-rIN/cm_strings.xml b/res/values-mr-rIN/cm_strings.xml index 08ac739cf..978d3efa1 100644 --- a/res/values-mr-rIN/cm_strings.xml +++ b/res/values-mr-rIN/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 एमपी - - 20.7 एमपी - - 20.1 एमपी (16:9) - - - 18 एमपी - - 16.2 एमपी (16:9) - - 16.1 एमपी (16:9) - - - 16 एमपी - - 15.9 एमपी (16:9) - - - 13 एमपी - - 12.8 एमपी - - 12.7 एमपी - - 12.6 एमपी - - - 12.2 MP - - - 12 एमपी - - 11.9 MP (16:9) - - 11.9 एमपी - - 11.5 एमपी - - 10.4 एमपी - - 10 एमपी - - 9.7 एमपी (16:9) - - - 9.4 एमपी (16:9) - - - 9 एमपी - - 8.9 MP - - 8.2 एमपी (16:9) - - 8 एमपी - - 7.7 एमपी - - 7.5 एमपी (16:9) - - 6.4 एमपी - - - 6 एमपी (16:9) - - - 5 एमपी - - 4.5 एमपी - - 4 एमपी (16:9) - - 4 एमपी - - 3.7 एमपी (16:9) - - 3 एमपी - - 2.5 एमपी (16:9) - - 2.5 एमपी - - 2.1 एमपी (16:9) - - 2 एमपी (16:9) - - 2 एमपी - - 1.9 एमपी - - 1.6 MP - - 1.5 एमपी - - 1.3 एमपी - - - 1.2 MP (16:9) - - 1 एमपी - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA मॅक्रो + गती अंधुकता (ब्लर) घट diff --git a/res/values-ms-rMY/cm_strings.xml b/res/values-ms-rMY/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-ms-rMY/cm_strings.xml +++ b/res/values-ms-rMY/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-my-rMM/cm_strings.xml b/res/values-my-rMM/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-my-rMM/cm_strings.xml +++ b/res/values-my-rMM/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-nb/cm_strings.xml b/res/values-nb/cm_strings.xml index a541f78c9..ae5f528e8 100644 --- a/res/values-nb/cm_strings.xml +++ b/res/values-nb/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20,1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16,2 MP (16:9) - - 16,1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12.2 MP (1:1) - - 12,2 MP - - 12.1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10,4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9,4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8,9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7,5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1,6 MP - - 1.5 MP - - 1,3 MP - - 1.2 MP (1:1) - - 1,2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f M piksler Makro + Bevegelsesuskarphet reduksjon diff --git a/res/values-ne-rNP/cm_strings.xml b/res/values-ne-rNP/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-ne-rNP/cm_strings.xml +++ b/res/values-ne-rNP/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-nl/cm_strings.xml b/res/values-nl/cm_strings.xml index e479fc6b0..f62a21042 100644 --- a/res/values-nl/cm_strings.xml +++ b/res/values-nl/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20,7 MP - - 20,1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16,2 MP (16:9) - - 16,1 MP (16:9) - - 16,1 MP - - 16 MP - - 15,9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12,2 MP (1:1) - - 12,2 MP - - 12,1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10,4 MP - - 10 MP - - 9,7 MP (16:9) - - 9,6 MP (16:9) - - 9,4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8,9 MP - - 8,2 MP (16:9) - - 8 MP - - 7,7 MP - - 7,5 MP (16:9) - - 6,4 MP - - 6 megapixel (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4,5 MP - - 4 MP (16:9) - - 4 MP - - 3,7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2,5 MP - - 2,1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1,6 MP - - 1,5 MP - - 1,3 MP - - 1,2 MP (1:1) - - 1,2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f megapixel Macro+ Beweging verscherpen diff --git a/res/values-oc-rFR/cm_strings.xml b/res/values-oc-rFR/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-oc-rFR/cm_strings.xml +++ b/res/values-oc-rFR/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-or-rIN/cm_strings.xml b/res/values-or-rIN/cm_strings.xml index 751432306..bbc7a97ec 100644 --- a/res/values-or-rIN/cm_strings.xml +++ b/res/values-or-rIN/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA ମ୍ୟାକ୍ରୋ+ ମୋସନ୍‍ ବ୍ଲର୍‍ ହ୍ରାସ diff --git a/res/values-pa-rIN/cm_strings.xml b/res/values-pa-rIN/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-pa-rIN/cm_strings.xml +++ b/res/values-pa-rIN/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-pl/cm_strings.xml b/res/values-pl/cm_strings.xml index e62adebc2..f7faec4ba 100644 --- a/res/values-pl/cm_strings.xml +++ b/res/values-pl/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f Mpix Makro+ Redukcja rozmazywania diff --git a/res/values-pt-rBR/cm_strings.xml b/res/values-pt-rBR/cm_strings.xml index c459b25ea..6bd587dc9 100644 --- a/res/values-pt-rBR/cm_strings.xml +++ b/res/values-pt-rBR/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16,1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 16.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f MP Macro+ Redução de borrões de movimento diff --git a/res/values-pt-rPT/cm_strings.xml b/res/values-pt-rPT/cm_strings.xml index 38eae49db..60adf3edc 100644 --- a/res/values-pt-rPT/cm_strings.xml +++ b/res/values-pt-rPT/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20,7 MP - - 20,1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16,2 MP (16:9) - - 16,1 MP (16:9) - - 16,1 MP - - 16 MP - - 15,9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12,2 MP (1:1) - - 12,2 MP - - 12,1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10,4 MP - - 10 MP - - 9,7 MP (16:9) - - 9,6 MP (16:9) - - 9,4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8,9 MP - - 8,2 MP (16:9) - - 8 MP - - 7,7 MP - - 7,5 MP (16:9) - - 6,4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4,5 MP - - 4 MP (16:9) - - 4 MP - - 3,7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2,5 MP - - 2,1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1,6 MP - - 1,5 MP - - 1,3 MP - - 1,2 MP (1:1) - - 1,2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f MP Macro+ Redução da desfocagem de movimento diff --git a/res/values-rm/cm_strings.xml b/res/values-rm/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-rm/cm_strings.xml +++ b/res/values-rm/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-ro/cm_strings.xml b/res/values-ro/cm_strings.xml index 90f071ed0..b83c73eef 100644 --- a/res/values-ro/cm_strings.xml +++ b/res/values-ro/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20,7 MP - - 20,1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16,2 MP (16:9) - - 16,1 MP (16:9) - - 16.1 MP - - 16 MP - - 15,9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12.2 MP (1:1) - - 12,2 MP - - 12.1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10,4 MP - - 10 MP - - 9,7 MP (16:9) - - 9.6 MP (16:9) - - 9,4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8,9 MP - - 8,2 MP (16:9) - - 8 MP - - 7,7 MP - - 7,5 MP (16:9) - - 6,4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4,5 MP - - 4 MP (16:9) - - 4 MP - - 3,7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2,5 MP - - 2,1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1,6 MP - - 1,5 MP - - 1,3 MP - - 1.2 MP (1:1) - - 1,2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1fM pixeli Macro+ Reducere neclaritate de la mișcare diff --git a/res/values-ru/cm_strings.xml b/res/values-ru/cm_strings.xml index c2dc8803a..5ded58fa3 100644 --- a/res/values-ru/cm_strings.xml +++ b/res/values-ru/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 Мп - - 20,7 Мп - - 20,1 Мп (16:9) - - 20 Мп (16:9) - - 18 Мп - - 16,2 Мп (16:9) - - 16,1 Мп (16:9) - - 16,1 Мп - - 16 Мп - - 15,9 Мп (16:9) - - 15 Мп - - 13 Мп - - 12,8 Мп - - 12,7 Мп - - 12,6 Мп - - 12,2 Мп (1:1) - - 12,2 Мп - - 12,1 Мп (16:9) - - 12 Мп - - 11,9 Мп (16:9) - - 11,9 Мп - - 11,5 Мп - - 10,4 Мп - - 10 Мп - - 9,7 Мп (16:9) - - 9,6 Мп (16:9) - - 9,4 Мп (16:9) - - 9 Мп (1:1) - - 9 Мп - - 8,9 Мп - - 8,2 Мп (16:9) - - 8 Мп - - 7,7 Мп - - 7,5 Мп (16:9) - - 6,4 Мп - - 6 Мп (1:1) - - 6 Мп (16:9) - - 5 Мп (1:1) - - 5 Мп - - 4,5 Мп - - 4 Мп (16:9) - - 4 Мп - - 3,7 Мп (16:9) - - 3 Мп - - 2,5 Мп (16:9) - - 2,5 Мп - - 2,1 Мп (16:9) - - 2 Мп (16:9) - - 2 Мп - - 1,9 Мп - - 1.6 МП - - 1,5 Мп - - 1,3 Мп - - 1,2 Мп (1:1) - - 1,2 Мп (16:9) - - 1 Мп - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f Мпикс. Макро+ Устранение разм. движения diff --git a/res/values-si-rLK/cm_strings.xml b/res/values-si-rLK/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-si-rLK/cm_strings.xml +++ b/res/values-si-rLK/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-sk/cm_strings.xml b/res/values-sk/cm_strings.xml index 248f2261e..ec408009e 100644 --- a/res/values-sk/cm_strings.xml +++ b/res/values-sk/cm_strings.xml @@ -16,134 +16,6 @@ limitations under the License. --> - - 21 MP - - 20,7 MP - - 20,1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16,2 MP (16:9) - - 16,2 MP (16:9) - - 16.1 MP - - 16 MP - - 15,9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12.2 MP (1:1) - - 12,2 MP - - 12.1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11,5 MP - - 10,4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9,4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8,9 MP - - 8,2 MP (16:9) - - 8 MP - - 7,7 MP - - 7,5 MP (16:9) - - 6,4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4,5 MP - - 4 MP (16:9) - - 4 MP - - 3,7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2,5 MP - - 2,1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1,6 MP - - 1,5 MP - - 1,3 MP - - 1.2 MP (1:1) - - 1,2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Makro+ Redukcia rozmazania pohybu @@ -226,4 +98,5 @@ Máte povolené rozšírené možnosti fotoaparátu Máte zakázané rozšírené možnosti fotoaparátu + (%1$s) %2$1.1f Mpx diff --git a/res/values-sl/cm_strings.xml b/res/values-sl/cm_strings.xml index 6bd59facd..d5cd50bd6 100644 --- a/res/values-sl/cm_strings.xml +++ b/res/values-sl/cm_strings.xml @@ -16,134 +16,6 @@ limitations under the License. --> - - 21 mio. sl. točk - - 20,7 mio. sl. točk - - (16:9) 20,1 mio. sl. točk - - (16:9) 20 mio. sl. točk - - 18 mio. sl. točk - - (16:9) 16,2 mio. sl. točk - - (16:9) 16,1 mio. sl. točk - - 16,1 mio. sl. točk - - 16 mio. sl. točk - - (16:9) 15,9 mio. sl. točk - - 15 mio. sl. točk - - 13 mio. sl. točk - - 12,8 mio. sl. točk - - 12,7 mio. sl. točk - - 12,6 mio. sl. točk - - (1:1) 12,2 mio. sl. točk - - 12,2 mio. sl. točk - - (16:9) 12,1 mio. sl. točk - - 12 mio. sl. točk - - (16:9) 11,9 mio. sl. točk - - 11,9 mio. sl. točk - - 11,5 mio. sl. točk - - 10,4 mio. sl. točk - - 10 mio. sl. točk - - (16:9) 9,7 mio. sl. točk - - (16:9) 9,6 mio. sl. točk - - (16:9) 9,4 mio. sl. točk - - (1:1) 9 mio. sl. točk - - 9 mio. sl. točk - - 8,9 mio. sl. točk - - (16:9) 8,2 mio. sl. točk - - 8 mio. sl. točk - - 7,7 mio. sl. točk - - (16:9) 7,5 mio. sl. točk - - 6,4 mio. sl. točk - - (1:1) 6 mio. sl. točk - - (16:9) 6 mio. sl. točk - - (1:1) 5 mio. sl. točk - - 5 mio. sl. točk - - 4,5 mio. sl. točk - - (16:9) 4 mio. sl. točk - - 4 mio. sl. točk - - (16:9) 3,7 mio. sl. točk - - 3 mio. sl. točk - - (16:9) 2,5 mio. sl. točk - - 2,5 mio. sl. točk - - (16:9) 2,1 mio. sl. točk - - (16:9) 2 mio. sl. točk - - 2 mio. sl. točk - - 1,9 mio. sl. točk - - 1,6 mio. sl. točk - - 1,5 mio. sl. točk - - 1,3 mio. sl. točk - - (1:1) 1,2 mio. sl. točk - - (16:9) 1,2 mio. sl. točk - - 1 mio. sl. točk - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - (16:9) nHD - - WQVGA - - QVGA Makro+ Zmanjševanje zamegljenosti gibanja diff --git a/res/values-sq-rAL/cm_strings.xml b/res/values-sq-rAL/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-sq-rAL/cm_strings.xml +++ b/res/values-sq-rAL/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-sr/cm_strings.xml b/res/values-sr/cm_strings.xml index bbced0645..a08db4e0d 100644 --- a/res/values-sr/cm_strings.xml +++ b/res/values-sr/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12,7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11.9 MP - - 11,5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9,4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8,9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1.6 MP - - 1,5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f мегапиксела Макро+ Редукција замагљивања покрета diff --git a/res/values-sv/cm_strings.xml b/res/values-sv/cm_strings.xml index 2459f1ef9..e6e100fa7 100644 --- a/res/values-sv/cm_strings.xml +++ b/res/values-sv/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20,7 MP - - 20,1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16,2 MP (16:9) - - 16,1 MP (16:9) - - 16.1 MP - - 16 MP - - 15,9 MP (16:9) - - 15 MP - - 13 MP - - 12,8 MP - - 12,7 MP - - 12,6 MP - - 12.2 MP (1:1) - - 12,2 MP - - 12.1 MP (16:9) - - 12 MP - - 11,9 MP (16:9) - - 11,9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9,7 MP (16:9) - - 9.6 MP (16:9) - - 9,4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8,9 MP - - 8,2 MP (16:9) - - 8 MP - - 7,7 MP - - 7,5 MP (16:9) - - 6,4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4,5 MP - - 4 MP (16:9) - - 4 MP - - 3,7 MP (16:9) - - 3 MP - - 2,5 MP (16:9) - - 2,5 MP - - 2,5 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1,9 MP - - 1,6 MP - - 1,5 MP - - 1,3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f megapixlar Makro+ Reducera rörelseoskärpa diff --git a/res/values-sw/cm_strings.xml b/res/values-sw/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-sw/cm_strings.xml +++ b/res/values-sw/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-ta-rIN/cm_strings.xml b/res/values-ta-rIN/cm_strings.xml index 168cfab32..dccb2060d 100644 --- a/res/values-ta-rIN/cm_strings.xml +++ b/res/values-ta-rIN/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA மேக்ரோ+ நகர்வு தெளிவின்மை குறைப்பு diff --git a/res/values-te-rIN/cm_strings.xml b/res/values-te-rIN/cm_strings.xml index c31ee7b3e..baff55d92 100644 --- a/res/values-te-rIN/cm_strings.xml +++ b/res/values-te-rIN/cm_strings.xml @@ -16,126 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA మాక్రో+ మోషన్ అస్పష్టత తగ్గింపు diff --git a/res/values-th/cm_strings.xml b/res/values-th/cm_strings.xml index dde52b5a8..0399b84a9 100644 --- a/res/values-th/cm_strings.xml +++ b/res/values-th/cm_strings.xml @@ -16,124 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1f ล้านพิกเซล มาโคร+ การลดเบลอจากการเคลื่อนไหว diff --git a/res/values-tr/cm_strings.xml b/res/values-tr/cm_strings.xml index 81dda3eb4..5ddf05dc7 100644 --- a/res/values-tr/cm_strings.xml +++ b/res/values-tr/cm_strings.xml @@ -16,134 +16,7 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 7.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + (%1$s) %2$1.1fM piksel Makro+ Hareket bulanıklığı düşürücü diff --git a/res/values-ug/cm_strings.xml b/res/values-ug/cm_strings.xml index 943d5021d..043c82497 100644 --- a/res/values-ug/cm_strings.xml +++ b/res/values-ug/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 20 مىليون 100 مىڭ پېكسىل - - 20 مىليون 700 مىڭ پېكسىل - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16 مىليون 600 مىڭ پېكسىل(16:9) - - - 16 MP - - 1590 تۈمەن پېكسىل(16:9) - - - 1300 تۈمەن پېكسىل - - 1280 تۈمەن پېكسىل - - 1270 تۈمەن پېكسىل - - 12.6 MP - - - 12 مىليون 200 مىڭ - - - 1200 تۈمەن پېكسىل - - 11 مىليون 900 مىڭ - - 1190 تۈمەن پېكسىل - - 1150 تۈمەن پېكسىل - - 1040 تۈمەن پېكسىل - - 1000 تۈمەن پېكسىل - - 970 تۈمەن پېكسىل(16:9) - - - 9.4 MP (16:9) - - - 900 تۈمەن پېكسىل - - 9 مىليون 900 مىڭ - - 820 تۈمەن پېكسىل(16:9) - - 800 تۈمەن پېكسىل - - 770 تۈمەن پېكسىل - - 7.5 MP (16:9) - - 640 تۈمەن پېكسىل - - - 600 تۈمەن پېكسىل(16:9) - - - 500 تۈمەن پېكسىل - - 450 تۈمەن پېكسىل - - 400 تۈمەن پېكسىل(16:9) - - 400 تۈمەن پېكسىل - - 370 تۈمەن پېكسىل(16:9) - - 300 تۈمەن پېكسىل - - 2.5 MP (16:9) - - 250 تۈمەن پېكسىل - - 210 تۈمەن پېكسىل(16:9) - - 200 تۈمەن پېكسىل(16:9) - - 200 تۈمەن پېكسىل - - 190 تۈمەن پېكسىل - - 1 مىليون 600 مىڭ پېكسىل - - 150 تۈمەن پېكسىل - - 130 تۈمەن پېكسىل - - - 1 مىليون 200 مىڭ پېكسىل (16:9) - - 100 تۈمەن پېكسىل - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA مىكرو ئارلىق+ ھەرىكەتلىك غۇۋالىقنى تۆۋەنلىتىش diff --git a/res/values-uk/cm_strings.xml b/res/values-uk/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-uk/cm_strings.xml +++ b/res/values-uk/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-ur-rPK/cm_strings.xml b/res/values-ur-rPK/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-ur-rPK/cm_strings.xml +++ b/res/values-ur-rPK/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-uz-rUZ/cm_strings.xml b/res/values-uz-rUZ/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-uz-rUZ/cm_strings.xml +++ b/res/values-uz-rUZ/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values-vi/cm_strings.xml b/res/values-vi/cm_strings.xml index 15fb1a4cb..4c95367db 100644 --- a/res/values-vi/cm_strings.xml +++ b/res/values-vi/cm_strings.xml @@ -16,124 +16,6 @@ limitations under the License. --> - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - - 16 MP - - 15.9 MP (16:9) - - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - - 12.2 MP - - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - - 9.4 MP (16:9) - - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - - 6 MP (16:9) - - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA Macro+ Giảm mờ chuyển động diff --git a/res/values-zh-rCN/cm_strings.xml b/res/values-zh-rCN/cm_strings.xml index 6e520ccd3..f5fd20017 100644 --- a/res/values-zh-rCN/cm_strings.xml +++ b/res/values-zh-rCN/cm_strings.xml @@ -16,134 +16,8 @@ limitations under the License. --> - - 2100 万像素 - - 2070 万像素 - - 2010 万像素 (16:9) - - 2000 万像素 (16:9) - - 1800 万像素 - - 1620 万像素 (16:9) - - 1610 万像素 (16:9) - - 1610 万像素 - - 1600 万像素 - - 1590 万像素 (16:9) - - 1500 万像素 - - 1300 万像素 - - 1280 万像素 - - 1270 万像素 - - 1260 万像素 - - 1220 万像素 (1:1) - - 1220 万像素 - - 1210 万像素 (16:9) - - 1200 万像素 - - 1190 万像素 (16:9) - - 1190 万像素 - - 1150 万像素 - - 1040 万像素 - - 1000 万像素 - - 970 万像素 (16:9) - - 960 万像素 (16:9) - - 940 万像素 (16:9) - - 900 万像素 (1:1) - - 900 万像素 - - 890 万像素 - - 820 万像素 (16:9) - - 800 万像素 - - 770 万像素 - - 750 万像素 (16:9) - - 640 万像素 - - 600 万像素 (1:1) - - 600 万像素 (16:9) - - 500 万像素 (1:1) - - 500 万像素 - - 450 万像素 - - 400 万像素 (16:9) - - 400 万像素 - - 370 万像素 (16:9) - - 300 万像素 - - 250 万像素 (16:9) - - 250 万像素 - - 210 万像素 (16:9) - - 200 万像素 (16:9) - - 200 万像素 - - 190 万像素 - - 160 万像素 - - 150 万像素 - - 130 万像素 - - 120 万像素 (1:1) - - 120 万像素 (16:9) - - 100 万像素 - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + + (%1$s) %2$1.0f 万像素 微距+ 降低动态模糊 diff --git a/res/values-zh-rHK/cm_strings.xml b/res/values-zh-rHK/cm_strings.xml index 44632ce76..03043fb67 100644 --- a/res/values-zh-rHK/cm_strings.xml +++ b/res/values-zh-rHK/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -89,4 +25,6 @@ + + (%1$s) %2$1.0f 萬像素 diff --git a/res/values-zh-rTW/cm_strings.xml b/res/values-zh-rTW/cm_strings.xml index 3dd42a260..8f4d9c8ad 100644 --- a/res/values-zh-rTW/cm_strings.xml +++ b/res/values-zh-rTW/cm_strings.xml @@ -16,134 +16,8 @@ limitations under the License. --> - - 2100 萬像素 - - 2070 萬像素 - - 2010 萬像素 (16:9) - - 2000 萬像素 (16:9) - - 1800 萬像素 - - 1620 萬像素 (16:9) - - 1610 萬像素 (16:9) - - 1610 萬像素 - - 1600 萬像素 - - 1590 萬像素 (16:9) - - 1500 萬像素 - - 1300 萬像素 - - 1280 萬像素 - - 1270 萬像素 - - 1260 萬像素 - - 1220 萬像素 (16:9) - - 1220 萬像素 - - 1210 萬像素 (16:9) - - 1200 萬像素 - - 1190 萬像素 (16:9) - - 1190 萬像素 - - 1150 萬像素 - - 1040 萬像素 - - 1000 萬像素 - - 970 萬像素 (16:9) - - 960 萬像素 (16:9) - - 940 萬像素 (16:9) - - 900 萬像素 (1:1) - - 900 萬像素 - - 890 萬像素 - - 820 萬像素 (16:9) - - 800 萬像素 - - 770 萬像素 - - 750 萬像素 (16:9) - - 640 萬像素 - - 600 萬像素 (1:1) - - 600 萬像素 (16:9) - - 500 萬像素 (1:1) - - 500 萬像素 - - 450 萬像素 - - 400 萬像素 (16:9) - - 400 萬像素 - - 370 萬像素 (16:9) - - 300 萬像素 - - 250 萬像素 (16:9) - - 250 萬像素 - - 210 萬像素 (16:9) - - 200 萬像素 (16:9) - - 200 萬像素 - - 190 萬像素 - - 160 萬像素 - - 150 萬像素 - - 130 萬像素 - - 120 萬像素 (1:1) - - 120 萬像素 (16:9) - - 100 萬像素 - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + + (%1$s) %2$1.0f 萬像素 Marco+ 降低動態模糊 diff --git a/res/values-zu/cm_strings.xml b/res/values-zu/cm_strings.xml index 44632ce76..724e8623c 100644 --- a/res/values-zu/cm_strings.xml +++ b/res/values-zu/cm_strings.xml @@ -16,70 +16,6 @@ limitations under the License. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 6bb3755f1..ada92c007 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -155,158 +155,6 @@ @string/time_lapse_hours - - - @string/pref_camera_picturesize_entry_21mp - @string/pref_camera_picturesize_entry_20_7mp - @string/pref_camera_picturesize_entry_20_1mp_wide - @string/pref_camera_picturesize_entry_20mp_wide - @string/pref_camera_picturesize_entry_18mp - @string/pref_camera_picturesize_entry_16_2mp_wide - @string/pref_camera_picturesize_entry_16_1mp - @string/pref_camera_picturesize_entry_16_1mp_wide - @string/pref_camera_picturesize_entry_16mp - @string/pref_camera_picturesize_entry_15_9mp_wide - @string/pref_camera_picturesize_entry_15mp - @string/pref_camera_picturesize_entry_13mp - @string/pref_camera_picturesize_entry_13mp - @string/pref_camera_picturesize_entry_12_8mp - @string/pref_camera_picturesize_entry_12_7mp - @string/pref_camera_picturesize_entry_12_6mp - @string/pref_camera_picturesize_entry_12_2mp - @string/pref_camera_picturesize_entry_12_2mp_square - @string/pref_camera_picturesize_entry_12_1mp_wide - @string/pref_camera_picturesize_entry_12mp - @string/pref_camera_picturesize_entry_11_9mp_wide - @string/pref_camera_picturesize_entry_11_9mp - @string/pref_camera_picturesize_entry_11_5mp - @string/pref_camera_picturesize_entry_10_4mp - @string/pref_camera_picturesize_entry_10mp - @string/pref_camera_picturesize_entry_10mp - @string/pref_camera_picturesize_entry_9_7mp_wide - @string/pref_camera_picturesize_entry_9_6mp_wide - @string/pref_camera_picturesize_entry_9_4mp_wide - @string/pref_camera_picturesize_entry_9mp_square - @string/pref_camera_picturesize_entry_9mp - @string/pref_camera_picturesize_entry_8_9mp - @string/pref_camera_picturesize_entry_8_2mp_wide - @string/pref_camera_picturesize_entry_8mp - @string/pref_camera_picturesize_entry_7_7mp - @string/pref_camera_picturesize_entry_7_5mp_wide - @string/pref_camera_picturesize_entry_6_4mp - @string/pref_camera_picturesize_entry_6mp_square - @string/pref_camera_picturesize_entry_6mp_wide - @string/pref_camera_picturesize_entry_6mp_wide - @string/pref_camera_picturesize_entry_5mp_square - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_5mp - @string/pref_camera_picturesize_entry_4_5mp - @string/pref_camera_picturesize_entry_4mp_wide - @string/pref_camera_picturesize_entry_4mp_wide - @string/pref_camera_picturesize_entry_4mp - @string/pref_camera_picturesize_entry_3_7mp_wide - @string/pref_camera_picturesize_entry_3mp - @string/pref_camera_picturesize_entry_3mp - @string/pref_camera_picturesize_entry_2_5mp - @string/pref_camera_picturesize_entry_2_5mp_wide - @string/pref_camera_picturesize_entry_2_1mp_wide - @string/pref_camera_picturesize_entry_2mp - @string/pref_camera_picturesize_entry_2mp_wide - @string/pref_camera_picturesize_entry_1_9mp - @string/pref_camera_picturesize_entry_1_6mp - @string/pref_camera_picturesize_entry_1_5mp - @string/pref_camera_picturesize_entry_1_3mp - @string/pref_camera_picturesize_entry_1_2mp_square - @string/pref_camera_picturesize_entry_1_2mp_wide - @string/pref_camera_picturesize_entry_1mp - @string/pref_camera_picturesize_entry_wxga - @string/pref_camera_picturesize_entry_xga - @string/pref_camera_picturesize_entry_svga - @string/pref_camera_picturesize_entry_wvga - @string/pref_camera_picturesize_entry_vga - @string/pref_camera_picturesize_entry_nhd_wide - @string/pref_camera_picturesize_entry_wqvga - @string/pref_camera_picturesize_entry_qvga - - - - - 5344x4008 - 5248x3936 - 5376x3752 - 5952x3348 - 4992x3744 - 5376x3024 - 4640x3480 - 5344x3006 - 4608x3456 - 5312x2988 - 4352x3264 - 4208x3120 - 4160x3120 - 4128x3096 - 4128x3088 - 4096x3072 - 4032x3024 - 3488x3488 - 4640x2610 - 4000x3000 - 4608x2592 - 3984x2988 - 3920x2940 - 4128x2528 - 4320x2432 - 3648x2736 - 4160x2340 - 4128x2322 - 4096x2304 - 2976x2976 - 3920x2204 - 3456x2592 - 3840x2160 - 3264x2448 - 3200x2400 - 3648x2052 - 3264x1968 - 2464x2464 - 3264x1840 - 3264x1836 - 2240x2240 - 2592x1944 - 2592x1936 - 2560x1920 - 2592x1728 - 2688x1520 - 2688x1512 - 2560x1536 - 2560x1440 - 2048x1536 - 2048x1520 - 2048x1232 - 2048x1152 - 1920x1080 - 1600x1200 - 1920x1088 - 1392x1392 - 1440x1080 - 1600x960 - 1280x960 - 1080x1080 - 1440x810 - 1280x720 - 1024x768 - 1024x600 - 800x600 - 800x480 - 640x480 - 640x360 - 480x320 - 320x240 - - @string/pref_camera_focusmode_entry_auto diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index a987cad5c..929e1e87f 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -15,135 +15,21 @@ limitations under the License. --> - - - 21 MP - - 20.7 MP - - 20.1 MP (16:9) - - 20 MP (16:9) - - 18 MP - - 16.2 MP (16:9) - - 16.1 MP (16:9) - - 16.1 MP - - 16 MP - - 15.9 MP (16:9) - - 15 MP - - 13 MP - - 12.8 MP - - 12.7 MP - - 12.6 MP - - 12.2 MP (1:1) - - 12.2 MP - - 12.1 MP (16:9) - - 12 MP - - 11.9 MP (16:9) - - 11.9 MP - - 11.5 MP - - 10.4 MP - - 10 MP - - 9.7 MP (16:9) - - 9.6 MP (16:9) - - 9.4 MP (16:9) - - 9 MP (1:1) - - 9 MP - - 8.9 MP - - 8.2 MP (16:9) - - 8 MP - - 7.7 MP - - 7.5 MP (16:9) - - 6.4 MP - - 6 MP (1:1) - - 6 MP (16:9) - - 5 MP (1:1) - - 5 MP - - 4.5 MP - - 4 MP (16:9) - - 4 MP - - 3.7 MP (16:9) - - 3 MP - - 2.5 MP (16:9) - - 2.5 MP - - 2.1 MP (16:9) - - 2 MP (16:9) - - 2 MP - - 1.9 MP - - 1.6 MP - - 1.5 MP - - 1.3 MP - - 1.2 MP (1:1) - - 1.2 MP (16:9) - - 1 MP - - WXGA - - XGA - - SVGA - - WVGA - - VGA - - nHD (16:9) - - WQVGA - - QVGA + + 4:3 + 3:2 + 16:10 + 5:3 + 16:9 + 1:1 + + Wide + + + (%1$s) %2$1.1f megapixels Macro+ diff --git a/res/values/config.xml b/res/values/config.xml index d4344fbdd..009b99488 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -70,4 +70,6 @@ will be enabled ONLY for these scenemodes and disabled for others. --> + + 900000 diff --git a/res/xml/camera_preferences.xml b/res/xml/camera_preferences.xml index bde5a52d0..3894a3ee7 100644 --- a/res/xml/camera_preferences.xml +++ b/res/xml/camera_preferences.xml @@ -70,9 +70,7 @@ + camera:title="@string/pref_camera_picturesize_title" /> + camera:singleIcon="@drawable/ic_settings_size" /> supported = parameters.getSupportedPictureSizes(); - if (supported == null) return; - for (String candidate : context.getResources().getStringArray( - R.array.pref_camera_picturesize_entryvalues)) { - if (setCameraPictureSize(candidate, supported, parameters)) { - SharedPreferences.Editor editor = ComboPreferences - .get(context).edit(); - editor.putString(KEY_PICTURE_SIZE, candidate); - editor.apply(); - return; - } + if (supported == null || supported.isEmpty()) { return; } + Size largest = getLargestSize(supported); + String candidate = largest.width + "x" + largest.height; + if (setCameraPictureSize(candidate, supported, parameters)) { + SharedPreferences.Editor editor = + ComboPreferences.get(context).edit(); + editor.putString(KEY_PICTURE_SIZE, candidate); + editor.apply(); + return; } Log.e(TAG, "No supported picture size found"); } + private static Size getLargestSize(List sizes) { + if (sizes == null || sizes.isEmpty()) { + return null; + } + + Size max = null; + int maxSize = -1; + + for (Size candidate : sizes) { + int candidateSize = candidate.width * candidate.height; + if (candidateSize > maxSize) { + maxSize = candidateSize; + max = candidate; + } + } + + return max; + } + public static void removePreferenceFromScreen( PreferenceGroup group, String key) { removePreference(group, key); @@ -922,9 +940,9 @@ public class CameraSettings { } if (pictureSize != null) { - filterUnsupportedOptions(group, pictureSize, sizeListToStringList( - mParameters.getSupportedPictureSizes())); - filterSimilarPictureSize(group, pictureSize); + formatPictureSizes(mContext, pictureSize, mParameters); + resetIfInvalid(pictureSize); + } if (whiteBalance != null) { filterUnsupportedOptions(group, @@ -1438,4 +1456,176 @@ public class CameraSettings { } return false; } + + // common aspect ratios used for bucketing camera picture sizes + private enum AspectRatio { + FourThree(1.27, 1.42, R.string.pref_camera_aspectratio_43), + ThreeTwo(1.42, 1.55, R.string.pref_camera_aspectratio_32), + SixteenTen(1.55, 1.63, R.string.pref_camera_aspectratio_1610), + FiveThree(1.63, 1.73, R.string.pref_camera_aspectratio_53), + SixteenNine(1.73, 1.81, R.string.pref_camera_aspectratio_169), + OneOne(0.95, 1.05, R.string.pref_camera_aspectratio_11), + Wide(1.81, Float.MAX_VALUE, R.string.pref_camera_aspectratio_wide), + Other(Float.MIN_VALUE, 1.27, 0); + + public double min; + public double max; + public int resourceId; + + AspectRatio(double min, double max, int rid) { + this.min = min; + this.max = max; + this.resourceId = rid; + } + + boolean contains(double ratio) { + return ratio >= min && ratio < max; + } + + static AspectRatio of(int width, int height) { + double ratio = (double) width / height; + for (AspectRatio aspect : values()) { + if (aspect.contains(ratio)) { + return aspect; + } + } + return null; + } + } + + // track a camera picture size along with some derived info + private static class SizeEntry implements Comparable { + AspectRatio ratio; + Size size; + int pixels; + + SizeEntry(Size size) { + this.ratio = AspectRatio.of(size.width, size.height); + this.size = size; + this.pixels = size.width * size.height; + } + + @Override + public int compareTo(SizeEntry another) { + return another.pixels - pixels; + } + + String resolution() { + return size.width + "x" + size.height; + } + + String formatted(Context context) { + double pixelCount = pixels / 1000000d; // compute megapixels + + if (pixelCount > 1.9 && pixelCount < 2.0) { //conventional rounding + pixelCount = 2.0; + } + + pixelCount = adjustForLocale(pixelCount); // some locales group differently + if (pixelCount > 0.1) { + String ratioString = ratio.resourceId == 0 + ? resolution() : context.getString(ratio.resourceId); + return context.getString(R.string.pref_camera_megapixel_format, + ratioString, pixelCount); + } else { + // for super tiny stuff, just give the raw resolution + return resolution(); + } + } + + private static final String KOREAN = Locale.KOREAN.getLanguage(); + private static final String CHINESE = Locale.CHINESE.getLanguage(); + + private double adjustForLocale(double megapixels) { + Locale locale = Locale.getDefault(); + String language = locale != null ? locale.getLanguage() : null; + + // Chinese and Korean locales prefer to count by ten thousands + // instead of by millions - so we multiply the megapixels by 100 + // (with a little rounding on the way) + if (KOREAN.equals(language) || CHINESE.equals(language)) { + megapixels = Math.round(megapixels * 10); + return megapixels * 10; // wàn + } + return megapixels; + } + } + + private static void formatPictureSizes(Context context, + ListPreference pictureSize, Parameters parameters) { + List supported = parameters.getSupportedPictureSizes(); + if (supported == null || supported.isEmpty()) { + return; + } + + // convert list of sizes to list of "size entries" + List sizes = new ArrayList(supported.size()); + for (Size candidate : supported) { + sizes.add(new SizeEntry(candidate)); + } + + // sort descending by pixel size + Collections.sort(sizes); + + // trim really small sizes but never leave less than six choices + int minimum = context.getResources().getInteger(R.integer.minimum_picture_size); + while (sizes.size() > 6) { + int lastIndex = sizes.size() - 1; + SizeEntry last = sizes.get(lastIndex); + if (last.pixels < minimum) { + sizes.remove(lastIndex); + } else { + break; + } + } + + // re-sort into aspect ratio buckets + MultiMap buckets = new MultiMap<>(); + for (SizeEntry size : sizes) { + buckets.put(size.ratio, size); + } + + // build the final lists - group by aspect ratio, with those + // buckets having the largest image sizes positioned first + List entries = new ArrayList(buckets.size()); + List entryValues = new ArrayList(buckets.size()); + while (!buckets.isEmpty()) { + // find the bucket with the largest first element + int maxSize = 0; + AspectRatio chosenKey = null; + for (AspectRatio ratio : buckets.keySet()) { + int size = buckets.get(ratio).get(0).pixels; + if (size > maxSize) { + maxSize = size; + chosenKey = ratio; + } + } + + List bucket = buckets.remove(chosenKey); + + // trim chosen bucket of similarly sized entries, but + // never leave less that three + int index = 0; + while (bucket.size() > 3 && bucket.size() > index + 1) { + SizeEntry current = bucket.get(index); + SizeEntry next = bucket.get(index + 1); + // if the two buckets differ in size by less than 30% + // remove the smaller one, otherwise advance through the list + if ((double) current.pixels / next.pixels < 1.3) { + bucket.remove(index + 1); + } else { + index++; + } + } + + // transfer chosen, trimmed bucket to final list + for (SizeEntry size : bucket) { + entryValues.add(size.resolution()); + entries.add(size.formatted(context)); + } + } + + pictureSize.setEntries(entries.toArray(new String[entries.size()])); + pictureSize.setEntryValues(entryValues.toArray(new String[entryValues.size()])); + } } diff --git a/src/com/android/camera/util/MultiMap.java b/src/com/android/camera/util/MultiMap.java new file mode 100644 index 000000000..b2e9003fe --- /dev/null +++ b/src/com/android/camera/util/MultiMap.java @@ -0,0 +1,45 @@ +package com.android.camera.util; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +public class MultiMap { + Map> map = new HashMap>(); + + public void put(K key, V value) { + List l = map.get(key); + if(l == null) { + l = new ArrayList(); + map.put(key, l); + } + l.add(value); + } + + public List get(K key) { + List l = map.get(key); + if(l == null) { return Collections.emptyList(); } + else return l; + } + + public List remove(K key) { + List l = map.remove(key); + if(l == null) { return Collections.emptyList(); } + else return l; + } + + public Set keySet() { return map.keySet(); } + + public int size() { + int total = 0; + for(List l : map.values()) { + total += l.size(); + } + return total; + } + + public boolean isEmpty() { return map.isEmpty(); } +} \ No newline at end of file -- cgit v1.2.3