diff options
62 files changed, 100 insertions, 87 deletions
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml index 381c6f88a..aa87ce7de 100644 --- a/res/values-af/strings.xml +++ b/res/values-af/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M pieksels"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M pieksels"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M pieksels"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 M pieksels"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M pieksels (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M pieksels"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M pieksels"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pieksels (16:9)"</string> diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml index bd1655dc2..8a72c8660 100644 --- a/res/values-am/strings.xml +++ b/res/values-am/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13ሚ ፒክሰሎች"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8ሚ ፒክሰሎች"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5ሚ ፒክሰሎች"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4ሚ ፒክሰሎች"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4ሚ ፒክሰል (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3ሚ ፒክሰሎች"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2ሚ ፒክሰሎች"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2ሚ ፒክሰሎች (16:9)"</string> diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml index 364d79686..00fd9f873 100644 --- a/res/values-ar/strings.xml +++ b/res/values-ar/strings.xml @@ -75,7 +75,7 @@ <string name="focal_length" msgid="8351221512187346229">"البعد البؤري"</string> <string name="white_balance" msgid="1600142743496129085">"توازن الأبيض"</string> <string name="exposure_time" msgid="949787291620767754">"مدة المشاهدة"</string> - <string name="iso" msgid="8578773821062054902">"ISO"</string> + <string name="iso" msgid="8578773821062054902">"أيزو"</string> <string name="unit_mm" msgid="5210344300697638286">"ملليمتر"</string> <string name="manual" msgid="2444400953521760140">"يدويًا"</string> <string name="auto" msgid="2552649885114400474">"تلقائيًا"</string> @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 ميغا بكسل"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 ميغا بكسل"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 ميغا بكسل"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 ميغا بكسل"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 ميغا بكسل (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 ميغا بكسل"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 ميغا بكسل"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 ميغا بكسل (16:9)"</string> diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml index c195059db..664289e29 100644 --- a/res/values-bg/strings.xml +++ b/res/values-bg/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 мегапиксела"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 мегапиксела"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 мегапиксела"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 мегапиксела"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 мегапиксела (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 мегапиксела"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 мегапиксела"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 мегапиксела (16:9)"</string> diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml index 60bed2524..a13430700 100644 --- a/res/values-ca/strings.xml +++ b/res/values-ca/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mp"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mp"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mp"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 Mp"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Mp (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mp"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mp"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mp (16:9)"</string> diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml index 15ab0aa5e..c3a85a451 100644 --- a/res/values-cs/strings.xml +++ b/res/values-cs/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mpx"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mpx"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mpx"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 Mpx"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Mpx (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpx"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpx"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpx (16:9)"</string> diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml index f35e546be..aa0c23734 100644 --- a/res/values-da/strings.xml +++ b/res/values-da/strings.xml @@ -97,7 +97,7 @@ <string name="pref_camera_id_title" msgid="4680648115225411185">"Vælg kamera"</string> <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Tilbage"</string> <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Front"</string> - <string name="pref_camera_recordlocation_title" msgid="3354956161456185749">"Lagringsplacering"</string> + <string name="pref_camera_recordlocation_title" msgid="3354956161456185749">"Lagerplacering"</string> <string name="pref_camera_location_label" msgid="8695441802378057719">"PLACERING"</string> <string name="pref_camera_timer_title" msgid="4728838281741571323">"Nedtællingsur"</string> <plurals name="pref_camera_timer_entry"> @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapixels"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapixels"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapixels"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapixels"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M pixels (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixels"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixels (16:9)"</string> @@ -188,7 +188,7 @@ <string name="pref_camera_id_label_back" msgid="1645608049757733858">"FRONTKAMERA"</string> <string name="pref_camera_id_label_front" msgid="349308803062874842">"BAGSIDEKAMERA"</string> <string name="dialog_ok" msgid="774141340500181131">"OK"</string> - <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Der er snart ikke mere plads på dit SD-kort. Rediger indstillingerne for kvalitet, eller slet nogle billeder eller andre filer."</string> + <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Der er snart ikke mere plads på dit SD-kort. Skift kvalitetsindstillingen, eller slet nogle billeder eller andre filer."</string> <string name="video_reach_size_limit" msgid="9196836111505731836">"Størrelsesgrænsen er nået."</string> <string name="pano_too_fast_prompt" msgid="2503148095578052177">"For hurtig"</string> <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"Panoramabillede forberedes"</string> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml index fc721a0ec..43fdafd9c 100644 --- a/res/values-de/strings.xml +++ b/res/values-de/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 MP"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string> diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml index 25f78a3bb..1b67f0cb1 100644 --- a/res/values-el/strings.xml +++ b/res/values-el/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M εικονοστοιχεία"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M εικονοστοιχεία"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M εικονοστοιχεία"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4M εικονοστοιχεία"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 εκ.εικονοστ.(16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M εικονοστοιχεία"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M εικονοστοιχεία"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M εικονοστ. (16:9)"</string> diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml index cfd3f38fd..16d7e6557 100644 --- a/res/values-en-rGB/strings.xml +++ b/res/values-en-rGB/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M pixels"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M pixels"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M pixels"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 M pixels"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M pixels (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M pixels"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M pixels"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pixels (16:9)"</string> diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml index cfd3f38fd..16d7e6557 100644 --- a/res/values-en-rIN/strings.xml +++ b/res/values-en-rIN/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M pixels"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M pixels"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M pixels"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 M pixels"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M pixels (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M pixels"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M pixels"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pixels (16:9)"</string> diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml index 31a4e2eed..a62005368 100644 --- a/res/values-es-rUS/strings.xml +++ b/res/values-es-rUS/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapíxeles"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapíxeles"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapíxeles"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapíxeles"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapíxeles"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapíxeles"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapíxeles (16:9)"</string> diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml index 9e2b659dc..465c98124 100644 --- a/res/values-es/strings.xml +++ b/res/values-es/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 MP"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string> @@ -228,8 +228,8 @@ <string name="accessibility_review_cancel" msgid="5462850829869569629">"Revisar cancelación"</string> <string name="accessibility_review_ok" msgid="3486465319880320270">"Revisión terminada"</string> <string name="accessibility_review_retake" msgid="2547112860787022130">"Revisar repetición"</string> - <string name="capital_on" msgid="1118214824959797269">"ACTIVADO"</string> - <string name="capital_off" msgid="3020696135020167263">"DESACTIVADO"</string> + <string name="capital_on" msgid="1118214824959797269">"SÍ"</string> + <string name="capital_off" msgid="3020696135020167263">"NO"</string> <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"No"</string> <string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0,5 segundos"</string> <string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 segundo"</string> diff --git a/res/values-et-rEE/strings.xml b/res/values-et-rEE/strings.xml index 88611e4c1..32205fb09 100644 --- a/res/values-et-rEE/strings.xml +++ b/res/values-et-rEE/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapikslit"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapikslit"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapikslit"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapikslit"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M pikslit (16 : 9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikslit"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikslit"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16 : 9)"</string> diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml index e457bf752..fa15c5552 100644 --- a/res/values-fa/strings.xml +++ b/res/values-fa/strings.xml @@ -75,7 +75,7 @@ <string name="focal_length" msgid="8351221512187346229">"فاصله کانونی"</string> <string name="white_balance" msgid="1600142743496129085">"توازن سفیدی"</string> <string name="exposure_time" msgid="949787291620767754">"زمان نوردهی"</string> - <string name="iso" msgid="8578773821062054902">"ISO"</string> + <string name="iso" msgid="8578773821062054902">"ایزو"</string> <string name="unit_mm" msgid="5210344300697638286">"میلیمتر"</string> <string name="manual" msgid="2444400953521760140">"دستی"</string> <string name="auto" msgid="2552649885114400474">"خودکار"</string> @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"۱۳ مگاپیکسل"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"۸ مگاپیکسل"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"۵ مگاپیکسل"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"۴ مگاپیکسل"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"۴ مگاپیکسل (۱۶:۹)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"۳ مگاپیکسل"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"۲ مگاپیکسل"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"۲ مگاپیکسل (۱۶:۹)"</string> diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml index 2e40945cb..ae27fa155 100644 --- a/res/values-fi/strings.xml +++ b/res/values-fi/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapikseliä"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapikseliä"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapikseliä"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapikseliä"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapiks. (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikseliä"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikseliä"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megap. (16:9)"</string> diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml index 315ee656e..c84df282a 100644 --- a/res/values-fr-rCA/strings.xml +++ b/res/values-fr-rCA/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 mégapixels"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 mégapixels"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 mégapixels"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 mégapixels"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 mégapixels (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 mégapixels"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 mégapixels"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 mégapixels (16:9)"</string> diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index fc2c76935..5da31e9c3 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 mégapixels"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 mégapixels"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 mégapixels"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 mégapixels"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 mégapixels (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 mégapixels"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 mégapixels"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 mégapixels (16:9)"</string> diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml index 1acbdfbff..f6faab7ac 100644 --- a/res/values-hi/strings.xml +++ b/res/values-hi/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M पिक्सेल"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M पिक्सेल"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M पिक्सेल"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4M पिक्सेल"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M पिक्सेल (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M पिक्सेल"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M पिक्सेल"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M पिक्सेल (16:9)"</string> diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml index cb4d20367..b17323e31 100644 --- a/res/values-hr/strings.xml +++ b/res/values-hr/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapiksela"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapiksela"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapiksela"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapiksela"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapiksela (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapiksela"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapiksela"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 mpiks. (16:9)"</string> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml index bc27b2e52..1c4c5924e 100644 --- a/res/values-hu/strings.xml +++ b/res/values-hu/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapixel"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapixel"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapixel"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapixel"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapixel (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixel"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixel (16:9)"</string> diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy-rAM/strings.xml index 3603d6a58..87e37e080 100644 --- a/res/values-hy-rAM/strings.xml +++ b/res/values-hy-rAM/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13Մ պիքսել"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8Մ պիքսել"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5Մ պիքսել"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4Մ պիքսել"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4Մ պիքսել (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3Մ պիքսել"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2Մ պիքսել"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2Մ պիքսել (16:9)"</string> diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml index 115f90175..2dce49575 100644 --- a/res/values-in/strings.xml +++ b/res/values-in/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M piksel"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M piksel"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M piksel"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 M piksel"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M piksel (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M piksel"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M piksel"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M px (16:9)"</string> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml index b9ba5e636..4faaef2d8 100644 --- a/res/values-it/strings.xml +++ b/res/values-it/strings.xml @@ -112,14 +112,14 @@ <string name="pref_video_quality_title" msgid="5887153490982738588">"Qualità video"</string> <string name="pref_video_quality_entry_high" msgid="1613578418842803393">"Alta"</string> <string name="pref_video_quality_entry_low" msgid="737962621299050603">"Bassa"</string> - <string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Rallentatore"</string> + <string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Time-lapse"</string> <string name="pref_camera_settings_category" msgid="4274141528139077830">"Impostazioni della fotocamera"</string> <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Impostazioni videocamera"</string> <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Dimensioni immagine"</string> <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mpixel"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mpixel"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mpixel"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 Mpixel"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Mpixel (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpixel"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpixel"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpixel (16:9)"</string> @@ -275,7 +275,7 @@ <string name="time_lapse_hours" msgid="5294001144133261436">"ore"</string> <string name="time_lapse_interval_set" msgid="2418594453248958440">"Fine"</string> <string name="set_time_interval" msgid="2531393962847535331">"Imposta l\'intervallo di tempo"</string> - <string name="set_time_interval_help" msgid="64145154088021389">"La funzione Rallentatore non è attiva. Attivala per impostare l\'intervallo di tempo."</string> + <string name="set_time_interval_help" msgid="64145154088021389">"La funzione Time lapse non è attiva. Attivala per impostare l\'intervallo di tempo."</string> <string name="set_duration" msgid="1638453882581604341">"Imposta la durata in secondi"</string> <string name="count_down_title_text" msgid="7586031110595513050">"Conto alla rovescia per scattare una foto"</string> <string name="remember_location_title" msgid="3045040613094030429">"Memorizzare i luoghi delle foto?"</string> diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml index 3d6d04d08..cec03fa3b 100644 --- a/res/values-iw/strings.xml +++ b/res/values-iw/strings.xml @@ -75,7 +75,7 @@ <string name="focal_length" msgid="8351221512187346229">"רוחק מוקד"</string> <string name="white_balance" msgid="1600142743496129085">"איזון לבן"</string> <string name="exposure_time" msgid="949787291620767754">"זמן חשיפה"</string> - <string name="iso" msgid="8578773821062054902">"ISO"</string> + <string name="iso" msgid="8578773821062054902">"ISO"</string> <string name="unit_mm" msgid="5210344300697638286">"מ\"מ"</string> <string name="manual" msgid="2444400953521760140">"ידני"</string> <string name="auto" msgid="2552649885114400474">"אוטומטי"</string> @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 מגה פיקסל"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 מגה פיקסל"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 מגה פיקסל"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 מגה פיקסל"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 מגה פיקסל (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 מגה פיקסל"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 מגה פיקסל"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 מגה פיקסל (16:9)"</string> diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml index 503ac3457..999437dfc 100644 --- a/res/values-ja/strings.xml +++ b/res/values-ja/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13メガピクセル"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8メガピクセル"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5メガピクセル"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4メガピクセル"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4Mピクセル（16:9）"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3メガピクセル"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2メガピクセル"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2Mピクセル（16:9）"</string> diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka-rGE/strings.xml index 2cf9557a5..b0c6d2db7 100644 --- a/res/values-ka-rGE/strings.xml +++ b/res/values-ka-rGE/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 მეგაპიქსელი"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 მეგაპიქსელი"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 მეგაპიქსელი"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 მეგაპიქსელი"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 მეგაპიქსელი (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 მეგაპიქსელი"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 მეგაპიქსელი"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 მეგაპიქსელი (16:9)"</string> diff --git a/res/values-km-rKH/strings.xml b/res/values-km-rKH/strings.xml index 4ac792243..6de87e6c1 100644 --- a/res/values-km-rKH/strings.xml +++ b/res/values-km-rKH/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"១៣ មេហ្គាភីកសែល"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"៨ មេហ្គាភីកសែល"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"៥ មេហ្គាភីកសែល"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"៤ មេហ្គាភីកសែល"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"៤ មេហ្គាភីកសែល (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"៣ មេហ្គាភីកសែល"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"២ មេហ្គាភីកសែល"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"២ មេហ្គាភីកសែល (16:9)"</string> @@ -178,8 +178,8 @@ <string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"១០ វិនាទី"</string> <string name="pref_camera_countdown_label_fifteen" msgid="8469955900530268867">"១៥ វិនាទី"</string> <string name="not_selectable_in_scene_mode" msgid="3260801086980522611">"មិនអាចជ្រើសបានក្នុងរបៀបរូបភាព។"</string> - <string name="pref_exposure_title" msgid="7525751789152582800">"បង្ហាញ"</string> - <string name="pref_exposure_label" msgid="2604738602400261218">"បង្ហាញ"</string> + <string name="pref_exposure_title" msgid="7525751789152582800">"ពន្លឺ"</string> + <string name="pref_exposure_label" msgid="2604738602400261218">"ពន្លឺ"</string> <!-- no translation found for pref_camera_hdr_default (5054955236904902318) --> <skip /> <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) --> diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml index 29e6583b7..b93b3b2b5 100644 --- a/res/values-ko/strings.xml +++ b/res/values-ko/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1300만 화소"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"800만 화소"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"500만 화소"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"400만 화소"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4백만 화소(16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300만 화소"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200만 화소"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200만 화소(16:9)"</string> diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo-rLA/strings.xml index f70018ada..d245aeec6 100644 --- a/res/values-lo-rLA/strings.xml +++ b/res/values-lo-rLA/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 ລ້ານພິກເຊວ"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 ລ້ານພິກເຊວ"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 ລ້ານພິກເຊວ"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 ລ້ານພິກເຊວ"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 ລ້ານພິກເຊວ (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 ລ້ານພິກເຊວ"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 ລ້ານພິກເຊວ"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 ລ້ານພິກເຊວ (16:9)"</string> diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml index 39ee62da6..319d795a0 100644 --- a/res/values-lt/strings.xml +++ b/res/values-lt/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapikselių"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapikseliai"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapikseliai"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapikseliai"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapiks. (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikseliai"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikseliai"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiks. (16:9)"</string> diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml index 7f3ec11b9..ac369d589 100644 --- a/res/values-lv/strings.xml +++ b/res/values-lv/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapikseļi"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapikseļi"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapikseļi"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapikseļi"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapikseļi (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapikseļi"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapikseļi"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiks. (16:9)"</string> diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn-rMN/strings.xml index eb6d3704b..ec900363c 100644 --- a/res/values-mn-rMN/strings.xml +++ b/res/values-mn-rMN/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M пиксел"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M пиксел"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M пиксел"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4M пиксел"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M пиксел (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M пиксел"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M пиксел"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M пиксел (16:9)"</string> @@ -289,7 +289,7 @@ <string name="tiny_planet_zoom" msgid="2985522360577158474">"Томруулах"</string> <string name="tiny_planet_rotate" msgid="5445336705705350004">"Эргүүлэх"</string> <string name="crop_save" msgid="2841974981340098579">"Хадгалах"</string> - <string name="cannot_load_image" msgid="4100136187076585580">"Зургийг ачаалах боломжгүй!"</string> + <string name="cannot_load_image" msgid="4100136187076585580">"Зургийг ачааллах боломжгүй!"</string> <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Зургийн хальсаар харах"</string> <string name="setting_wallpaper" msgid="2397759659347872725">"Ханын зургийг тохируулж байна"</string> </resources> diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms-rMY/strings.xml index ff24fe4ad..23c7086ab 100644 --- a/res/values-ms-rMY/strings.xml +++ b/res/values-ms-rMY/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M piksel"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M piksel"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M piksel"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4M piksel"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M piksel (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M piksel"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M piksel"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M piksel (16:9)"</string> diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml index 6ee3286cd..d4c7e7985 100644 --- a/res/values-nb/strings.xml +++ b/res/values-nb/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapiksler"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapiksler"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapiksler"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapiksler"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M piksler (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapiksler"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapiksler"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiksler (16:9)"</string> diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml index 66cf12c6c..c6ed15dab 100644 --- a/res/values-nl/strings.xml +++ b/res/values-nl/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapixel"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapixel"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapixel"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapixel"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapixel (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixel"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixel"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixel (16:9)"</string> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml index 0f918e626..664de52a2 100644 --- a/res/values-pl/strings.xml +++ b/res/values-pl/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mpix"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mpix"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mpix"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 Mpix"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapiksele (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpix"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpix"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpix (16:9)"</string> diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml index dcd48b041..1a36e37c6 100644 --- a/res/values-pt-rPT/strings.xml +++ b/res/values-pt-rPT/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 MP"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapíxeis (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string> diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml index e3e9517b3..ee1950baf 100644 --- a/res/values-pt/strings.xml +++ b/res/values-pt/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 MP"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string> diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml index 001108aa6..17e4b6bc1 100644 --- a/res/values-ro/strings.xml +++ b/res/values-ro/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 MP"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 MP"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 MP"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 MP"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 MP (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 MP"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 MP"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 MP (16:9)"</string> diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index 62d1769cb..e1bb69a31 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Мпикс."</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Мпикс."</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Мпикс."</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 Мпикс."</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Мпикс. (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Мпикс."</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Мпикс."</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Мпикс. (16:9)"</string> diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml index 9be1e91c6..94b885641 100644 --- a/res/values-sk/strings.xml +++ b/res/values-sk/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Mpx"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Mpx"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Mpx"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 Mpx"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapixely (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Mpx"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Mpx"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Mpx (16:9)"</string> diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml index 3af43a200..1ef85de00 100644 --- a/res/values-sl/strings.xml +++ b/res/values-sl/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 M slikovnih pik"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 M slikovnih pik"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 M slikovnih pik"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 M slikovnih pik"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 mio. pik (16 : 9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 M slikovnih pik"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 M slikovnih pik"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 M pik (16 : 9)"</string> diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml index d3f869ba9..3455fdd6d 100644 --- a/res/values-sr/strings.xml +++ b/res/values-sr/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 мегапиксела"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 мегапиксела"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 мегапиксела"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 мегапиксела"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 мегапиксела (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 мегапиксела"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 мегапиксела"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 мегапиксела (16:9)"</string> diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml index eed747053..32d27332b 100644 --- a/res/values-sv/strings.xml +++ b/res/values-sv/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapixlar"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapixlar"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapixlar"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapixlar"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 megapixlar (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapixlar"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapixlar"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapixlar (16:9)"</string> diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml index 750b4689d..eb1fdb8af 100644 --- a/res/values-sw/strings.xml +++ b/res/values-sw/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"Megapikseli 13"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"Megapikseli 8"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"Megapikseli 5"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"Megapikseli 4"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"Pikseli milioni 4 (16:09)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"Megapikseli 3"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"Megapikseli 2"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"Megapikseli 2 (16:9)"</string> diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml index 5b69f9f8a..f3038bc81 100644 --- a/res/values-th/strings.xml +++ b/res/values-th/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 ล้านพิกเซล"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 ล้านพิกเซล"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 ล้านพิกเซล"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 ล้านพิกเซล"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M พิกเซล (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 ล้านพิกเซล"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 ล้านพิกเซล"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 ล้านพิกเซล (16:9)"</string> diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml index 3737711e7..c194de550 100644 --- a/res/values-tl/strings.xml +++ b/res/values-tl/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M pixel"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M pixel"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M pixel"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4M pixel"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M pixels (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M pixel"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M pixel"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M pixel (16:9)"</string> diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml index 9face74ee..ef799f2a0 100644 --- a/res/values-tr/strings.xml +++ b/res/values-tr/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 megapiksel"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 megapiksel"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 megapiksel"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 megapiksel"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 M piksel (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 megapiksel"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 megapiksel"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 megapiksel (16:9)"</string> diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml index 8719e4b61..5abb10958 100644 --- a/res/values-uk/strings.xml +++ b/res/values-uk/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13 Мпікс."</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 Мпікс."</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 Мпікс."</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 Мпікс."</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4 Мпікс. (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 Мпікс."</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 Мпікс."</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 Мпікс. (16:9)"</string> diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml index 0c9d40ba3..d5805195f 100644 --- a/res/values-vi/strings.xml +++ b/res/values-vi/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M pixel"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M pixel"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M pixel"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4M pixel"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M pixel (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M pixel"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M pixel"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M pixel (16:9)"</string> diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml index f4913d312..9eb1820e3 100644 --- a/res/values-zh-rCN/strings.xml +++ b/res/values-zh-rCN/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1300万像素"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"800万像素"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"500万像素"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"400万像素"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"400万像素 (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300万像素"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200万像素"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200万像素 (16:9)"</string> diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml index 07523fe78..048ff5d3d 100644 --- a/res/values-zh-rHK/strings.xml +++ b/res/values-zh-rHK/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1,300 萬像素"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8 百萬像素"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5 百萬像素"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4 百萬像素"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"400 萬像素 (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3 百萬像素"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2 百萬像素"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2 百萬像素 (16:9)"</string> diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml index 46c3df368..17e073635 100644 --- a/res/values-zh-rTW/strings.xml +++ b/res/values-zh-rTW/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"1300 萬像素"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"800 萬像素"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"500 萬像素"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"400 萬像素"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"400 萬像素 (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"300 萬像素"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"200 萬像素"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"200 萬像素 (16:9)"</string> diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml index 73554c790..1b6f9cba1 100644 --- a/res/values-zu/strings.xml +++ b/res/values-zu/strings.xml @@ -119,7 +119,7 @@ <string name="pref_camera_picturesize_entry_13mp" msgid="6728485576074234195">"13M amaphikiseli"</string> <string name="pref_camera_picturesize_entry_8mp" msgid="7088352012301633667">"8M amaphikiseli"</string> <string name="pref_camera_picturesize_entry_5mp" msgid="1501745661448065284">"5M amaphikiseli"</string> - <string name="pref_camera_picturesize_entry_4mp" msgid="4786178543089540678">"4M amaphikiseli"</string> + <string name="pref_camera_picturesize_entry_4mp_wide" msgid="3338812763544573634">"4M amaphikiseli (16:9)"</string> <string name="pref_camera_picturesize_entry_3mp" msgid="140799231761236311">"3M amaphikiseli"</string> <string name="pref_camera_picturesize_entry_2mp" msgid="450006451326859328">"2M amaphikiseli"</string> <string name="pref_camera_picturesize_entry_2mp_wide" msgid="1877997036497332813">"2M amaphikiseli (16:9)"</string> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index d841d39a8..3181feadb 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -193,7 +193,8 @@ <item>@string/pref_camera_picturesize_entry_5mp</item> <item>@string/pref_camera_picturesize_entry_5mp</item> <item>@string/pref_camera_picturesize_entry_5mp</item> - <item>@string/pref_camera_picturesize_entry_4mp</item> + <item>@string/pref_camera_picturesize_entry_4mp_wide</item> + <item>@string/pref_camera_picturesize_entry_3mp</item> <item>@string/pref_camera_picturesize_entry_3mp</item> <item>@string/pref_camera_picturesize_entry_1920x1080</item> <item>@string/pref_camera_picturesize_entry_2mp</item> @@ -225,6 +226,7 @@ <item>2560x1920</item> <item>2688x1520</item> <item>2048x1536</item> + <item>2048x1520</item> <item>1920x1080</item> <item>1600x1200</item> <item>1920x1088</item> diff --git a/res/values/strings.xml b/res/values/strings.xml index fc183f643..47be6891c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -277,7 +277,7 @@ <!-- Settings screen, dialog choice for 5 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_5mp">5M pixels</string> <!-- Settings screen, dialog choice for 4 megapixels picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_4mp">4M pixels</string> + <string name="pref_camera_picturesize_entry_4mp_wide">4M pixels (16:9)</string> <!-- Settings screen, dialog choice for 3 megapixels picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_3mp">3M pixels</string> <!-- Settings screen, dialog choice for 2 megapixels picture size [CHAR LIMIT=20] --> @@ -293,7 +293,6 @@ <!-- Settings screen, dialog choice for VGA picture size [CHAR LIMIT=20] --> <string name="pref_camera_picturesize_entry_vga">VGA</string> <!-- Settings screen, dialog choice for QVGA picture size [CHAR LIMIT=20] --> - <string name="pref_camera_picturesize_entry_qvga">QVGA</string> <!-- Settings screen, Focus mode title --> diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 168c9064a..5ade3950a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -671,8 +671,7 @@ public class CameraActivity extends Activity | SUPPORT_SHARE | SUPPORT_SHOW_ON_MAP; break; case LocalData.LOCAL_VIDEO: - supported |= SUPPORT_DELETE | SUPPORT_INFO | SUPPORT_TRIM - | SUPPORT_SHARE; + supported |= SUPPORT_DELETE | SUPPORT_INFO | SUPPORT_SHARE; break; case LocalData.LOCAL_PHOTO_SPHERE: supported |= SUPPORT_DELETE | SUPPORT_ROTATE | SUPPORT_INFO diff --git a/src/com/android/camera/FocusOverlayManager.java b/src/com/android/camera/FocusOverlayManager.java index 51b8b78f5..602c31767 100644 --- a/src/com/android/camera/FocusOverlayManager.java +++ b/src/com/android/camera/FocusOverlayManager.java @@ -89,7 +89,6 @@ public class FocusOverlayManager { private Handler mHandler; Listener mListener; private boolean mPreviousMoving; - private boolean mFocusDefault; private boolean mZslEnabled = false; //QCom Parameter to disable focus for ZSL private boolean mTouchAFRunning = false; private boolean mIsAFRunning = false; @@ -144,7 +143,6 @@ public class FocusOverlayManager { setParameters(parameters); mListener = listener; setMirror(mirror); - mFocusDefault = true; mUI = ui; } @@ -294,7 +292,7 @@ public class FocusOverlayManager { updateFocusUI(); // If this is triggered by touch focus, cancel focus after a // while. - if (!mFocusDefault) { + if (mFocusArea != null) { mHandler.sendEmptyMessageDelayed(RESET_TOUCH_FOCUS, RESET_TOUCH_FOCUS_DELAY); } if (shutterButtonPressed) { @@ -371,12 +369,12 @@ public class FocusOverlayManager { UsageStatistics.ACTION_TOUCH_FOCUS, x + "," + y); // Let users be able to cancel previous touch focus. - if ((!mFocusDefault) && (mState == STATE_FOCUSING || + if ((mFocusArea != null) && (mState == STATE_FOCUSING || mState == STATE_SUCCESS || mState == STATE_FAIL)) { cancelAutoFocus(); } if (mPreviewRect.width() == 0 || mPreviewRect.height() == 0) return; - mFocusDefault = false; + // Initialize variables. // Initialize mFocusArea. if (mFocusAreaSupported) { initializeFocusAreas(x, y); @@ -461,7 +459,7 @@ public class FocusOverlayManager { if (mParameters == null) return Parameters.FOCUS_MODE_AUTO; List<String> supportedFocusModes = mParameters.getSupportedFocusModes(); - if (mFocusAreaSupported && !mFocusDefault) { + if (mFocusAreaSupported && mFocusArea != null) { // Always use autofocus in tap-to-focus. mFocusMode = Parameters.FOCUS_MODE_AUTO; } else { @@ -506,7 +504,7 @@ public class FocusOverlayManager { // Show only focus indicator or face indicator. if (mState == STATE_IDLE) { - if (mFocusDefault) { + if (mFocusArea == null) { mUI.clearFocus(); } else { // Users touch on the preview and the indicator represents the @@ -538,14 +536,11 @@ public class FocusOverlayManager { // Initialize mMeteringArea. mMeteringArea = null; - if (mFocusAreaSupported) { - initializeFocusAreas(mPreviewRect.centerX(), mPreviewRect.centerY()); - } // Reset metering area when no specific region is selected. if (mMeteringAreaSupported) { resetMeteringAreas(); } - mFocusDefault = true; + if (mTouchAFRunning && mZslEnabled) { mTouchAFRunning = false; mListener.setFocusParameters(); diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java index 9cef6fb1b..3d6218281 100644 --- a/src/com/android/camera/PhotoModule.java +++ b/src/com/android/camera/PhotoModule.java @@ -2717,6 +2717,10 @@ public class PhotoModule setFocusAreasIfSupported(); setMeteringAreasIfSupported(); + // initialize focus mode + mFocusManager.overrideFocusMode(null); + mParameters.setFocusMode(mFocusManager.getFocusMode()); + // Set picture size. String pictureSize = mPreferences.getString( CameraSettings.KEY_PICTURE_SIZE, null); diff --git a/src/com/android/camera/PhotoUI.java b/src/com/android/camera/PhotoUI.java index 7a798bea3..b0c642a8b 100644 --- a/src/com/android/camera/PhotoUI.java +++ b/src/com/android/camera/PhotoUI.java @@ -558,12 +558,15 @@ public class PhotoUI implements PieListener, mOnScreenIndicators.updateExposureOnScreenIndicator(params, CameraSettings.readExposure(prefs)); mOnScreenIndicators.updateFlashOnScreenIndicator(params.getFlashMode()); - int wbIndex = 2; + int wbIndex = -1; + String wb = params.getWhiteBalance(); ListPreference pref = group.findPreference(CameraSettings.KEY_WHITE_BALANCE); if (pref != null) { - wbIndex = pref.getCurrentIndex(); + wbIndex = pref.findIndexOfValue(wb); } - mOnScreenIndicators.updateWBIndicator(wbIndex); + // make sure the correct value was found + // otherwise use auto index + mOnScreenIndicators.updateWBIndicator(wbIndex < 0 ? 2 : wbIndex); boolean location = RecordLocationPreference.get( prefs, mActivity.getContentResolver()); mOnScreenIndicators.updateLocationIndicator(location); diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java index 14296c75d..20b11d61e 100644 --- a/src/com/android/camera/VideoModule.java +++ b/src/com/android/camera/VideoModule.java @@ -1246,7 +1246,6 @@ public class VideoModule implements CameraModule, } mMediaRecorder = new MediaRecorder(); - setupMediaRecorderPreviewDisplay(); // Unlock the camera object before passing it to media recorder. mCameraDevice.unlock(); mMediaRecorder.setCamera(mCameraDevice.getCamera()); @@ -1264,6 +1263,7 @@ public class VideoModule implements CameraModule, mProfile.duration = mMaxVideoDurationInMs; mMediaRecorder.setProfile(mProfile); + mMediaRecorder.setVideoSize(mProfile.videoFrameWidth, mProfile.videoFrameHeight); mMediaRecorder.setMaxDuration(mMaxVideoDurationInMs); if (mCaptureTimeLapse) { double fps = 1000 / (double) mTimeBetweenTimeLapseFrameCaptureMs; @@ -1312,6 +1312,7 @@ public class VideoModule implements CameraModule, } } mMediaRecorder.setOrientationHint(rotation); + setupMediaRecorderPreviewDisplay(); try { mMediaRecorder.prepare(); @@ -2079,6 +2080,7 @@ public class VideoModule implements CameraModule, private void setCameraParameters() { Log.d(TAG,"Preview dimension in App->"+mDesiredPreviewWidth+"X"+mDesiredPreviewHeight); mParameters.setPreviewSize(mDesiredPreviewWidth, mDesiredPreviewHeight); + mParameters.set("video-size", mProfile.videoFrameWidth+"x"+mProfile.videoFrameHeight); int[] fpsRange = CameraUtil.getMaxPreviewFpsRange(mParameters); if (fpsRange.length > 0) { mParameters.setPreviewFpsRange( @@ -2150,7 +2152,16 @@ public class VideoModule implements CameraModule, mParameters.setJpegQuality(jpegQuality); //Call Qcom related Camera Parameters qcomSetCameraParameters(); + + boolean flag = false; + if (mPreviewing) { + stopPreview(); + flag = true; + } mCameraDevice.setParameters(mParameters); + if (flag) { + startPreview(); + } // Keep preview size up to date. mParameters = mCameraDevice.getParameters(); |