Merge tag 'android-6.0.0_r26' into HEAD
Android 6.0.0 release 26
* tag 'android-6.0.0_r26':
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Import translations. DO NOT MERGE
Change-Id: Ib227ca238fdf925a29275c14c3642c2171b83f99
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index d01a845..d8d9b29 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -169,7 +169,7 @@
<string name="pano_capture_indication" msgid="4002128831255023954">"در حال گرفتن عکس پانوراما"</string>
<string name="pano_dialog_waiting_previous" msgid="2646847402743245320">"در حال انتظار برای پانورامای قبلی"</string>
<string name="pano_review_saving_indication_str" msgid="4691771283450663293">"در حال ذخیره..."</string>
- <string name="pano_review_rendering" msgid="2743087719999377155">"در حال تولید تصویر پانوراما"</string>
+ <string name="pano_review_rendering" msgid="2743087719999377155">"درحال پردازش پانوراما"</string>
<string name="tap_to_focus" msgid="3519718196270593468">"برای فوکوس لمس کنید."</string>
<string name="pref_video_effect_title" msgid="594570613431209010">"جلوه‌ها"</string>
<string name="effect_none" msgid="3102797925086872636">"هیچ‌کدام"</string>
@@ -199,14 +199,14 @@
<string name="accessibility_switch_to_gcam" msgid="7562625440767034695">"تغییر به کیفیت بالا"</string>
<string name="accessibility_switch_to_refocus" msgid="6796169367953860106">"تغییر به فوکوس مجدد"</string>
<string name="accessibility_review_cancel" msgid="5462850829869569629">"لغو بازبینی"</string>
- <string name="accessibility_review_ok" msgid="3486465319880320270">"بازبینی انجام شد"</string>
+ <string name="accessibility_review_ok" msgid="3486465319880320270">"بازبینی تمام"</string>
<string name="accessibility_review_retake" msgid="2547112860787022130">"بازبینی عکس/ویدیوی دوباره ضبط شده"</string>
<string name="accessibility_mode_options" msgid="6376831760155403217">"گزینه‌ها"</string>
<string name="accessibility_mode_list_hidden" msgid="3743267380450401866">"لیست حالت بسته است"</string>
<string name="accessibility_mode_list_shown" msgid="5284322142734069179">"لیست حالت باز است"</string>
<string name="media_accessibility_peek" msgid="234540330161031946">"عکس گرفته شد"</string>
<string name="photo_accessibility_peek" msgid="5934133371001677250">"عکس گرفته شد"</string>
- <string name="video_accessibility_peek" msgid="7845916149291383132">"فیلم‌برداری انجام شد"</string>
+ <string name="video_accessibility_peek" msgid="7845916149291383132">"فیلم‌برداری تمام"</string>
<string name="accessibility_unlock_to_camera" msgid="1251880974313179442">"بازگشایی در حالت دوربین"</string>
<string name="media_date_content_description" msgid="2155634843596817141">"رسانه در %s گرفته شده است"</string>
<string name="photo_date_content_description" msgid="5705865897898465619">"عکس در %s گرفته شده است"</string>
@@ -270,7 +270,7 @@
<string name="time_lapse_seconds" msgid="7319683099532506270">"ثانیه"</string>
<string name="time_lapse_minutes" msgid="5325447383033224679">"دقیقه"</string>
<string name="time_lapse_hours" msgid="5294001144133261436">"ساعت"</string>
- <string name="time_lapse_interval_set" msgid="2418594453248958440">"انجام شد"</string>
+ <string name="time_lapse_interval_set" msgid="2418594453248958440">"تمام"</string>
<string name="set_time_interval" msgid="2531393962847535331">"تنظیم فاصله زمانی"</string>
<string name="set_time_interval_help" msgid="64145154088021389">"قابلیت گذر زمان خاموش است. برای تنظیم فاصله زمانی آن را روشن کنید."</string>
<string name="set_duration" msgid="1638453882581604341">"تنظیم مدت زمان به ثانیه"</string>
@@ -326,7 +326,7 @@
<string name="countdown_timer_duration_10s" msgid="9085308782250002795">"مدت زمان تایمر شمارش معکوس روی ۱۰ ثانیه تنظیم شده است"</string>
<string name="more_options_desc" msgid="4628738800610478353">"گزینه‌های بیشتر"</string>
<string name="cancel_button_description" msgid="3801167024006905033">"لغو"</string>
- <string name="done_button_description" msgid="1334963435441544592">"انجام شد"</string>
+ <string name="done_button_description" msgid="1334963435441544592">"تمام"</string>
<string name="retake_button_description" msgid="4234613030674787714">"عکس گرفتن مجدد"</string>
<string name="review_button_description" msgid="7932122063748430080">"نظر"</string>
<string name="share_button_description" msgid="5108508790540832053">"اشتراکگذاری"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index ff3b620..41e4633 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -195,7 +195,7 @@
<string name="accessibility_switch_to_camera" msgid="4518394037216725274">"写真に切り替え"</string>
<string name="accessibility_switch_to_video" msgid="8174781871592793967">"動画に切り替え"</string>
<string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"パノラマに切り替え"</string>
- <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"Photo Sphereに切り替え"</string>
+ <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"360°パノラマに切り替え"</string>
<string name="accessibility_switch_to_gcam" msgid="7562625440767034695">"高画質に切り替え"</string>
<string name="accessibility_switch_to_refocus" msgid="6796169367953860106">"リフォーカスに切り替える"</string>
<string name="accessibility_review_cancel" msgid="5462850829869569629">"レビュー - キャンセル"</string>
@@ -212,7 +212,7 @@
<string name="photo_date_content_description" msgid="5705865897898465619">"%sに撮影した写真"</string>
<string name="video_date_content_description" msgid="2151884014634284456">"%sに撮影した動画"</string>
<string name="panorama_date_content_description" msgid="990703578639006144">"%sに撮影したパノラマ写真"</string>
- <string name="photosphere_date_content_description" msgid="4183741743409007876">"%sに撮影したPhoto Sphere写真"</string>
+ <string name="photosphere_date_content_description" msgid="4183741743409007876">"%sに撮影した360°パノラマ写真"</string>
<string name="refocus_date_content_description" msgid="5630960320424345547">"%sに撮影したレンズぼかし写真"</string>
<string name="media_processing_content_description" msgid="8138587719107183754">"メディアを処理しています"</string>
<string name="accessibility_mode_list_toggle" msgid="4784230103566918645">"モードリストを切り替え"</string>
@@ -293,14 +293,14 @@
<string name="mode_settings" msgid="2021937261522670921">"設定"</string>
<string name="mode_camera" msgid="279763925715250603">"カメラ"</string>
<string name="mode_video" msgid="8633929034048169139">"動画"</string>
- <string name="mode_photosphere" msgid="5082338476237291833">"Photo Sphere"</string>
+ <string name="mode_photosphere" msgid="5082338476237291833">"360°パノラマ"</string>
<string name="mode_timelapse" msgid="1517168724627815453">"低速度撮影"</string>
<string name="mode_wideangle" msgid="1099640345041696830">"広角"</string>
<string name="mode_panorama" msgid="6882648621305828861">"パノラマ"</string>
<string name="mode_refocus" msgid="172192967119469061">"レンズぼかし"</string>
<string name="mode_camera_desc" msgid="3670807361165657278">"カメラモードに切り替え"</string>
<string name="mode_video_desc" msgid="4058407412929464689">"動画カメラに切り替え"</string>
- <string name="mode_photosphere_desc" msgid="2403816283825579161">"Photo Sphereモードに切り替え"</string>
+ <string name="mode_photosphere_desc" msgid="2403816283825579161">"360°パノラマモードに切り替え"</string>
<string name="mode_panorama_desc" msgid="6023020404237519590">"パノラマモードに切り替え"</string>
<string name="mode_refocus_desc" msgid="6171183297515508465">"レンズぼかしモードに切り替え"</string>
<string name="settings_open_desc" msgid="6914471293841793766">"設定を開く"</string>
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr-rIN/strings.xml
index 6f8e06e..b850508 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr-rIN/strings.xml
@@ -156,7 +156,7 @@
<string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="1645608049757733858">"पुढील कॅमेरा"</string>
<string name="pref_camera_id_label_front" msgid="349308803062874842">"मागील कॅमेरा"</string>
- <string name="dialog_ok" msgid="774141340500181131">"ठिक आहे"</string>
+ <string name="dialog_ok" msgid="774141340500181131">"ठीक आहे"</string>
<string name="dialog_cancel" msgid="692365061128351656">"रद्द करा"</string>
<string name="dialog_report" msgid="7616428760369876209">"अहवाल द्या"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"डिसमिस करा"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index b42ebc2..fe29713 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -67,11 +67,11 @@
<string name="camera_error_title" msgid="6200558085072670067">"Camerafout"</string>
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"Kan geen verbinding maken met de camera."</string>
<string name="error_camera_disabled" msgid="5582398275657419692">"De camera is uitgeschakeld vanwege het beveiligingsbeleid."</string>
- <string name="error_media_storage_failure" msgid="7711687330673245629">"Er is een probleem opgetreden bij het opslaan van uw foto of video."</string>
- <string name="error_permissions" msgid="3454167403425651254">"De app beschikt niet over bepaalde essentiële rechten. Controleer uw instellingen voor rechten."</string>
+ <string name="error_media_storage_failure" msgid="7711687330673245629">"Er is een probleem opgetreden bij het opslaan van je foto of video."</string>
+ <string name="error_permissions" msgid="3454167403425651254">"De app beschikt niet over bepaalde essentiële rechten. Controleer je instellingen voor rechten."</string>
<string name="reason_storage_failure" msgid="6818898304774654969">"Kan foto niet opslaan."</string>
<string name="wait" msgid="765601745709933047">"Even geduld…"</string>
- <string name="no_storage" product="default" msgid="5922012950780548098">"Plaats een SD-kaart voordat u de camera gebruikt."</string>
+ <string name="no_storage" product="default" msgid="5922012950780548098">"Plaats een SD-kaart voordat je de camera gebruikt."</string>
<string name="preparing_sd" product="default" msgid="7435693655017362767">"SD-kaart voorbereiden…"</string>
<string name="access_sd_fail" product="default" msgid="2634861611082499811">"Geen toegang tot SD-kaart."</string>
<string name="time_lapse_title" msgid="3267978566401228497">"Time-lapse-opname"</string>
@@ -160,7 +160,7 @@
<string name="dialog_cancel" msgid="692365061128351656">"Annuleren"</string>
<string name="dialog_report" msgid="7616428760369876209">"Melden"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"Sluiten"</string>
- <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Uw SD-kaart is bijna vol. Wijzig de kwaliteitsinstelling of verwijder enkele afbeeldingen of andere bestanden."</string>
+ <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Je SD-kaart is bijna vol. Wijzig de kwaliteitsinstelling of verwijder enkele afbeeldingen of andere bestanden."</string>
<string name="video_reach_size_limit" msgid="9196836111505731836">"Maximale grootte bereikt."</string>
<string name="pano_too_fast_prompt" msgid="2503148095578052177">"Te snel"</string>
<string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"Panorama voorbereiden"</string>
@@ -181,7 +181,7 @@
<string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"Kleine ogen"</string>
<string name="effect_backdropper_space" msgid="9133825395915767627">"In de ruimte"</string>
<string name="effect_backdropper_sunset" msgid="7354053769863638757">"Zonsondergang"</string>
- <string name="effect_backdropper_gallery" msgid="2333888391153564920">"Uw video"</string>
+ <string name="effect_backdropper_gallery" msgid="2333888391153564920">"Jouw video"</string>
<string name="video_snapshot_hint" msgid="2707403607250082339">"Tik op het scherm en maak een foto tijdens een opname"</string>
<string name="video_recording_started" msgid="3374878415050991030">"Video-opname is gestart."</string>
<string name="video_recording_stopped" msgid="4658626532857624974">"Video-opname is gestopt."</string>
@@ -276,7 +276,7 @@
<string name="set_duration" msgid="1638453882581604341">"Duur in seconden instellen"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"Aftellen om een foto te nemen"</string>
<string name="remember_location_title" msgid="3045040613094030429">"Fotolocaties onthouden?"</string>
- <string name="remember_location_prompt" msgid="3006013504489919474">"Tag uw foto\'s en video\'s met de locaties waar ze zijn gemaakt."</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"Tag je foto\'s en video\'s met de locaties waar ze zijn gemaakt."</string>
<string name="remember_location_no" msgid="4412802756840226925">"Nee, bedankt"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"Ja"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"MEER OPTIES"</string>
@@ -367,9 +367,9 @@
<string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"Raak hier aan voor opnieuw scherpstellen"</string>
<string name="pref_category_advanced" msgid="5921085080077574872">"Geavanceerd"</string>
<string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"Handmatige belichting"</string>
- <string name="settings_cling_text" msgid="5368054627268181292">"U kunt in Instellingen de resolutie en de kwaliteit wijzigen of geavanceerde functies proberen."</string>
+ <string name="settings_cling_text" msgid="5368054627268181292">"Je kunt in Instellingen de resolutie en de kwaliteit wijzigen of geavanceerde functies proberen."</string>
<string name="photo_size_selection_title" msgid="2789753590719172645">"Formaat van de foto kiezen"</string>
- <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"U kunt dit later wijzigen in Instellingen."</string>
+ <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"Je kunt dit later wijzigen in Instellingen."</string>
<string name="share_to" msgid="5144911209144798122">"Delen met"</string>
<string name="edit_with" msgid="615569327230783971">"Bewerken met"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"VOLGENDE"</string>
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz-rUZ/strings.xml
index c56fba0..2005104 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz-rUZ/strings.xml
@@ -107,8 +107,8 @@
<string name="pref_camera_flashmode_title" msgid="8363803841022314574">"Chaqnoq rejimi"</string>
<string name="pref_camera_flashmode_label" msgid="5852483713534762800">"CHAQNOQ REJIMI"</string>
<string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"Avto"</string>
- <string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"Yoqilgan"</string>
- <string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"O‘chirilgan"</string>
+ <string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"Yoniq"</string>
+ <string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"O‘chiq"</string>
<string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"AVTO CHAQNOQ"</string>
<string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"CHAQNOQ YONIQ"</string>
<string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"CHAQNOQ O‘CHIQ"</string>
@@ -227,7 +227,7 @@
<string name="capital_on" msgid="1118214824959797269">"YONIQ"</string>
<string name="capital_off" msgid="3020696135020167263">"O‘CHIQ"</string>
<string name="video_control_play" msgid="6895236811408921715">"Videoni ijro etish"</string>
- <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"O‘chirilgan"</string>
+ <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"O‘chiq"</string>
<string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0.5 soniya"</string>
<string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 soniya"</string>
<string name="pref_video_time_lapse_frame_interval_1500" msgid="5793250074165436905">"1.5 soniya"</string>