Merge "Update Camera2 for guava 27.1"
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 20fdf24..59733ab 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -270,7 +270,7 @@
<string name="time_lapse_seconds" msgid="7319683099532506270">"Broj sekundi:"</string>
<string name="time_lapse_minutes" msgid="5325447383033224679">"Broj minuta:"</string>
<string name="time_lapse_hours" msgid="5294001144133261436">"Broj sati:"</string>
- <string name="time_lapse_interval_set" msgid="2418594453248958440">"Završeno"</string>
+ <string name="time_lapse_interval_set" msgid="2418594453248958440">"Gotovo"</string>
<string name="set_time_interval" msgid="2531393962847535331">"Postaviti vremenski interval"</string>
<string name="set_time_interval_help" msgid="64145154088021389">"Funkcija protoka vremena je isključena. Uključite je kako biste postavili vremenski interval."</string>
<string name="set_duration" msgid="1638453882581604341">"Postaviti tajmer u sekundama"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 692a15c..82d8bee 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -74,7 +74,7 @@
<string name="no_storage" product="default" msgid="5922012950780548098">"Per utilitzar la càmera, insereix una targeta SD."</string>
<string name="preparing_sd" product="default" msgid="7435693655017362767">"S\'està preparant la targeta SD…"</string>
<string name="access_sd_fail" product="default" msgid="2634861611082499811">"No s\'ha pogut accedir a la targeta SD."</string>
- <string name="time_lapse_title" msgid="3267978566401228497">"Gravació a intervals"</string>
+ <string name="time_lapse_title" msgid="3267978566401228497">"Gravació en mode de filmació a intervals"</string>
<string name="feedback_description_camera_access" msgid="419090951070170132">"L\'aplicació no s\'ha pogut connectar a la càmera."</string>
<string name="feedback_description_save_photo" msgid="8658767358989083228">"La foto o el vídeo no s\'han desat al dispositiu."</string>
<string name="capturing" msgid="5255164204641920893">"S\'està capturant."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index f73580e..0016ddb 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/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">"Kamera auf der Vorderseite"</string>
<string name="pref_camera_id_label_front" msgid="349308803062874842">"Kamera auf der Rückseite"</string>
- <string name="dialog_ok" msgid="774141340500181131">"OK"</string>
+ <string name="dialog_ok" msgid="774141340500181131">"Ok"</string>
<string name="dialog_cancel" msgid="692365061128351656">"Abbrechen"</string>
<string name="dialog_report" msgid="7616428760369876209">"Feedback"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"Schließen"</string>
@@ -373,7 +373,7 @@
<string name="share_to" msgid="5144911209144798122">"Teilen über"</string>
<string name="edit_with" msgid="615569327230783971">"Bearbeiten mit"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"Weiter"</string>
- <string name="confirm_button_text" msgid="7389949384482206814">"OK"</string>
+ <string name="confirm_button_text" msgid="7389949384482206814">"Ok"</string>
<string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"Ergebnis beibehalten \n(4:3)"</string>
<string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"Ergebnis zuschneiden \n(16:9)"</string>
<string name="pref_boolean_false" msgid="461317129020087333">"0"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 7680ecf..495aa5e 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -58,7 +58,7 @@
<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>
+ <string name="auto" msgid="2552649885114400474">"अपने आप"</string>
<string name="flash_on" msgid="6573457197393807642">"फ़्लैश चलाया गया"</string>
<string name="flash_off" msgid="7889323512830926273">"कोई फ़्लैश नहीं"</string>
<string name="unknown" msgid="564184550182858146">"अज्ञात"</string>
@@ -98,7 +98,7 @@
<string name="pref_camera_picturesize_entry_medium" msgid="7708839551627003154">"मध्यम"</string>
<string name="pref_camera_picturesize_entry_small" msgid="2991239656622539068">"छोटा"</string>
<string name="pref_camera_focusmode_title" msgid="3637702747984180030">"फ़ोकस मोड"</string>
- <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"स्वतः"</string>
+ <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"अपने आप"</string>
<string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"अनंत"</string>
<string name="pref_camera_focusmode_entry_macro" msgid="7632276686726851426">"मैक्रो"</string>
<string name="pref_camera_focusmode_label_auto" msgid="4884418453600317694">"स्वत:"</string>
@@ -106,7 +106,7 @@
<string name="pref_camera_focusmode_label_macro" msgid="5065639298027996399">"मैक्रो"</string>
<string name="pref_camera_flashmode_title" msgid="8363803841022314574">"फ़्लैश मोड"</string>
<string name="pref_camera_flashmode_label" msgid="5852483713534762800">"फ़्लैश मोड"</string>
- <string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"स्वतः"</string>
+ <string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"अपने आप"</string>
<string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"चालू"</string>
<string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"बंद"</string>
<string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"फ़्लैश अपनेआप:"</string>
@@ -114,7 +114,7 @@
<string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"फ़्लैश बंद"</string>
<string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"श्वेत संतुलन"</string>
<string name="pref_camera_whitebalance_label" msgid="7370366644738746700">"श्वेत संतुलन"</string>
- <string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"स्वतः"</string>
+ <string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"अपने आप"</string>
<string name="pref_camera_whitebalance_entry_incandescent" msgid="1140391575294372706">"अत्यधिक चमकीला"</string>
<string name="pref_camera_whitebalance_entry_daylight" msgid="757833578153467254">"दिन का प्रकाश"</string>
<string name="pref_camera_whitebalance_entry_fluorescent" msgid="5157027611220790970">"फ़्लोरेसेंट"</string>
@@ -125,7 +125,7 @@
<string name="pref_camera_whitebalance_label_fluorescent" msgid="10552295745391742">"फ़्लोरेसेंट"</string>
<string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"धुंधला"</string>
<string name="pref_camera_scenemode_title" msgid="5709932164781367066">"दृश्य मोड"</string>
- <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"स्वतः"</string>
+ <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"अपने आप"</string>
<string name="pref_camera_scenemode_entry_hdr_plus" msgid="6759085555519758794">"HDR+"</string>
<string name="pref_camera_scenemode_entry_hdr" msgid="3098836808080630955">"HDR"</string>
<string name="pref_camera_scenemode_entry_turn_hdr_plus_on" msgid="1096746750342289067">"HDR+ चालू"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index a9ab833..9fb506f 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -87,7 +87,7 @@
<!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
<skip />
<string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Bip conto alla rov."</string>
- <string name="setting_off" msgid="6782191065550276632">"OFF"</string>
+ <string name="setting_off" msgid="6782191065550276632">"Off"</string>
<string name="setting_on" msgid="9086728135773197891">"ON"</string>
<string name="pref_video_quality_title" msgid="5887153490982738588">"Qualità video"</string>
<string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Time-lapse"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 41e4633..1727e93 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -62,7 +62,7 @@
<string name="flash_on" msgid="6573457197393807642">"フラッシュON"</string>
<string name="flash_off" msgid="7889323512830926273">"フラッシュOFF"</string>
<string name="unknown" msgid="564184550182858146">"不明"</string>
- <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"このアイテムは端末に保存され、オフラインで利用できます。"</string>
+ <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"このアイテムはデバイスに保存され、オフラインで利用できます。"</string>
<string name="please_wait" msgid="1416313324505140068">"お待ちください"</string>
<string name="camera_error_title" msgid="6200558085072670067">"カメラエラー"</string>
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"カメラに接続できません。"</string>
@@ -76,7 +76,7 @@
<string name="access_sd_fail" product="default" msgid="2634861611082499811">"SDカードにアクセスできませんでした。"</string>
<string name="time_lapse_title" msgid="3267978566401228497">"低速度撮影"</string>
<string name="feedback_description_camera_access" msgid="419090951070170132">"アプリをカメラに接続できませんでした"</string>
- <string name="feedback_description_save_photo" msgid="8658767358989083228">"写真または動画は端末に保存されませんでした。"</string>
+ <string name="feedback_description_save_photo" msgid="8658767358989083228">"写真または動画はデバイスに保存されませんでした。"</string>
<string name="capturing" msgid="5255164204641920893">"キャプチャしています"</string>
<string name="pref_camera_id_title" msgid="4680648115225411185">"カメラを選択"</string>
<string name="pref_camera_id_entry_back" msgid="6386943973628160510">"戻る"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 41305a7..af21653 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -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 拍攝的 全景相片"</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>
