Merge "Don't attempt to convert degree to orientation enum twice"
diff --git a/Android.mk b/Android.mk
index 745a2ad..b24a2df 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,12 @@
LOCAL_MODULE_TAGS := optional
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
-LOCAL_STATIC_JAVA_LIBRARIES += android-ex-camera2-portability
+LOCAL_STATIC_ANDROID_LIBRARIES := \
+ androidx.legacy_legacy-support-v13 \
+ androidx.legacy_legacy-support-v4 \
+ androidx.core_core
+
+LOCAL_STATIC_JAVA_LIBRARIES := android-ex-camera2-portability
LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
LOCAL_STATIC_JAVA_LIBRARIES += glide
LOCAL_STATIC_JAVA_LIBRARIES += guava
@@ -19,17 +23,21 @@
$(LOCAL_PATH)/res \
$(LOCAL_PATH)/res_p
-
include $(LOCAL_PATH)/version.mk
+
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
--version-name "$(version_name_package)" \
--version-code $(version_code_package) \
+LOCAL_USE_AAPT2 := true
+
LOCAL_PACKAGE_NAME := Camera2
LOCAL_SDK_VERSION := current
+LOCAL_PRODUCT_MODULE := true
+
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
# Guava uses deprecated org.apache.http.legacy classes.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index df4a0c1..1f13e3e 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -6,7 +6,7 @@
<uses-sdk
android:minSdkVersion="19"
- android:targetSdkVersion="24" />
+ android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
@@ -39,9 +39,10 @@
<application
android:name="com.android.camera.app.CameraApp"
android:hardwareAccelerated="true"
- android:icon="@mipmap/logo_camera_color_44in48dp"
+ android:icon="@mipmap/logo_camera_color"
android:label="@string/app_name"
android:largeHeap="true"
+ android:resizeableActivity="false"
android:restoreAnyVersion="true"
android:supportsRtl="true"
android:theme="@style/Theme.Camera"
@@ -96,7 +97,8 @@
android:label="@string/app_name"
android:theme="@style/Theme.Camera"
android:configChanges="orientation|screenSize|keyboardHidden"
- android:windowSoftInputMode="stateAlwaysHidden|adjustPan">
+ android:windowSoftInputMode="stateAlwaysHidden|adjustPan"
+ android:visibleToInstantApps="true">
<intent-filter>
<action android:name="android.media.action.IMAGE_CAPTURE" />
<category android:name="android.intent.category.DEFAULT" />
diff --git a/CleanSpec.mk b/CleanSpec.mk
index dd945b0..8df8308 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -43,8 +43,9 @@
#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
-
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Camera2)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_tinyplanet.so)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib*/libjni_jpegutil.so)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/OWNERS b/OWNERS
new file mode 100644
index 0000000..ed1d60a
--- /dev/null
+++ b/OWNERS
@@ -0,0 +1,3 @@
+# Default code reviewers picked from top 3 or more developers.
+# Please update this list if you find better candidates.
+rtenneti@google.com
diff --git a/jni/Android.mk b/jni/Android.mk
old mode 100755
new mode 100644
index 80c827a..bdb4167
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -8,8 +8,10 @@
LOCAL_SDK_VERSION := 17
LOCAL_MODULE := libjni_tinyplanet
LOCAL_SRC_FILES := tinyplanet.cc
+LOCAL_PRODUCT_MODULE := true
-LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS += -Wall -Wextra -Werror
LOCAL_ARM_MODE := arm
include $(BUILD_SHARED_LIBRARY)
@@ -17,16 +19,17 @@
# JpegUtil
include $(CLEAR_VARS)
-LOCAL_CFLAGS := -std=c++11
LOCAL_NDK_STL_VARIANT := c++_static
LOCAL_LDFLAGS := -llog -ldl -ljnigraphics
LOCAL_SDK_VERSION := 17
LOCAL_MODULE := libjni_jpegutil
+LOCAL_PRODUCT_MODULE := true
LOCAL_SRC_FILES := jpegutil.cpp jpegutilnative.cpp
LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk
-LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS += -Wall -Wextra -Werror
LOCAL_ARM_MODE := arm
include $(BUILD_SHARED_LIBRARY)
diff --git a/jni/jpegutil.cpp b/jni/jpegutil.cpp
index 02705be..8029869 100644
--- a/jni/jpegutil.cpp
+++ b/jni/jpegutil.cpp
@@ -230,7 +230,7 @@
return true;
};
- dest.term_destination = [](j_compress_ptr cinfo) {
+ dest.term_destination = [](j_compress_ptr cinfo __unused) {
// do nothing to terminate the output buffer
};
@@ -339,7 +339,7 @@
const Plane cbP = {width / 2, height / 2, cbBuf, cbPStride, cbRStride};
const Plane crP = {width / 2, height / 2, crBuf, crPStride, crRStride};
- auto flush = [](size_t numBytes) {
+ auto flush = [](size_t numBytes __unused) {
// do nothing
};
diff --git a/jni/jpegutil.h b/jni/jpegutil.h
index 720b9de..a8066ed 100644
--- a/jni/jpegutil.h
+++ b/jni/jpegutil.h
@@ -181,7 +181,7 @@
const std::array<unsigned char*, ROWS> jpegutil::RowIterator<ROWS>::LoadAt(
int y_base) {
std::array<unsigned char*, ROWS> buf_ptrs;
- for (int i = 0; i < ROWS; i++) {
+ for (unsigned int i = 0; i < ROWS; i++) {
buf_ptrs[i] = &buf_[padded_row_length_ * i];
}
@@ -189,7 +189,7 @@
return buf_ptrs;
}
- for (int i = 0; i < ROWS; i++) {
+ for (unsigned int i = 0; i < ROWS; i++) {
int y = i + y_base;
y = min(y, transform_.output_height() - 1);
diff --git a/jni/jpegutilnative.cpp b/jni/jpegutilnative.cpp
index b2afd94..ad29b87 100644
--- a/jni/jpegutilnative.cpp
+++ b/jni/jpegutilnative.cpp
@@ -67,7 +67,7 @@
*/
extern "C" JNIEXPORT jint JNICALL
Java_com_android_camera_util_JpegUtilNative_compressJpegFromYUV420pNative(
- JNIEnv* env, jclass clazz,
+ JNIEnv* env, jclass clazz __unused,
/** Input image dimensions */
jint width, jint height,
/** Y Plane */
@@ -116,7 +116,7 @@
*/
extern "C" JNIEXPORT void JNICALL
Java_com_android_camera_util_JpegUtilNative_copyImagePlaneToBitmap(
- JNIEnv* env, jclass clazz, jint width, jint height, jobject planeBuf,
+ JNIEnv* env, jclass clazz __unused, jint width, jint height, jobject planeBuf,
jint pStride, jint rStride, jobject outBitmap, jint rot90) {
jbyte* src = (jbyte*)env->GetDirectBufferAddress(planeBuf);
diff --git a/jni/tinyplanet.cc b/jni/tinyplanet.cc
index dfb31d7..de63ac9 100644
--- a/jni/tinyplanet.cc
+++ b/jni/tinyplanet.cc
@@ -130,7 +130,9 @@
}
-JNIEXPORT void JNICALL Java_com_android_camera_tinyplanet_TinyPlanetNative_process(JNIEnv* env, jobject obj, jobject bitmap_in, jint width, jint height, jobject bitmap_out, jint output_size, jfloat scale, jfloat angle)
+JNIEXPORT void JNICALL Java_com_android_camera_tinyplanet_TinyPlanetNative_process(JNIEnv* env,
+ jobject obj __unused, jobject bitmap_in, jint width, jint height, jobject bitmap_out,
+ jint output_size, jfloat scale, jfloat angle)
{
char* source = 0;
char* destination = 0;
diff --git a/res/layout/sticky_bottom_capture_layout.xml b/res/layout/sticky_bottom_capture_layout.xml
index 6d98c30..fe0d316 100644
--- a/res/layout/sticky_bottom_capture_layout.xml
+++ b/res/layout/sticky_bottom_capture_layout.xml
@@ -23,8 +23,8 @@
<com.android.camera.widget.RoundedThumbnailView
android:id="@+id/rounded_thumbnail_view"
- android:layout_width="@+dimen/rounded_thumbnail_ripple_ring_diameter_max"
- android:layout_height="@+dimen/rounded_thumbnail_ripple_ring_diameter_max"
+ android:layout_width="@dimen/rounded_thumbnail_ripple_ring_diameter_max"
+ android:layout_height="@dimen/rounded_thumbnail_ripple_ring_diameter_max"
android:visibility="invisible" />
<include layout="@layout/mode_options_overlay" />
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index c108c21..9fa123f 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -62,15 +62,15 @@
<string name="flash_on" msgid="6573457197393807642">"تم تشغيل الفلاش"</string>
<string name="flash_off" msgid="7889323512830926273">"بلا فلاش"</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>
- <string name="error_camera_disabled" msgid="5582398275657419692">"تم تعطيل الكاميرا بسبب سياسات الأمان."</string>
+ <string name="error_camera_disabled" msgid="5582398275657419692">"تم إيقاف الكاميرا بسبب سياسات الأمان."</string>
<string name="error_media_storage_failure" msgid="7711687330673245629">"حدثت مشكلة أثناء حفظ الصورة أو الفيديو."</string>
<string name="error_permissions" msgid="3454167403425651254">"لا يحتاج التطبيق إلى أذونات خطيرة لتشغيله، يرجى التحقق من إعدادات الأذونات."</string>
<string name="reason_storage_failure" msgid="6818898304774654969">"تعذّر تخزين الصورة."</string>
- <string name="wait" msgid="765601745709933047">"الرجاء الانتظار…"</string>
+ <string name="wait" msgid="765601745709933047">"يُرجى الانتظار…"</string>
<string name="no_storage" product="default" msgid="5922012950780548098">"أدرج بطاقة SD قبل استخدام الكاميرا."</string>
<string name="preparing_sd" product="default" msgid="7435693655017362767">"جارٍ تحضير بطاقة SD…"</string>
<string name="access_sd_fail" product="default" msgid="2634861611082499811">"تعذر الدخول إلى بطاقة SD."</string>
@@ -181,7 +181,7 @@
<string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"عيون صغيرة"</string>
<string name="effect_backdropper_space" msgid="9133825395915767627">"في الفضاء"</string>
<string name="effect_backdropper_sunset" msgid="7354053769863638757">"الغروب"</string>
- <string name="effect_backdropper_gallery" msgid="2333888391153564920">"مقطع فيديو"</string>
+ <string name="effect_backdropper_gallery" msgid="2333888391153564920">"فيديو"</string>
<string name="video_snapshot_hint" msgid="2707403607250082339">"المس لالتقاط صورة أثناء التسجيل."</string>
<string name="video_recording_started" msgid="3374878415050991030">"بدأ تسجيل الفيديو."</string>
<string name="video_recording_stopped" msgid="4658626532857624974">"تم إيقاف تسجيل الفيديو."</string>
@@ -210,7 +210,7 @@
<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>
- <string name="video_date_content_description" msgid="2151884014634284456">"مقطع فيديو تمّ التقاطه في %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">"بانوراما Photo Sphere تمّ التقاطها في %s"</string>
<string name="refocus_date_content_description" msgid="5630960320424345547">"صورة بتركيز العدسة تمّ التقاطها في %s"</string>
@@ -276,7 +276,7 @@
<string name="set_duration" msgid="1638453882581604341">"تعيين المدة بالثواني"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"جارٍ بدء العد التنازلي لالتقاط صورة"</string>
<string name="remember_location_title" msgid="3045040613094030429">"هل تريد حفظ مواقع الصور؟"</string>
- <string name="remember_location_prompt" msgid="3006013504489919474">"ضع علامة على الصور ومقاطع الفيديو تشير إلى المواقع التي تم التقاطها فيها."</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"ضع علامة على الصور والفيديوهات تشير إلى المواقع التي تم التقاطها فيها."</string>
<string name="remember_location_no" msgid="4412802756840226925">"لا شكرًا"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"نعم"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"المزيد من الخيارات"</string>
@@ -345,7 +345,7 @@
<string name="setting_back_camera_video" msgid="5220819479408164689">"فيديو الكاميرا الخلفية"</string>
<string name="setting_front_camera_photo" msgid="4131886734622868637">"صورة الكاميرا الأمامية"</string>
<string name="setting_front_camera_video" msgid="2178799452805359752">"فيديو الكاميرا الأمامية"</string>
- <string name="setting_default_camera" msgid="6954076799301004779">"الكاميرا الافتراضية"</string>
+ <string name="setting_default_camera" msgid="6954076799301004779">"الكاميرا التلقائية"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"المساعدة والتعليقات"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"جارٍ معالجة النطاق عالي الديناميكية+ …"</string>
<string name="open_source_licenses" msgid="2169711954264883060">"تراخيص برامج مفتوحة مصدر"</string>
diff --git a/res/values-az-rAZ/strings.xml b/res/values-az/strings.xml
similarity index 100%
rename from res/values-az-rAZ/strings.xml
rename to res/values-az/strings.xml
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d01fc17..e4d34f5 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -297,7 +297,7 @@
<string name="mode_timelapse" msgid="1517168724627815453">"Snimanje u dužem intervalu"</string>
<string name="mode_wideangle" msgid="1099640345041696830">"Široki ugao"</string>
<string name="mode_panorama" msgid="6882648621305828861">"Panorama"</string>
- <string name="mode_refocus" msgid="172192967119469061">"Zamagljivanje slike"</string>
+ <string name="mode_refocus" msgid="172192967119469061">"Zamagljivanje"</string>
<string name="mode_camera_desc" msgid="3670807361165657278">"Prebacite na režim kamere"</string>
<string name="mode_video_desc" msgid="4058407412929464689">"Prebacite na video kameru"</string>
<string name="mode_photosphere_desc" msgid="2403816283825579161">"Prebacite na režim Photo Sphere"</string>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
new file mode 100644
index 0000000..f64118e
--- /dev/null
+++ b/res/values-be/strings.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1175086483881127797">"Камера"</string>
+ <string name="video_camera_label" msgid="1723708322021743770">"Відэакамера"</string>
+ <string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
+ <string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
+ <string name="set_image" msgid="3969690281401045698">"Задаць відарыс як"</string>
+ <string name="delete" msgid="2714492172818940424">"Выдаліць"</string>
+ <string name="share" msgid="8581089487762243115">"Абагуліць"</string>
+ <string name="share_panorama" msgid="3558466186935359444">"Абагуліць панараму"</string>
+ <string name="share_as_photo" msgid="4831213580709167218">"Абагуліць фота"</string>
+ <string name="deleted" msgid="2036165115527228127">"Выдалена"</string>
+ <string name="undo" msgid="5110048345890050107">"АДРАБІЦЬ"</string>
+ <string name="details" msgid="4404020741542549488">"Звесткі"</string>
+ <string name="close" msgid="4826166926297479820">"Закрыць"</string>
+ <string name="show_on_map" msgid="8542853913632649160">"Паказаць на карце"</string>
+ <string name="rotate_left" msgid="2618440058490662604">"Павярнуць налева"</string>
+ <string name="rotate_right" msgid="4896096424267838355">"Павярнуць направа"</string>
+ <string name="edit" msgid="2776879395749004347">"Рэдагаваць"</string>
+ <string name="crop_action" msgid="6933589718464132714">"Абрэзаць"</string>
+ <string name="trim_action" msgid="4736803320203951827">"Абрэзка"</string>
+ <string name="set_as" msgid="5469055085024870081">"Задаць у якасці"</string>
+ <string name="video_err" msgid="1562566029875081552">"Не атрымліваецца прайграць відэа."</string>
+ <string name="title" msgid="8061744305671964703">"Назва"</string>
+ <string name="description" msgid="8193138501982849808">"Апісанне"</string>
+ <string name="time" msgid="5248213506417024287">"Час"</string>
+ <string name="location" msgid="564326205780827668">"Месцазнаходжанне"</string>
+ <string name="path" msgid="5927003361865586353">"Шлях"</string>
+ <string name="width" msgid="7045750687833828758">"Шырыня"</string>
+ <string name="height" msgid="5186001199353423689">"Вышыня"</string>
+ <string name="orientation" msgid="3883761294106680270">"Арыентацыя"</string>
+ <string name="duration" msgid="5316211067383665008">"Працягласць"</string>
+ <string name="mimetype" msgid="6415940055077963944">"Тып MIME"</string>
+ <string name="file_size" msgid="6841070748357980676">"Памер файла"</string>
+ <string name="maker" msgid="698691509121545856">"Стваральнік"</string>
+ <string name="model" msgid="8547493604023069452">"Мадэль"</string>
+ <string name="flash" msgid="995041910749174196">"Успышка"</string>
+ <string name="aperture" msgid="2453802098282814022">"Апертура"</string>
+ <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="unit_mm" msgid="5210344300697638286">"мм"</string>
+ <string name="manual" msgid="2444400953521760140">"Уручную"</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>
+ <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">"Не атрымлiваецца падлучыцца да камеры."</string>
+ <string name="error_camera_disabled" msgid="5582398275657419692">"Камера была адключана з-за палітыкі бяспекі."</string>
+ <string name="error_media_storage_failure" msgid="7711687330673245629">"Падчас захавання вашага фота ці відэа адбылася памылка."</string>
+ <string name="error_permissions" msgid="3454167403425651254">"Для запуску гэтай праграмы патрабуюцца крытычныя дазволы, якія ў яе адсутнічаюць. Калі ласка, праверце свае налады дазволаў."</string>
+ <string name="reason_storage_failure" msgid="6818898304774654969">"Не атрымалася захаваць фота."</string>
+ <string name="wait" msgid="765601745709933047">"Калі ласка, пачакайце..."</string>
+ <string name="no_storage" product="default" msgid="5922012950780548098">"Устаўце SD-карту перад выкарыстаннем камеры."</string>
+ <string name="preparing_sd" product="default" msgid="7435693655017362767">"Падрыхтоўка SD-карты..."</string>
+ <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="capturing" msgid="5255164204641920893">"Захоп"</string>
+ <string name="pref_camera_id_title" msgid="4680648115225411185">"Выбраць камеру"</string>
+ <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Назад"</string>
+ <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Пярэдняя"</string>
+ <string name="pref_camera_save_location_title" msgid="2344235620113384017">"Захаваць месцазнах."</string>
+ <string name="pref_camera_location_label" msgid="8695441802378057719">"МЕСЦАЗНАХОДЖАННЕ"</string>
+ <string name="pref_camera_timer_title" msgid="4728838281741571323">"Таймер адваротнага адлiку"</string>
+ <!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
+ <skip />
+ <string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Гукавы сігнал падчас адваротнага адлiку"</string>
+ <string name="setting_off" msgid="6782191065550276632">"Адключана"</string>
+ <string name="setting_on" msgid="9086728135773197891">"Уключана"</string>
+ <string name="pref_video_quality_title" msgid="5887153490982738588">"Якасць відэа"</string>
+ <string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Запаволеная здымка"</string>
+ <string name="pref_camera_settings_category" msgid="4274141528139077830">"Налады камеры"</string>
+ <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Налады відэакамеры"</string>
+ <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Памер відарыса"</string>
+ <string name="pref_camera_picturesize_entry_large" msgid="9014447075089601575">"Вялікі"</string>
+ <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_infinity" msgid="3887667853236656322">"Бясконцасць"</string>
+ <string name="pref_camera_focusmode_entry_macro" msgid="7632276686726851426">"Макра"</string>
+ <string name="pref_camera_focusmode_label_auto" msgid="4884418453600317694">"АЎТАМАТЫЧНА"</string>
+ <string name="pref_camera_focusmode_label_infinity" msgid="1673352016120343314">"БЯСКОНЦАСЦЬ"</string>
+ <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">"РЭЖЫМ УСПЫШКI"</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>
+ <string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"УСПЫШКА ЎКЛЮЧАНА"</string>
+ <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_incandescent" msgid="1140391575294372706">"Лямпа напальвання"</string>
+ <string name="pref_camera_whitebalance_entry_daylight" msgid="757833578153467254">"Дзённае святло"</string>
+ <string name="pref_camera_whitebalance_entry_fluorescent" msgid="5157027611220790970">"Флюарэсцэнтны"</string>
+ <string name="pref_camera_whitebalance_entry_cloudy" msgid="3569589102226796875">"Воблачна"</string>
+ <string name="pref_camera_whitebalance_label_auto" msgid="4305837287360485369">"АЎТАМАТЫЧНА"</string>
+ <string name="pref_camera_whitebalance_label_incandescent" msgid="2860805668879945185">"ЛЯМПА НАПАЛЬВАННЯ"</string>
+ <string name="pref_camera_whitebalance_label_daylight" msgid="4562002095198912409">"ДЗЁННАЕ СВЯТЛО"</string>
+ <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_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>
+ <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ АДКЛЮЧАНЫ"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR УКЛЮЧАНЫ"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR АДКЛЮЧАНЫ"</string>
+ <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Здымак у руху"</string>
+ <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Ноч"</string>
+ <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Захад сонца"</string>
+ <string name="pref_camera_scenemode_entry_party" msgid="401232668169066415">"Гулянка"</string>
+ <string name="pref_camera_scenemode_label_auto" msgid="2874586883608401615">"НЯМА"</string>
+ <string name="pref_camera_scenemode_label_action" msgid="1822814017595414923">"ЗДЫМАК У РУХУ"</string>
+ <string name="pref_camera_scenemode_label_night" msgid="7764371228088101131">"НОЧ"</string>
+ <string name="pref_camera_scenemode_label_sunset" msgid="3443610538453611123">"ЗАХАД СОНЦА"</string>
+ <string name="pref_camera_scenemode_label_party" msgid="917499272505930322">"ГУЛЯНКА"</string>
+ <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"ТАЙМЕР АДКЛЮЧАНЫ"</string>
+ <string name="pref_camera_countdown_label_one" msgid="7647972711796868848">"1 СЕКУНДА"</string>
+ <string name="pref_camera_countdown_label_three" msgid="3154170918067103541">"3 СЕКУНДЫ"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"10 СЕКУНД"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="8469955900530268867">"15 СЕКУНД"</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">"ЭКСПАЗIЦЫЯ"</string>
+ <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
+ <skip />
+ <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+ <skip />
+ <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_cancel" msgid="692365061128351656">"Скасаваць"</string>
+ <string name="dialog_report" msgid="7616428760369876209">"Паведаміць"</string>
+ <string name="dialog_dismiss" msgid="1382550604990470119">"Адхіліць"</string>
+ <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Месца на вашай SD-карце заканчваецца. Змяніце параметры якасці або выдаліце некаторыя відарысы цi іншыя файлы."</string>
+ <string name="video_reach_size_limit" msgid="9196836111505731836">"Дасягнуты максімальны памер."</string>
+ <string name="pano_too_fast_prompt" msgid="2503148095578052177">"Занадта хутка"</string>
+ <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"Падрыхтоўка панарамы"</string>
+ <string name="pano_dialog_panorama_failed" msgid="6772546547048693619">"Не атрымалася захаваць панараму."</string>
+ <string name="pano_dialog_title" msgid="6662642763395425145">"Панарама"</string>
+ <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="tap_to_focus" msgid="3519718196270593468">"Дакран., каб наладз. фокус."</string>
+ <string name="pref_video_effect_title" msgid="594570613431209010">"Эфекты"</string>
+ <string name="effect_none" msgid="3102797925086872636">"Без эфектаў"</string>
+ <string name="effect_goofy_face_squeeze" msgid="1362021544829311452">"Сцicнуць"</string>
+ <string name="effect_goofy_face_big_eyes" msgid="9220121522816762649">"Вялiкiя вочы"</string>
+ <string name="effect_goofy_face_big_mouth" msgid="2064008284599552683">"Вялiкi рот"</string>
+ <string name="effect_goofy_face_small_mouth" msgid="3105849596912069261">"Маленькi рот"</string>
+ <string name="effect_goofy_face_big_nose" msgid="6936976307035428164">"Вялікі нос"</string>
+ <string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"Маленькiя вочы"</string>
+ <string name="effect_backdropper_space" msgid="9133825395915767627">"У космасе"</string>
+ <string name="effect_backdropper_sunset" msgid="7354053769863638757">"Захад сонца"</string>
+ <string name="effect_backdropper_gallery" msgid="2333888391153564920">"Ваша відэа"</string>
+ <string name="video_snapshot_hint" msgid="2707403607250082339">"Дакраніцеся, каб зрабiць здымак падчас запісу."</string>
+ <string name="video_recording_started" msgid="3374878415050991030">"Запіс відэа пачаўся."</string>
+ <string name="video_recording_stopped" msgid="4658626532857624974">"Запіс відэа спыніўся."</string>
+ <string name="clear_effects" msgid="6192797848995967992">"Выдалiць эфекты"</string>
+ <string name="effect_silly_faces" msgid="7952713419757286453">"ДУРНАВАТЫЯ ТВАРЫ"</string>
+ <string name="effect_background" msgid="1358432220077975015">"ФОНАВЫЯ"</string>
+ <string name="accessibility_shutter_button" msgid="6040483605347230438">"Затвор"</string>
+ <string name="accessibility_cancel_button" msgid="5679989494636116448">"Скасаваць"</string>
+ <string name="accessibility_menu_button" msgid="7692103503958544723">"Кнопка меню"</string>
+ <string name="accessibility_check_box" msgid="1084094675439953723">"Поле %1$s"</string>
+ <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">"Пераключыцца на рэжым фотасферы"</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>
+ <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="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>
+ <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"</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>
+ <string name="btn_mode_list_toggle" msgid="3986242443098400164">"Спіс рэжымаў"</string>
+ <string name="accessibility_filmstrip_toggle" msgid="6966978483643396442">"Укл./выкл. дыястужку"</string>
+ <string name="btn_filmstrip_toggle" msgid="3666693972882351490">"Дыястужка"</string>
+ <string name="accessibility_mode_zoom_plus" msgid="4967389173992713073">"Павялічыць маштаб"</string>
+ <string name="btn_zoom_plus" msgid="4645138949375961656">"Павялічыць"</string>
+ <string name="accessibility_mode_zoom_minus" msgid="8850636036927992409">"Паменшыць маштаб"</string>
+ <string name="btn_zoom_minus" msgid="5436240345362098272">"Паменшыць"</string>
+ <string name="accessibility_zoom_announcement" msgid="6976673411698319811">"Значэнне маштабу: %.1f"</string>
+ <string name="capital_on" msgid="1118214824959797269">"УКЛЮЧАНА"</string>
+ <string name="capital_off" msgid="3020696135020167263">"АДКЛЮЧАНА"</string>
+ <string name="video_control_play" msgid="6895236811408921715">"Прайграванне відэа"</string>
+ <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Адключана"</string>
+ <string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0,5 секунды"</string>
+ <string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 секунда"</string>
+ <string name="pref_video_time_lapse_frame_interval_1500" msgid="5793250074165436905">"1,5 секунды"</string>
+ <string name="pref_video_time_lapse_frame_interval_2000" msgid="1821755013078449188">"2 секунды"</string>
+ <string name="pref_video_time_lapse_frame_interval_2500" msgid="8027471301321122045">"2,5 секунды"</string>
+ <string name="pref_video_time_lapse_frame_interval_3000" msgid="1411114492405867872">"3 секунды"</string>
+ <string name="pref_video_time_lapse_frame_interval_4000" msgid="1197483421014140132">"4 секунды"</string>
+ <string name="pref_video_time_lapse_frame_interval_5000" msgid="7211885329755347592">"5 секунд"</string>
+ <string name="pref_video_time_lapse_frame_interval_6000" msgid="6665825017557898190">"6 секунд"</string>
+ <string name="pref_video_time_lapse_frame_interval_10000" msgid="1126841483618922521">"10 секунд"</string>
+ <string name="pref_video_time_lapse_frame_interval_12000" msgid="8769265988037327085">"12 секунд"</string>
+ <string name="pref_video_time_lapse_frame_interval_15000" msgid="1452711342185926617">"15 секунд"</string>
+ <string name="pref_video_time_lapse_frame_interval_24000" msgid="2505505645705111419">"24 секунды"</string>
+ <string name="pref_video_time_lapse_frame_interval_30000" msgid="3965378176246680626">"0,5 хвіліны"</string>
+ <string name="pref_video_time_lapse_frame_interval_60000" msgid="1878467100201983878">"1 хвіліна"</string>
+ <string name="pref_video_time_lapse_frame_interval_90000" msgid="496651530019049822">"1,5 хвіліны"</string>
+ <string name="pref_video_time_lapse_frame_interval_120000" msgid="126293364329503816">"2 хвіліны"</string>
+ <string name="pref_video_time_lapse_frame_interval_150000" msgid="3469164780802564276">"2,5 хвіліны"</string>
+ <string name="pref_video_time_lapse_frame_interval_180000" msgid="6840421790710639463">"3 хвіліны"</string>
+ <string name="pref_video_time_lapse_frame_interval_240000" msgid="1682865866425206481">"4 хвіліны"</string>
+ <string name="pref_video_time_lapse_frame_interval_300000" msgid="6068734332915957652">"5 хвілін"</string>
+ <string name="pref_video_time_lapse_frame_interval_360000" msgid="4692565393277579688">"6 хвілін"</string>
+ <string name="pref_video_time_lapse_frame_interval_600000" msgid="7109530398883649472">"10 хвілін"</string>
+ <string name="pref_video_time_lapse_frame_interval_720000" msgid="259321148909130247">"12 хвілін"</string>
+ <string name="pref_video_time_lapse_frame_interval_900000" msgid="6814816608134052996">"15 хвілін"</string>
+ <string name="pref_video_time_lapse_frame_interval_1440000" msgid="5691479246748705053">"24 хвіліны"</string>
+ <string name="pref_video_time_lapse_frame_interval_1800000" msgid="8331728629455012478">"0,5 гадзіны"</string>
+ <string name="pref_video_time_lapse_frame_interval_3600000" msgid="4829442147263610121">"1 гадзіна"</string>
+ <string name="pref_video_time_lapse_frame_interval_5400000" msgid="7011488725038113884">"1,5 гадзіны"</string>
+ <string name="pref_video_time_lapse_frame_interval_7200000" msgid="7399563587870916008">"2 гадзіны"</string>
+ <string name="pref_video_time_lapse_frame_interval_9000000" msgid="1545856778907835970">"2,5 гадзіны"</string>
+ <string name="pref_video_time_lapse_frame_interval_10800000" msgid="4064231412857457518">"3 гадзіны"</string>
+ <string name="pref_video_time_lapse_frame_interval_14400000" msgid="5174457951350690217">"4 гадзіны"</string>
+ <string name="pref_video_time_lapse_frame_interval_18000000" msgid="5091441456160949740">"5 гадзін"</string>
+ <string name="pref_video_time_lapse_frame_interval_21600000" msgid="6924571987775154098">"6 гадзін"</string>
+ <string name="pref_video_time_lapse_frame_interval_36000000" msgid="6959912631566981301">"10 гадзін"</string>
+ <string name="pref_video_time_lapse_frame_interval_43200000" msgid="6426833030111269499">"12 гадзін"</string>
+ <string name="pref_video_time_lapse_frame_interval_54000000" msgid="6688725497680331090">"15 гадзін"</string>
+ <string name="pref_video_time_lapse_frame_interval_86400000" msgid="5510320806095156153">"24 гадзіны"</string>
+ <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="set_time_interval" msgid="2531393962847535331">"Задаць iнтэрвал часу"</string>
+ <string name="set_time_interval_help" msgid="64145154088021389">"Функцыя «Запаволеная здымка» выключана. Уключыце яе, каб задаць інтэрвал часу."</string>
+ <string name="set_duration" msgid="1638453882581604341">"Задаць працягласць у секундах"</string>
+ <string name="count_down_title_text" msgid="7586031110595513050">"Адваротны адлiк да здымка"</string>
+ <string name="remember_location_title" msgid="3045040613094030429">"Запамiнаць месца, дзе знята фота?"</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"Адзначце на вашых фатаграфіях і відэа месцы, у якіх яны былі зняты."</string>
+ <string name="remember_location_no" msgid="4412802756840226925">"Не, дзякуй"</string>
+ <string name="remember_location_yes" msgid="4339424460683531388">"Так"</string>
+ <string name="camera_menu_more_label" msgid="7951917844735828365">"ДАДАТКОВЫЯ ПАРАМЕТРЫ"</string>
+ <string name="camera_menu_settings_label" msgid="3862756725328016822">"НАЛАДЫ"</string>
+ <string name="create_tiny_planet" msgid="5186918191372107343">"Стварыць маленькую планету"</string>
+ <string name="saving_tiny_planet" msgid="8828265180177375494">"Захаванне маленькай планеты …"</string>
+ <string name="tiny_planet_zoom" msgid="2985522360577158474">"Маштабаваць"</string>
+ <string name="tiny_planet_rotate" msgid="5445336705705350004">"Павярнуць"</string>
+ <string name="photo_editor" msgid="1521994560971367225">"Фотарэдактар"</string>
+ <string name="crop_save" msgid="2841974981340098579">"Захаваць"</string>
+ <string name="cannot_load_image" msgid="4100136187076585580">"Не атрымлiваецца загрузіць відарыс!"</string>
+ <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Прагляд дыястужкі"</string>
+ <string name="setting_wallpaper" msgid="2397759659347872725">"Усталёўка шпалер"</string>
+ <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">"Фотасфера"</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">"Пераключыцца на рэжым фотасферы"</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>
+ <string name="settings_close_desc" msgid="3095831199632813127">"Закрыць налады"</string>
+ <string name="hdr_plus_off_desc" msgid="5301287296717144319">"HDR Plus адключаны"</string>
+ <string name="hdr_plus_on_desc" msgid="8204780034508139909">"HDR Plus уключаны"</string>
+ <string name="hdr_off_desc" msgid="7921924739852874675">"HDR адключаны"</string>
+ <string name="hdr_on_desc" msgid="4591284110249047558">"HDR уключаны"</string>
+ <string name="flash_off_desc" msgid="7151559466286106797">"УСПЫШКА АДКЛЮЧАНА"</string>
+ <string name="flash_auto_desc" msgid="3009043125539675717">"Аўтаўспышка"</string>
+ <string name="flash_on_desc" msgid="930372145324854699">"Успышка ўключана"</string>
+ <string name="hdr_plus_flash_off_desc" msgid="5335888906983788789">"Успышка HDR+ адключана"</string>
+ <string name="hdr_plus_flash_auto_desc" msgid="4812200236263011537">"Аўтаўспышка HDR+"</string>
+ <string name="hdr_plus_flash_on_desc" msgid="8323389161987561284">"Успышка HDR+ уключана"</string>
+ <string name="torch_on_desc" msgid="3069836196559213365">"Ліхтарык уключаны"</string>
+ <string name="torch_off_desc" msgid="8304675202998742618">"Ліхтарык адключаны"</string>
+ <string name="camera_id_back_desc" msgid="3566327490758890635">"Задняя камера"</string>
+ <string name="camera_id_front_desc" msgid="7497517948130254220">"Пярэдняя камера"</string>
+ <string name="grid_lines_off_desc" msgid="2022385817190451353">"Лініі сеткі адключаны"</string>
+ <string name="grid_lines_on_desc" msgid="4601540461914364817">"Лініі сеткі ўключаны"</string>
+ <string name="countdown_timer_off" msgid="1663008439564495948">"Таймер адваротнага адліку адключаны"</string>
+ <string name="countdown_timer_duration_3s" msgid="7435393834886072664">"Таймер адваротнага адліку пастаўлены на 3 секунды"</string>
+ <string name="countdown_timer_duration_10s" msgid="9085308782250002795">"Таймер адваротнага адліку пастаўлены на 10 секунд"</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="retake_button_description" msgid="4234613030674787714">"Перазняць"</string>
+ <string name="review_button_description" msgid="7932122063748430080">"Разгляд"</string>
+ <string name="share_button_description" msgid="5108508790540832053">"Абагуліць"</string>
+ <string name="view_button_description" msgid="4985768837891362075">"Прагляд"</string>
+ <string name="edit_button_description" msgid="98550816724901925">"Рэдагаваць"</string>
+ <string name="delete_button_description" msgid="2251065309677200911">"Выдаліць"</string>
+ <string name="manual_exposure_compensation_desc" msgid="5595219532556566042">"Кампенсацыя экспазіцыі ўручную"</string>
+ <string name="exposure_compensation_desc_n2" msgid="8957966533506294324">"Кампенсацыя экспазіцыі -2"</string>
+ <string name="exposure_compensation_desc_n1" msgid="3035027224866688267">"Кампенсацыя экспазіцыі -1"</string>
+ <string name="exposure_compensation_desc_0" msgid="2820273752287040523">"Кампенсацыя экспазіцыі 0"</string>
+ <string name="exposure_compensation_desc_p1" msgid="2328275401634452554">"Кампенсацыя экспазіцыі +1"</string>
+ <string name="exposure_compensation_desc_p2" msgid="4555277824096107142">"Кампенсацыя экспазіцыі +2"</string>
+ <string name="button_change_announcement" msgid="3759686152778772111">"Цяпер задана значэнне кнопкі %s"</string>
+ <string name="setting_location" msgid="4459859689227893838">"Месцазнаходжанне"</string>
+ <string name="setting_back_camera_photo" msgid="256738900473265017">"Фота з задняй камеры"</string>
+ <string name="setting_back_camera_video" msgid="5220819479408164689">"Відэа з задняй камеры"</string>
+ <string name="setting_front_camera_photo" msgid="4131886734622868637">"Фота з пярэдняй камеры"</string>
+ <string name="setting_front_camera_video" msgid="2178799452805359752">"Відэа з пярэдняй камеры"</string>
+ <string name="setting_default_camera" msgid="6954076799301004779">"Стандартная камера"</string>
+ <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Даведка і водгукі"</string>
+ <string name="processing_hdr_plus" msgid="9160093263037540304">"Апрацоўка HDR+ …"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"Ліцэнзіі ПЗ з адкр. зых. кодам"</string>
+ <string name="pref_category_general" msgid="6737748849700581019">"Агульныя налады"</string>
+ <string name="pref_category_resolution_quality" msgid="6641462402321962896">"Раздзяляльнасць і якасць"</string>
+ <string name="pref_category_about" msgid="1966255405679342337">"Інфармацыя"</string>
+ <string name="pref_title_build_version" msgid="481489988124832651">"Версія зборкі"</string>
+ <string name="pref_video_quality_entry_low" msgid="737962621299050603">"Нізкая якасць"</string>
+ <string name="pref_video_quality_entry_high" msgid="1613578418842803393">"Высокая якасць"</string>
+ <string name="pref_video_quality_entry_qcif" msgid="1717816794399266216">"QCIF"</string>
+ <string name="pref_video_quality_entry_cif" msgid="645414019445016434">"CIF"</string>
+ <string name="pref_video_quality_entry_480p" msgid="5880250731066854583">"SD 480p"</string>
+ <string name="pref_video_quality_entry_720p" msgid="4076146428148167262">"HD 720p"</string>
+ <string name="pref_video_quality_entry_1080p" msgid="4539958891524211120">"HD 1080p"</string>
+ <string name="pref_video_quality_entry_qvga" msgid="342600517453781430">"QVGA"</string>
+ <string name="pref_video_quality_entry_2160p" msgid="4522927631413184505">"UHD 4K"</string>
+ <string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s Мп"</string>
+ <string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s Мп"</string>
+ <string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"Для перафакусіроўкі дакраніцеся тут"</string>
+ <string name="pref_category_advanced" msgid="5921085080077574872">"Дадатковыя"</string>
+ <string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"Экспазіцыя ўручную"</string>
+ <string name="settings_cling_text" msgid="5368054627268181292">"Змяніце раздзяляльнасць і якасць у Наладах або паспрабуйце дадатковыя функцыі."</string>
+ <string name="photo_size_selection_title" msgid="2789753590719172645">"Выбраць памер фота"</string>
+ <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"Вы можаце змяніць гэта пазней у Наладах."</string>
+ <string name="share_to" msgid="5144911209144798122">"Абагуліць з"</string>
+ <string name="edit_with" msgid="615569327230783971">"Рэдагаваць з дапам."</string>
+ <string name="startup_dialog_button_next" msgid="1011831256978228993">"ДАЛЕЙ"</string>
+ <string name="confirm_button_text" msgid="7389949384482206814">"ДОБРА, ЗРАЗУМЕЛА!"</string>
+ <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"Поўны відарыс з датчыка \n(4:3)"</string>
+ <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"Абрэз. відар. з датчыка \n(16:9)"</string>
+ <string name="pref_boolean_false" msgid="461317129020087333">"0"</string>
+ <string name="pref_boolean_true" msgid="4131945223998878009">"1"</string>
+ <string name="session_saving_image" msgid="8932315404486416826">"Захаванне..."</string>
+</resources>
diff --git a/res/values-bn-rBD/strings.xml b/res/values-bn/strings.xml
similarity index 97%
rename from res/values-bn-rBD/strings.xml
rename to res/values-bn/strings.xml
index 5ef6f5e..051eba2 100644
--- a/res/values-bn-rBD/strings.xml
+++ b/res/values-bn/strings.xml
@@ -20,27 +20,27 @@
<string name="video_camera_label" msgid="1723708322021743770">"ক্যামকর্ডার"</string>
<string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
<string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
- <string name="set_image" msgid="3969690281401045698">"এই হিসাবে ছবি সেট করুন"</string>
+ <string name="set_image" msgid="3969690281401045698">"এই হিসেবে ছবি সেট করুন"</string>
<string name="delete" msgid="2714492172818940424">"মুছুন"</string>
<string name="share" msgid="8581089487762243115">"শেয়ার করুন"</string>
<string name="share_panorama" msgid="3558466186935359444">"প্যানোরামা শেয়ার করুন"</string>
- <string name="share_as_photo" msgid="4831213580709167218">"ফটো হিসাবে শেয়ার করুন"</string>
+ <string name="share_as_photo" msgid="4831213580709167218">"ফটো হিসেবে শেয়ার করুন"</string>
<string name="deleted" msgid="2036165115527228127">"মোছা হয়েছে"</string>
<string name="undo" msgid="5110048345890050107">"পূর্বাবস্থায় ফিরুন"</string>
<string name="details" msgid="4404020741542549488">"বিশদ বিবরণ"</string>
<string name="close" msgid="4826166926297479820">"বন্ধ করুন"</string>
- <string name="show_on_map" msgid="8542853913632649160">"মানচিত্রে দেখান"</string>
+ <string name="show_on_map" msgid="8542853913632649160">"ম্যাপে দেখান"</string>
<string name="rotate_left" msgid="2618440058490662604">"বামদিকে ঘোরান"</string>
<string name="rotate_right" msgid="4896096424267838355">"ডানদিকে ঘোরান"</string>
<string name="edit" msgid="2776879395749004347">"সম্পাদনা করুন"</string>
<string name="crop_action" msgid="6933589718464132714">"ক্রপ"</string>
<string name="trim_action" msgid="4736803320203951827">"ট্রিম করুন"</string>
- <string name="set_as" msgid="5469055085024870081">"এই হিসাবে সেট করুন"</string>
+ <string name="set_as" msgid="5469055085024870081">"এই হিসেবে সেট করুন"</string>
<string name="video_err" msgid="1562566029875081552">"ভিডিও প্লে করা যাবে না৷"</string>
<string name="title" msgid="8061744305671964703">"শীর্ষক"</string>
<string name="description" msgid="8193138501982849808">"বর্ণনা"</string>
<string name="time" msgid="5248213506417024287">"সময়"</string>
- <string name="location" msgid="564326205780827668">"অবস্থান"</string>
+ <string name="location" msgid="564326205780827668">"লোকেশন"</string>
<string name="path" msgid="5927003361865586353">"পথ"</string>
<string name="width" msgid="7045750687833828758">"প্রস্থ"</string>
<string name="height" msgid="5186001199353423689">"উচ্চতা"</string>
@@ -81,8 +81,8 @@
<string name="pref_camera_id_title" msgid="4680648115225411185">"ক্যামেরা বেছে নিন"</string>
<string name="pref_camera_id_entry_back" msgid="6386943973628160510">"পিছনে"</string>
<string name="pref_camera_id_entry_front" msgid="6233067010315787044">"সামনের"</string>
- <string name="pref_camera_save_location_title" msgid="2344235620113384017">"অবস্থান সংরক্ষণ করুন"</string>
- <string name="pref_camera_location_label" msgid="8695441802378057719">"অবস্থান"</string>
+ <string name="pref_camera_save_location_title" msgid="2344235620113384017">"লোকেশন সেভ করুন"</string>
+ <string name="pref_camera_location_label" msgid="8695441802378057719">"লোকেশন"</string>
<string name="pref_camera_timer_title" msgid="4728838281741571323">"কাউন্টডাউন টাইমার"</string>
<!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
<skip />
@@ -160,7 +160,7 @@
<string name="dialog_cancel" msgid="692365061128351656">"বাতিল"</string>
<string name="dialog_report" msgid="7616428760369876209">"অভিযোগ করুন"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"খারিজ করুন"</string>
- <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"আপনার SD কার্ডে আর পর্যাপ্ত নেই। গুণমান সেটিংস পরিবর্তন করুন অথবা কিছু চিত্র বা অন্য ফাইলগুলি মুছে দিন।"</string>
+ <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"আপনার SD কার্ডে আর পর্যাপ্ত নেই। গুণমান সেটিংস পরিবর্তন করুন অথবা কিছু ছবি বা অন্য ফাইলগুলি মুছে দিন।"</string>
<string name="video_reach_size_limit" msgid="9196836111505731836">"আকার সীমায় পৌঁছে গেছে।"</string>
<string name="pano_too_fast_prompt" msgid="2503148095578052177">"খুব দ্রুত"</string>
<string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"প্যানোরামা প্রস্তুত করা হচ্ছে"</string>
@@ -287,8 +287,8 @@
<string name="set_time_interval_help" msgid="64145154088021389">"সময় ব্যয় বৈশিষ্ট্যটি বন্ধ। সময় বিরতি সেট করতে এটিকে চালু করুন।"</string>
<string name="set_duration" msgid="1638453882581604341">"সময়কাল সেকেন্ডে সেট করুন"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"একটি ফটো তুলতে কাউন্ট ডাউন হচ্ছে"</string>
- <string name="remember_location_title" msgid="3045040613094030429">"ফটোর অবস্থান মনে রাখবেন?"</string>
- <string name="remember_location_prompt" msgid="3006013504489919474">"আপনার ফটো ও ভিডিওগুলির তোলার অবস্থান সহ সেগুলিকে ট্যাগ করুন৷"</string>
+ <string name="remember_location_title" msgid="3045040613094030429">"ফটোর লোকেশন মনে রাখবেন?"</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"আপনার ফটো ও ভিডিওগুলির তোলার লোকেশন সহ সেগুলিকে ট্যাগ করুন৷"</string>
<string name="remember_location_no" msgid="4412802756840226925">"না থাক"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"হ্যাঁ"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"আরো বিকল্প"</string>
@@ -298,8 +298,8 @@
<string name="tiny_planet_zoom" msgid="2985522360577158474">"জুম"</string>
<string name="tiny_planet_rotate" msgid="5445336705705350004">"ঘোরান"</string>
<string name="photo_editor" msgid="1521994560971367225">"ফটো সম্পাদক"</string>
- <string name="crop_save" msgid="2841974981340098579">"সংরক্ষণ করুন"</string>
- <string name="cannot_load_image" msgid="4100136187076585580">"চিত্রটি লোড করা যাবে না!"</string>
+ <string name="crop_save" msgid="2841974981340098579">"সেভ করুন"</string>
+ <string name="cannot_load_image" msgid="4100136187076585580">"ছবিটি লোড করা যাবে না!"</string>
<string name="switch_photo_filmstrip" msgid="1448511001008888767">"ফিল্মস্ট্রিপ দৃশ্য"</string>
<string name="setting_wallpaper" msgid="2397759659347872725">"ওয়ালপেপার সেট করা"</string>
<string name="mode_settings" msgid="2021937261522670921">"সেটিংস"</string>
@@ -352,7 +352,7 @@
<string name="exposure_compensation_desc_p1" msgid="2328275401634452554">"এক্সপোজার ঘাটতিপূরণ +১"</string>
<string name="exposure_compensation_desc_p2" msgid="4555277824096107142">"এক্সপোজার ঘাটতিপূরণ: +২"</string>
<string name="button_change_announcement" msgid="3759686152778772111">"এখন বোতাম হল %s"</string>
- <string name="setting_location" msgid="4459859689227893838">"অবস্থান"</string>
+ <string name="setting_location" msgid="4459859689227893838">"লোকেশন"</string>
<string name="setting_back_camera_photo" msgid="256738900473265017">"ডিভাইসের পিছনের ক্যামেরার ফটো"</string>
<string name="setting_back_camera_video" msgid="5220819479408164689">"ডিভাইসের পিছনের ক্যামেরার ভিডিও"</string>
<string name="setting_front_camera_photo" msgid="4131886734622868637">"সামনের ক্যামেরার ফটো"</string>
@@ -360,7 +360,7 @@
<string name="setting_default_camera" msgid="6954076799301004779">"ডিফল্ট ক্যামেরা"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"সহায়তা এবং প্রতিক্রিয়া"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ প্রক্রিয়াকরণ করা হচ্ছে…"</string>
- <string name="open_source_licenses" msgid="2169711954264883060">"মুক্ত উৎস লাইসেন্স"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"ওপেন সোর্স লাইসেন্স"</string>
<string name="pref_category_general" msgid="6737748849700581019">"সাধারণ সেটিংস"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"রেজোলিউশন এবং গুণমান"</string>
<string name="pref_category_about" msgid="1966255405679342337">"সম্পর্কে"</string>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
new file mode 100644
index 0000000..20fdf24
--- /dev/null
+++ b/res/values-bs/strings.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1175086483881127797">"Kamera"</string>
+ <string name="video_camera_label" msgid="1723708322021743770">"Videokamera"</string>
+ <string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
+ <string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
+ <string name="set_image" msgid="3969690281401045698">"Postaviti sliku kao"</string>
+ <string name="delete" msgid="2714492172818940424">"Izbrisati"</string>
+ <string name="share" msgid="8581089487762243115">"Podijeliti"</string>
+ <string name="share_panorama" msgid="3558466186935359444">"Podijeliti panoramu"</string>
+ <string name="share_as_photo" msgid="4831213580709167218">"Podijeliti kao sliku"</string>
+ <string name="deleted" msgid="2036165115527228127">"Slika izbrisana"</string>
+ <string name="undo" msgid="5110048345890050107">"OPOZOVI RADNJU"</string>
+ <string name="details" msgid="4404020741542549488">"Detalji"</string>
+ <string name="close" msgid="4826166926297479820">"Zatvoriti"</string>
+ <string name="show_on_map" msgid="8542853913632649160">"Prikaži na mapi"</string>
+ <string name="rotate_left" msgid="2618440058490662604">"Rotiranje ulijevo"</string>
+ <string name="rotate_right" msgid="4896096424267838355">"Rotiranje udesno"</string>
+ <string name="edit" msgid="2776879395749004347">"Urediti sliku"</string>
+ <string name="crop_action" msgid="6933589718464132714">"Izrezati"</string>
+ <string name="trim_action" msgid="4736803320203951827">"Rezanje"</string>
+ <string name="set_as" msgid="5469055085024870081">"Postavi kao"</string>
+ <string name="video_err" msgid="1562566029875081552">"Videozapis se ne može reprod."</string>
+ <string name="title" msgid="8061744305671964703">"Ime"</string>
+ <string name="description" msgid="8193138501982849808">"Opis"</string>
+ <string name="time" msgid="5248213506417024287">"Vrijeme"</string>
+ <string name="location" msgid="564326205780827668">"Lokacija"</string>
+ <string name="path" msgid="5927003361865586353">"Sačuvano u"</string>
+ <string name="width" msgid="7045750687833828758">"Širina"</string>
+ <string name="height" msgid="5186001199353423689">"Visina"</string>
+ <string name="orientation" msgid="3883761294106680270">"Orijentacija"</string>
+ <string name="duration" msgid="5316211067383665008">"Trajanje"</string>
+ <string name="mimetype" msgid="6415940055077963944">"Vrsta MIME-a"</string>
+ <string name="file_size" msgid="6841070748357980676">"Velič. datot."</string>
+ <string name="maker" msgid="698691509121545856">"Proizvođač"</string>
+ <string name="model" msgid="8547493604023069452">"Model"</string>
+ <string name="flash" msgid="995041910749174196">"Blic"</string>
+ <string name="aperture" msgid="2453802098282814022">"Blenda"</string>
+ <string name="focal_length" msgid="8351221512187346229">"Žarišna dužina"</string>
+ <string name="white_balance" msgid="1600142743496129085">"Balans bijele boje"</string>
+ <string name="exposure_time" msgid="949787291620767754">"Vrijeme ekspo."</string>
+ <string name="iso" msgid="8578773821062054902">"ISO"</string>
+ <string name="unit_mm" msgid="5210344300697638286">"mm"</string>
+ <string name="manual" msgid="2444400953521760140">"Ručno"</string>
+ <string name="auto" msgid="2552649885114400474">"Automatski"</string>
+ <string name="flash_on" msgid="6573457197393807642">"Blic korišten"</string>
+ <string name="flash_off" msgid="7889323512830926273">"Bez blica"</string>
+ <string name="unknown" msgid="564184550182858146">"Nepoznato"</string>
+ <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"Ovaj album je pohranjen lokalno i dostupan je van mreže."</string>
+ <string name="please_wait" msgid="1416313324505140068">"Pričekajte"</string>
+ <string name="camera_error_title" msgid="6200558085072670067">"Greška na kameri"</string>
+ <string name="error_cannot_connect_camera" msgid="2713059773224193128">"Greška prilikom povezivanja s kamerom."</string>
+ <string name="error_camera_disabled" msgid="5582398275657419692">"Kamera je onemogućena zbog sigurnosnih pravila."</string>
+ <string name="error_media_storage_failure" msgid="7711687330673245629">"Vaša slika ili videozapis nije mogao biti sačuvan."</string>
+ <string name="error_permissions" msgid="3454167403425651254">"Aplikaciji nisu data ključna odobrenja potrebna za pokretanje aplikacije. Provjerite svoje postavke za odobrenja."</string>
+ <string name="reason_storage_failure" msgid="6818898304774654969">"Problem sa pohranom slike."</string>
+ <string name="wait" msgid="765601745709933047">"Pričekajte…"</string>
+ <string name="no_storage" product="default" msgid="5922012950780548098">"Prije nego počnete koristiti kameru, umetnite SD karticu."</string>
+ <string name="preparing_sd" product="default" msgid="7435693655017362767">"Pripremanje SD kartice…"</string>
+ <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Problem prilikom pristupanja SD kartici."</string>
+ <string name="time_lapse_title" msgid="3267978566401228497">"Snimanje protoka vremena"</string>
+ <string name="feedback_description_camera_access" msgid="419090951070170132">"Aplikacija se nije uspjela povezati s kamerom"</string>
+ <string name="feedback_description_save_photo" msgid="8658767358989083228">"Slika ili videozapis nije sačuvan na uređaj."</string>
+ <string name="capturing" msgid="5255164204641920893">"Snimanje"</string>
+ <string name="pref_camera_id_title" msgid="4680648115225411185">"Odaberite kameru"</string>
+ <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Zadnja kamera"</string>
+ <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Prednja kamera"</string>
+ <string name="pref_camera_save_location_title" msgid="2344235620113384017">"Sačuvaj lokaciju"</string>
+ <string name="pref_camera_location_label" msgid="8695441802378057719">"LOKACIJA"</string>
+ <string name="pref_camera_timer_title" msgid="4728838281741571323">"Tajmer"</string>
+ <!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
+ <skip />
+ <string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Pištanje tokom odbroj."</string>
+ <string name="setting_off" msgid="6782191065550276632">"Isključeno"</string>
+ <string name="setting_on" msgid="9086728135773197891">"Uključeno"</string>
+ <string name="pref_video_quality_title" msgid="5887153490982738588">"Kvalitet videozapisa"</string>
+ <string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Protok vremena"</string>
+ <string name="pref_camera_settings_category" msgid="4274141528139077830">"Postavke kamere"</string>
+ <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Postavke za videokameru"</string>
+ <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Veličina slike"</string>
+ <string name="pref_camera_picturesize_entry_large" msgid="9014447075089601575">"Velika"</string>
+ <string name="pref_camera_picturesize_entry_medium" msgid="7708839551627003154">"Srednja veličina"</string>
+ <string name="pref_camera_picturesize_entry_small" msgid="2991239656622539068">"Mala"</string>
+ <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Način rada fokusa"</string>
+ <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Automatski"</string>
+ <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Beskonačno"</string>
+ <string name="pref_camera_focusmode_entry_macro" msgid="7632276686726851426">"Makro"</string>
+ <string name="pref_camera_focusmode_label_auto" msgid="4884418453600317694">"AUTOMATSKI"</string>
+ <string name="pref_camera_focusmode_label_infinity" msgid="1673352016120343314">"BESKONAČNO"</string>
+ <string name="pref_camera_focusmode_label_macro" msgid="5065639298027996399">"MAKRO"</string>
+ <string name="pref_camera_flashmode_title" msgid="8363803841022314574">"Način rada blica"</string>
+ <string name="pref_camera_flashmode_label" msgid="5852483713534762800">"NAČIN RADA BLICA"</string>
+ <string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"Automatski"</string>
+ <string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"Uključen"</string>
+ <string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"Isključen"</string>
+ <string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"AUTOMATSKI BLIC"</string>
+ <string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"BLIC UKLJUČEN"</string>
+ <string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"BLIC ISKLJUČEN"</string>
+ <string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"Balans bijele boje"</string>
+ <string name="pref_camera_whitebalance_label" msgid="7370366644738746700">"BALANS BIJELE BOJE"</string>
+ <string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"Automatski"</string>
+ <string name="pref_camera_whitebalance_entry_incandescent" msgid="1140391575294372706">"Izvor svjetlosti sa žarnom niti"</string>
+ <string name="pref_camera_whitebalance_entry_daylight" msgid="757833578153467254">"Dan"</string>
+ <string name="pref_camera_whitebalance_entry_fluorescent" msgid="5157027611220790970">"Fluorescentno"</string>
+ <string name="pref_camera_whitebalance_entry_cloudy" msgid="3569589102226796875">"Oblačno"</string>
+ <string name="pref_camera_whitebalance_label_auto" msgid="4305837287360485369">"AUTOMATSKI"</string>
+ <string name="pref_camera_whitebalance_label_incandescent" msgid="2860805668879945185">"IZVOR SVJETLOSTI SA ŽARNOM NITI"</string>
+ <string name="pref_camera_whitebalance_label_daylight" msgid="4562002095198912409">"DNEVNA SVJETLOST"</string>
+ <string name="pref_camera_whitebalance_label_fluorescent" msgid="10552295745391742">"FLUORESCENTNO"</string>
+ <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"OBLAČNO"</string>
+ <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scenski način rada"</string>
+ <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Automatski"</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+ UKLJUČEN"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ ISKLJUČEN"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR UKLJUČEN"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR ISKLJUČEN"</string>
+ <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Radnja"</string>
+ <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Noć"</string>
+ <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Zalazak sunca"</string>
+ <string name="pref_camera_scenemode_entry_party" msgid="401232668169066415">"Zabava"</string>
+ <string name="pref_camera_scenemode_label_auto" msgid="2874586883608401615">"NIŠTA"</string>
+ <string name="pref_camera_scenemode_label_action" msgid="1822814017595414923">"RADNJA"</string>
+ <string name="pref_camera_scenemode_label_night" msgid="7764371228088101131">"NOĆ"</string>
+ <string name="pref_camera_scenemode_label_sunset" msgid="3443610538453611123">"ZALAZAK SUNCA"</string>
+ <string name="pref_camera_scenemode_label_party" msgid="917499272505930322">"ZABAVA"</string>
+ <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"TAJMER ISKLJUČEN"</string>
+ <string name="pref_camera_countdown_label_one" msgid="7647972711796868848">"1 SEKUNDA"</string>
+ <string name="pref_camera_countdown_label_three" msgid="3154170918067103541">"3 SEKUNDE"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"10 SEKUNDI"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="8469955900530268867">"15 SEKUNDI"</string>
+ <string name="not_selectable_in_scene_mode" msgid="3260801086980522611">"Ne može se odabrati u scenskom načinu rada."</string>
+ <string name="pref_exposure_title" msgid="7525751789152582800">"Ekspozicija"</string>
+ <string name="pref_exposure_label" msgid="2604738602400261218">"EKSPOZICIJA"</string>
+ <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
+ <skip />
+ <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+ <skip />
+ <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
+ <string name="pref_camera_id_label_back" msgid="1645608049757733858">"PREDNJA KAMERA"</string>
+ <string name="pref_camera_id_label_front" msgid="349308803062874842">"ZADNJA KAMERA"</string>
+ <string name="dialog_ok" msgid="774141340500181131">"UREDU"</string>
+ <string name="dialog_cancel" msgid="692365061128351656">"Otkaži"</string>
+ <string name="dialog_report" msgid="7616428760369876209">"Prijavi"</string>
+ <string name="dialog_dismiss" msgid="1382550604990470119">"Odbaci"</string>
+ <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Vaša SD kartica je skoro puna. Promijenite postavku kvaliteta ili izbrišite nekoliko slika ili drugih fajlova."</string>
+ <string name="video_reach_size_limit" msgid="9196836111505731836">"Dostignut limit za veličinu videozapisa."</string>
+ <string name="pano_too_fast_prompt" msgid="2503148095578052177">"Prebrzo kretanje"</string>
+ <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"Pripremanje panorame"</string>
+ <string name="pano_dialog_panorama_failed" msgid="6772546547048693619">"Panorama nije mogla biti sačuvana."</string>
+ <string name="pano_dialog_title" msgid="6662642763395425145">"Panorama"</string>
+ <string name="pano_capture_indication" msgid="4002128831255023954">"Snimanje panorame"</string>
+ <string name="pano_dialog_waiting_previous" msgid="2646847402743245320">"Čeka se na prethodnu panoramu"</string>
+ <string name="pano_review_saving_indication_str" msgid="4691771283450663293">"Spremanje..."</string>
+ <string name="pano_review_rendering" msgid="2743087719999377155">"Izrada panorame"</string>
+ <string name="tap_to_focus" msgid="3519718196270593468">"Dodirnite za fokusiranje."</string>
+ <string name="pref_video_effect_title" msgid="594570613431209010">"Efekti"</string>
+ <string name="effect_none" msgid="3102797925086872636">"Bez efekata"</string>
+ <string name="effect_goofy_face_squeeze" msgid="1362021544829311452">"Stisnuto lice"</string>
+ <string name="effect_goofy_face_big_eyes" msgid="9220121522816762649">"Velike oči"</string>
+ <string name="effect_goofy_face_big_mouth" msgid="2064008284599552683">"Velika usta"</string>
+ <string name="effect_goofy_face_small_mouth" msgid="3105849596912069261">"Mala usta"</string>
+ <string name="effect_goofy_face_big_nose" msgid="6936976307035428164">"Veliki nos"</string>
+ <string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"Male oči"</string>
+ <string name="effect_backdropper_space" msgid="9133825395915767627">"U svemiru"</string>
+ <string name="effect_backdropper_sunset" msgid="7354053769863638757">"Zalazak sunca"</string>
+ <string name="effect_backdropper_gallery" msgid="2333888391153564920">"Vaš videozapis"</string>
+ <string name="video_snapshot_hint" msgid="2707403607250082339">"Dodirnite za slikanje tokom snimanja."</string>
+ <string name="video_recording_started" msgid="3374878415050991030">"Snimanje videozapisa započeto."</string>
+ <string name="video_recording_stopped" msgid="4658626532857624974">"Snimanje videozapisa zaustavljeno."</string>
+ <string name="clear_effects" msgid="6192797848995967992">"Poništi efekte"</string>
+ <string name="effect_silly_faces" msgid="7952713419757286453">"BLESAVA LICA"</string>
+ <string name="effect_background" msgid="1358432220077975015">"POZADINSKA SLIKA"</string>
+ <string name="accessibility_shutter_button" msgid="6040483605347230438">"Zatvarač"</string>
+ <string name="accessibility_cancel_button" msgid="5679989494636116448">"Otkaži"</string>
+ <string name="accessibility_menu_button" msgid="7692103503958544723">"Dugme Meni"</string>
+ <string name="accessibility_check_box" msgid="1084094675439953723">"Polje za potvrdu %1$s"</string>
+ <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"Prebaci na sliku"</string>
+ <string name="accessibility_switch_to_video" msgid="8174781871592793967">"Prebaci na snimanje videozapisa"</string>
+ <string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"Prebaci na panoramski način rada"</string>
+ <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"Prebaci na način rada za photo sphere fotografije"</string>
+ <string name="accessibility_switch_to_gcam" msgid="7562625440767034695">"Prebaci na visoki kvalitet"</string>
+ <string name="accessibility_switch_to_refocus" msgid="6796169367953860106">"Prebaci na način rada Promjena fokusa"</string>
+ <string name="accessibility_review_cancel" msgid="5462850829869569629">"Prekini pregled"</string>
+ <string name="accessibility_review_ok" msgid="3486465319880320270">"Završi pregled"</string>
+ <string name="accessibility_review_retake" msgid="2547112860787022130">"Ponovi snimanje u pregledu"</string>
+ <string name="accessibility_mode_options" msgid="6376831760155403217">"Opcije"</string>
+ <string name="accessibility_mode_list_hidden" msgid="3743267380450401866">"Spisak načina rada zatvoren"</string>
+ <string name="accessibility_mode_list_shown" msgid="5284322142734069179">"Spisak načina rada otvoren"</string>
+ <string name="media_accessibility_peek" msgid="234540330161031946">"Snimak napravljen"</string>
+ <string name="photo_accessibility_peek" msgid="5934133371001677250">"Slika snimljena"</string>
+ <string name="video_accessibility_peek" msgid="7845916149291383132">"Snimanje videozapisa"</string>
+ <string name="accessibility_unlock_to_camera" msgid="1251880974313179442">"Otključati za otvaranje kamere"</string>
+ <string name="media_date_content_description" msgid="2155634843596817141">"Datum i vrijeme kada je medijski fajl snimljen: %s"</string>
+ <string name="photo_date_content_description" msgid="5705865897898465619">"Datum i vrijeme kada je slika snimljena: %s"</string>
+ <string name="video_date_content_description" msgid="2151884014634284456">"Datum i vrijeme kada je videozapis snimljen: %s"</string>
+ <string name="panorama_date_content_description" msgid="990703578639006144">"Datum i vrijeme kada je panorama snimljena: %s"</string>
+ <string name="photosphere_date_content_description" msgid="4183741743409007876">"Datum i vrijeme kada je foto-sfera snimljena: %s"</string>
+ <string name="refocus_date_content_description" msgid="5630960320424345547">"Datum i vrijeme kada je snimljena slika sa efektom s izoštrenim objektom: %s"</string>
+ <string name="media_processing_content_description" msgid="8138587719107183754">"Medijski fajlovi se obrađuju"</string>
+ <string name="accessibility_mode_list_toggle" msgid="4784230103566918645">"Prebaci na spisak načina rada"</string>
+ <string name="btn_mode_list_toggle" msgid="3986242443098400164">"Spisak načina rada"</string>
+ <string name="accessibility_filmstrip_toggle" msgid="6966978483643396442">"Prebaci na prikaz u vidu filmske trake"</string>
+ <string name="btn_filmstrip_toggle" msgid="3666693972882351490">"Filmska traka"</string>
+ <string name="accessibility_mode_zoom_plus" msgid="4967389173992713073">"Uvećaj"</string>
+ <string name="btn_zoom_plus" msgid="4645138949375961656">"Uvećati+"</string>
+ <string name="accessibility_mode_zoom_minus" msgid="8850636036927992409">"Umanji"</string>
+ <string name="btn_zoom_minus" msgid="5436240345362098272">"Uvećati-"</string>
+ <string name="accessibility_zoom_announcement" msgid="6976673411698319811">"Uvećanje iznosi %.1f"</string>
+ <string name="capital_on" msgid="1118214824959797269">"UKLJUČI"</string>
+ <string name="capital_off" msgid="3020696135020167263">"ISKLJUČI"</string>
+ <string name="video_control_play" msgid="6895236811408921715">"Reproduciraj videozapis"</string>
+ <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Isključeno"</string>
+ <string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0,5 sekunde"</string>
+ <string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 sekunda"</string>
+ <string name="pref_video_time_lapse_frame_interval_1500" msgid="5793250074165436905">"1,5 sekunda"</string>
+ <string name="pref_video_time_lapse_frame_interval_2000" msgid="1821755013078449188">"2 sekunde"</string>
+ <string name="pref_video_time_lapse_frame_interval_2500" msgid="8027471301321122045">"2,5 sekunde"</string>
+ <string name="pref_video_time_lapse_frame_interval_3000" msgid="1411114492405867872">"3 sekunde"</string>
+ <string name="pref_video_time_lapse_frame_interval_4000" msgid="1197483421014140132">"4 sekunde"</string>
+ <string name="pref_video_time_lapse_frame_interval_5000" msgid="7211885329755347592">"5 sekundi"</string>
+ <string name="pref_video_time_lapse_frame_interval_6000" msgid="6665825017557898190">"6 sekundi"</string>
+ <string name="pref_video_time_lapse_frame_interval_10000" msgid="1126841483618922521">"10 sekundi"</string>
+ <string name="pref_video_time_lapse_frame_interval_12000" msgid="8769265988037327085">"12 sekundi"</string>
+ <string name="pref_video_time_lapse_frame_interval_15000" msgid="1452711342185926617">"15 sekundi"</string>
+ <string name="pref_video_time_lapse_frame_interval_24000" msgid="2505505645705111419">"24 sekunde"</string>
+ <string name="pref_video_time_lapse_frame_interval_30000" msgid="3965378176246680626">"0,5 minute"</string>
+ <string name="pref_video_time_lapse_frame_interval_60000" msgid="1878467100201983878">"1 minuta"</string>
+ <string name="pref_video_time_lapse_frame_interval_90000" msgid="496651530019049822">"1,5 minuta"</string>
+ <string name="pref_video_time_lapse_frame_interval_120000" msgid="126293364329503816">"2 minute"</string>
+ <string name="pref_video_time_lapse_frame_interval_150000" msgid="3469164780802564276">"2,5 minute"</string>
+ <string name="pref_video_time_lapse_frame_interval_180000" msgid="6840421790710639463">"3 minute"</string>
+ <string name="pref_video_time_lapse_frame_interval_240000" msgid="1682865866425206481">"4 minute"</string>
+ <string name="pref_video_time_lapse_frame_interval_300000" msgid="6068734332915957652">"5 minuta"</string>
+ <string name="pref_video_time_lapse_frame_interval_360000" msgid="4692565393277579688">"6 minuta"</string>
+ <string name="pref_video_time_lapse_frame_interval_600000" msgid="7109530398883649472">"10 minuta"</string>
+ <string name="pref_video_time_lapse_frame_interval_720000" msgid="259321148909130247">"12 minuta"</string>
+ <string name="pref_video_time_lapse_frame_interval_900000" msgid="6814816608134052996">"15 minuta"</string>
+ <string name="pref_video_time_lapse_frame_interval_1440000" msgid="5691479246748705053">"24 minute"</string>
+ <string name="pref_video_time_lapse_frame_interval_1800000" msgid="8331728629455012478">"0,5 sata"</string>
+ <string name="pref_video_time_lapse_frame_interval_3600000" msgid="4829442147263610121">"1 sat"</string>
+ <string name="pref_video_time_lapse_frame_interval_5400000" msgid="7011488725038113884">"1,5 sat"</string>
+ <string name="pref_video_time_lapse_frame_interval_7200000" msgid="7399563587870916008">"2 sata"</string>
+ <string name="pref_video_time_lapse_frame_interval_9000000" msgid="1545856778907835970">"2,5 sata"</string>
+ <string name="pref_video_time_lapse_frame_interval_10800000" msgid="4064231412857457518">"3 sata"</string>
+ <string name="pref_video_time_lapse_frame_interval_14400000" msgid="5174457951350690217">"4 sata"</string>
+ <string name="pref_video_time_lapse_frame_interval_18000000" msgid="5091441456160949740">"5 sati"</string>
+ <string name="pref_video_time_lapse_frame_interval_21600000" msgid="6924571987775154098">"6 sati"</string>
+ <string name="pref_video_time_lapse_frame_interval_36000000" msgid="6959912631566981301">"10 sati"</string>
+ <string name="pref_video_time_lapse_frame_interval_43200000" msgid="6426833030111269499">"12 sati"</string>
+ <string name="pref_video_time_lapse_frame_interval_54000000" msgid="6688725497680331090">"15 sati"</string>
+ <string name="pref_video_time_lapse_frame_interval_86400000" msgid="5510320806095156153">"24 sata"</string>
+ <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="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>
+ <string name="count_down_title_text" msgid="7586031110595513050">"Odbrojavanje do snimanja slike"</string>
+ <string name="remember_location_title" msgid="3045040613094030429">"Zapamtiti lokacije na kojima su slike snimljene?"</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"Označite svoje slike i videozapise sa lokacijama na kojima su snimljeni."</string>
+ <string name="remember_location_no" msgid="4412802756840226925">"Ne, hvala"</string>
+ <string name="remember_location_yes" msgid="4339424460683531388">"Da"</string>
+ <string name="camera_menu_more_label" msgid="7951917844735828365">"VIŠE OPCIJA"</string>
+ <string name="camera_menu_settings_label" msgid="3862756725328016822">"POSTAVKE"</string>
+ <string name="create_tiny_planet" msgid="5186918191372107343">"Snimi Malu planetu"</string>
+ <string name="saving_tiny_planet" msgid="8828265180177375494">"Spremanje Male planete…"</string>
+ <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zumiranje"</string>
+ <string name="tiny_planet_rotate" msgid="5445336705705350004">"Rotiranje"</string>
+ <string name="photo_editor" msgid="1521994560971367225">"Uređivač slika"</string>
+ <string name="crop_save" msgid="2841974981340098579">"Sačuvaj"</string>
+ <string name="cannot_load_image" msgid="4100136187076585580">"Greška prilikom učitavanja slike!"</string>
+ <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Prikaz u vidu filmske trake"</string>
+ <string name="setting_wallpaper" msgid="2397759659347872725">"Postavljanje pozadinske slike"</string>
+ <string name="mode_settings" msgid="2021937261522670921">"Postavke"</string>
+ <string name="mode_camera" msgid="279763925715250603">"Kamera"</string>
+ <string name="mode_video" msgid="8633929034048169139">"Videozapis"</string>
+ <string name="mode_photosphere" msgid="5082338476237291833">"Photo sphere fotografija"</string>
+ <string name="mode_timelapse" msgid="1517168724627815453">"Protok vremena"</string>
+ <string name="mode_wideangle" msgid="1099640345041696830">"Široki ugao"</string>
+ <string name="mode_panorama" msgid="6882648621305828861">"Panoramski način rada"</string>
+ <string name="mode_refocus" msgid="172192967119469061">"Efekt s izoštr. objektom"</string>
+ <string name="mode_camera_desc" msgid="3670807361165657278">"Prebaci na način rada za kameru"</string>
+ <string name="mode_video_desc" msgid="4058407412929464689">"Prebaciti na videokameru"</string>
+ <string name="mode_photosphere_desc" msgid="2403816283825579161">"Prebaci na način rada za photo sphere fotografije"</string>
+ <string name="mode_panorama_desc" msgid="6023020404237519590">"Prebaci na panoramski način rada"</string>
+ <string name="mode_refocus_desc" msgid="6171183297515508465">"Prebaci na način rada Efekt s izoštrenim objektom"</string>
+ <string name="settings_open_desc" msgid="6914471293841793766">"Otvori postavke"</string>
+ <string name="settings_close_desc" msgid="3095831199632813127">"Zatvori postavke"</string>
+ <string name="hdr_plus_off_desc" msgid="5301287296717144319">"HDR Plus isključen"</string>
+ <string name="hdr_plus_on_desc" msgid="8204780034508139909">"HDR Plus uključen"</string>
+ <string name="hdr_off_desc" msgid="7921924739852874675">"HDR isključen"</string>
+ <string name="hdr_on_desc" msgid="4591284110249047558">"HDR uključen"</string>
+ <string name="flash_off_desc" msgid="7151559466286106797">"Blic isključen"</string>
+ <string name="flash_auto_desc" msgid="3009043125539675717">"Automatski blic"</string>
+ <string name="flash_on_desc" msgid="930372145324854699">"Blic uključen"</string>
+ <string name="hdr_plus_flash_off_desc" msgid="5335888906983788789">"HDR+ blic isključen"</string>
+ <string name="hdr_plus_flash_auto_desc" msgid="4812200236263011537">"HDR+ automatski blic"</string>
+ <string name="hdr_plus_flash_on_desc" msgid="8323389161987561284">"HDR+ blic uključen"</string>
+ <string name="torch_on_desc" msgid="3069836196559213365">"Svjetiljka uključena"</string>
+ <string name="torch_off_desc" msgid="8304675202998742618">"Svjetiljka isključena"</string>
+ <string name="camera_id_back_desc" msgid="3566327490758890635">"Zadnja kamera"</string>
+ <string name="camera_id_front_desc" msgid="7497517948130254220">"Prednja kamera"</string>
+ <string name="grid_lines_off_desc" msgid="2022385817190451353">"Rešetka isključena"</string>
+ <string name="grid_lines_on_desc" msgid="4601540461914364817">"Rešetka uključena"</string>
+ <string name="countdown_timer_off" msgid="1663008439564495948">"Tajmer je isključen"</string>
+ <string name="countdown_timer_duration_3s" msgid="7435393834886072664">"Tajmer je postavljen na 3 sekunde"</string>
+ <string name="countdown_timer_duration_10s" msgid="9085308782250002795">"Tajmer je postavljen na 10 sekundi"</string>
+ <string name="more_options_desc" msgid="4628738800610478353">"Više opcija"</string>
+ <string name="cancel_button_description" msgid="3801167024006905033">"Otkaži"</string>
+ <string name="done_button_description" msgid="1334963435441544592">"Završi"</string>
+ <string name="retake_button_description" msgid="4234613030674787714">"Ponovo snimi"</string>
+ <string name="review_button_description" msgid="7932122063748430080">"Pregled"</string>
+ <string name="share_button_description" msgid="5108508790540832053">"Dijeli"</string>
+ <string name="view_button_description" msgid="4985768837891362075">"Pregled"</string>
+ <string name="edit_button_description" msgid="98550816724901925">"Uredi"</string>
+ <string name="delete_button_description" msgid="2251065309677200911">"Izbriši"</string>
+ <string name="manual_exposure_compensation_desc" msgid="5595219532556566042">"Ručna kompenzacija ekspozicije"</string>
+ <string name="exposure_compensation_desc_n2" msgid="8957966533506294324">"Kompenzacija ekspozicije -2"</string>
+ <string name="exposure_compensation_desc_n1" msgid="3035027224866688267">"Kompenzacija ekspozicije -1"</string>
+ <string name="exposure_compensation_desc_0" msgid="2820273752287040523">"Kompenzacija ekspozicije 0"</string>
+ <string name="exposure_compensation_desc_p1" msgid="2328275401634452554">"Kompenzacija ekspozicije +1"</string>
+ <string name="exposure_compensation_desc_p2" msgid="4555277824096107142">"Kompenzacija ekspozicije +2"</string>
+ <string name="button_change_announcement" msgid="3759686152778772111">"Funkciju koju dugme sada obavlja je %s"</string>
+ <string name="setting_location" msgid="4459859689227893838">"Lokacija"</string>
+ <string name="setting_back_camera_photo" msgid="256738900473265017">"Slika zadnje kamere"</string>
+ <string name="setting_back_camera_video" msgid="5220819479408164689">"Video zadnje kamere"</string>
+ <string name="setting_front_camera_photo" msgid="4131886734622868637">"Slika prednje kamere"</string>
+ <string name="setting_front_camera_video" msgid="2178799452805359752">"Video prednje kamere"</string>
+ <string name="setting_default_camera" msgid="6954076799301004779">"Zadana kamera"</string>
+ <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Pomoć i povr. inform."</string>
+ <string name="processing_hdr_plus" msgid="9160093263037540304">"Obrada HDR+ slike…"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"Open source licence"</string>
+ <string name="pref_category_general" msgid="6737748849700581019">"Opće postavke"</string>
+ <string name="pref_category_resolution_quality" msgid="6641462402321962896">"Rezolucija i kvalitet"</string>
+ <string name="pref_category_about" msgid="1966255405679342337">"O aplikaciji"</string>
+ <string name="pref_title_build_version" msgid="481489988124832651">"Međuverzija aplikacije"</string>
+ <string name="pref_video_quality_entry_low" msgid="737962621299050603">"Niski kvalitet"</string>
+ <string name="pref_video_quality_entry_high" msgid="1613578418842803393">"Visoki kvalitet"</string>
+ <string name="pref_video_quality_entry_qcif" msgid="1717816794399266216">"QCIF"</string>
+ <string name="pref_video_quality_entry_cif" msgid="645414019445016434">"CIF"</string>
+ <string name="pref_video_quality_entry_480p" msgid="5880250731066854583">"SD 480p"</string>
+ <string name="pref_video_quality_entry_720p" msgid="4076146428148167262">"HD 720p"</string>
+ <string name="pref_video_quality_entry_1080p" msgid="4539958891524211120">"HD 1080p"</string>
+ <string name="pref_video_quality_entry_qvga" msgid="342600517453781430">"QVGA"</string>
+ <string name="pref_video_quality_entry_2160p" msgid="4522927631413184505">"UHD 4K"</string>
+ <string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s megapiksela"</string>
+ <string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s megapiksela"</string>
+ <string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"Za promjenu fokusa, dodirnite ovdje"</string>
+ <string name="pref_category_advanced" msgid="5921085080077574872">"Napredne opcije"</string>
+ <string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"Ručna ekspozicija"</string>
+ <string name="settings_cling_text" msgid="5368054627268181292">"U meniju Postavke promijenite rezoluciju i kvalitet ili pokušajte koristiti napredne funkcije."</string>
+ <string name="photo_size_selection_title" msgid="2789753590719172645">"Odaberite veličinu slike"</string>
+ <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"Ovo možete kasnije promijeniti u meniju Postavke."</string>
+ <string name="share_to" msgid="5144911209144798122">"Podijeliti koristeći"</string>
+ <string name="edit_with" msgid="615569327230783971">"Urediti koristeći"</string>
+ <string name="startup_dialog_button_next" msgid="1011831256978228993">"DALJE"</string>
+ <string name="confirm_button_text" msgid="7389949384482206814">"UREDU, RAZUMIJEM"</string>
+ <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"Podudaranje sa senzorom \n(4:3)"</string>
+ <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"Senzor će izrezati sliku\n(16:9)"</string>
+ <string name="pref_boolean_false" msgid="461317129020087333">"0"</string>
+ <string name="pref_boolean_true" msgid="4131945223998878009">"1"</string>
+ <string name="session_saving_image" msgid="8932315404486416826">"Spremanje..."</string>
+</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 0e15717..82d8bee 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -53,7 +53,7 @@
<string name="flash" msgid="995041910749174196">"Flaix"</string>
<string name="aperture" msgid="2453802098282814022">"Obertura"</string>
<string name="focal_length" msgid="8351221512187346229">"Distància focal"</string>
- <string name="white_balance" msgid="1600142743496129085">"Equilibri de blancs"</string>
+ <string name="white_balance" msgid="1600142743496129085">"Balanç de blancs"</string>
<string name="exposure_time" msgid="949787291620767754">"Temps exposició"</string>
<string name="iso" msgid="8578773821062054902">"ISO"</string>
<string name="unit_mm" msgid="5210344300697638286">"mm"</string>
@@ -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">"Enregistrament 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>
@@ -112,7 +112,7 @@
<string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"FLAIX AUTOMÀTIC"</string>
<string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"FLAIX ACTIVAT"</string>
<string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"FLAIX DESACTIVAT"</string>
- <string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"Equilibri de blancs"</string>
+ <string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"Balanç de blancs"</string>
<string name="pref_camera_whitebalance_label" msgid="7370366644738746700">"EQUILIBRI DE BLANCS"</string>
<string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"Auto"</string>
<string name="pref_camera_whitebalance_entry_incandescent" msgid="1140391575294372706">"Incandescent"</string>
@@ -183,8 +183,8 @@
<string name="effect_backdropper_sunset" msgid="7354053769863638757">"Posta de sol"</string>
<string name="effect_backdropper_gallery" msgid="2333888391153564920">"El teu vídeo"</string>
<string name="video_snapshot_hint" msgid="2707403607250082339">"Toca per fer una foto mentre enregistres un vídeo."</string>
- <string name="video_recording_started" msgid="3374878415050991030">"L\'enregistrament de vídeo ha començat."</string>
- <string name="video_recording_stopped" msgid="4658626532857624974">"L\'enregistrament de vídeo s\'ha aturat."</string>
+ <string name="video_recording_started" msgid="3374878415050991030">"La gravació de vídeo ha començat."</string>
+ <string name="video_recording_stopped" msgid="4658626532857624974">"La gravació de vídeo s\'ha aturat."</string>
<string name="clear_effects" msgid="6192797848995967992">"Esborra els efectes"</string>
<string name="effect_silly_faces" msgid="7952713419757286453">"GANYOTES"</string>
<string name="effect_background" msgid="1358432220077975015">"FONS"</string>
@@ -207,7 +207,7 @@
<string name="media_accessibility_peek" msgid="234540330161031946">"S\'ha fet una captura."</string>
<string name="photo_accessibility_peek" msgid="5934133371001677250">"S\'ha fet una foto."</string>
<string name="video_accessibility_peek" msgid="7845916149291383132">"S\'ha enregistrat un vídeo."</string>
- <string name="accessibility_unlock_to_camera" msgid="1251880974313179442">"Desbloqueja i vés a la Càmera"</string>
+ <string name="accessibility_unlock_to_camera" msgid="1251880974313179442">"Desbloqueja i ves a la Càmera"</string>
<string name="media_date_content_description" msgid="2155634843596817141">"Data i hora de creació del fitxer multimèdia: %s"</string>
<string name="photo_date_content_description" msgid="5705865897898465619">"Data i hora de creació de la fotografia: %s"</string>
<string name="video_date_content_description" msgid="2151884014634284456">"Data i hora de creació del vídeo: %s"</string>
@@ -348,7 +348,7 @@
<string name="setting_default_camera" msgid="6954076799301004779">"Càmera predeterminada"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Ajuda i suggeriments"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"Processant HDR+..."</string>
- <string name="open_source_licenses" msgid="2169711954264883060">"Llicències de codi obert"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"Llicències de programari lliure"</string>
<string name="pref_category_general" msgid="6737748849700581019">"Configuració general"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"Resolució i qualitat"</string>
<string name="pref_category_about" msgid="1966255405679342337">"Quant a"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index cf21f05..23d34c2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -339,7 +339,7 @@
<string name="exposure_compensation_desc_0" msgid="2820273752287040523">"Kompenzace expozice 0"</string>
<string name="exposure_compensation_desc_p1" msgid="2328275401634452554">"Kompenzace expozice +1"</string>
<string name="exposure_compensation_desc_p2" msgid="4555277824096107142">"Kompenzace expozice +2"</string>
- <string name="button_change_announcement" msgid="3759686152778772111">"Tlačítko je nyní ve stavu %s"</string>
+ <string name="button_change_announcement" msgid="3759686152778772111">"Tlačítko je teď ve stavu %s"</string>
<string name="setting_location" msgid="4459859689227893838">"Poloha"</string>
<string name="setting_back_camera_photo" msgid="256738900473265017">"Zadní fotoaparát – fotky"</string>
<string name="setting_back_camera_video" msgid="5220819479408164689">"Zadní fotoaparát – video"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index b913402..9466e77 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -59,7 +59,7 @@
<string name="unit_mm" msgid="5210344300697638286">"mm"</string>
<string name="manual" msgid="2444400953521760140">"Manuel"</string>
<string name="auto" msgid="2552649885114400474">"Automatisk"</string>
- <string name="flash_on" msgid="6573457197393807642">"Blitz udløst"</string>
+ <string name="flash_on" msgid="6573457197393807642">"Blitz aktiveret"</string>
<string name="flash_off" msgid="7889323512830926273">"Ingen blitz"</string>
<string name="unknown" msgid="564184550182858146">"Ukendt"</string>
<string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"Dette element er gemt lokalt og er tilgængeligt offline."</string>
@@ -68,7 +68,7 @@
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"Der kan ikke oprettes forbindelse til kameraet."</string>
<string name="error_camera_disabled" msgid="5582398275657419692">"Kameraet er deaktiveret på grund af sikkerhedspolitikker."</string>
<string name="error_media_storage_failure" msgid="7711687330673245629">"Dit billede eller din video kunne ikke gemmes."</string>
- <string name="error_permissions" msgid="3454167403425651254">"Appen mangler kritiske tilladelser for at kunne køre. Kontrollér dine indstillinger for tilladelser."</string>
+ <string name="error_permissions" msgid="3454167403425651254">"Appen mangler kritiske tilladelser for at kunne køre. Tjek dine indstillinger for tilladelser."</string>
<string name="reason_storage_failure" msgid="6818898304774654969">"Billedet blev ikke gemt."</string>
<string name="wait" msgid="765601745709933047">"Vent…"</string>
<string name="no_storage" product="default" msgid="5922012950780548098">"Indsæt et SD-kort, før kameraet tages i brug."</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index cee025d..f73580e 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -348,7 +348,7 @@
<string name="setting_default_camera" msgid="6954076799301004779">"Standardkamera"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Hilfe & Feedback"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ wird verarbeitet…"</string>
- <string name="open_source_licenses" msgid="2169711954264883060">"Open-Source-Lizenzen"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"Open Source-Lizenzen"</string>
<string name="pref_category_general" msgid="6737748849700581019">"Allgemeine Einstellungen"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"Auflösung & Qualität"</string>
<string name="pref_category_about" msgid="1966255405679342337">"Info"</string>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
new file mode 100644
index 0000000..5c5627a
--- /dev/null
+++ b/res/values-en-rCA/strings.xml
@@ -0,0 +1,382 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2007 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+<resources xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <string name="app_name" msgid="1175086483881127797">"Camera"</string>
+ <string name="video_camera_label" msgid="1723708322021743770">"Camcorder"</string>
+ <string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
+ <string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
+ <string name="set_image" msgid="3969690281401045698">"Set picture as"</string>
+ <string name="delete" msgid="2714492172818940424">"Delete"</string>
+ <string name="share" msgid="8581089487762243115">"Share"</string>
+ <string name="share_panorama" msgid="3558466186935359444">"Share panorama"</string>
+ <string name="share_as_photo" msgid="4831213580709167218">"Share as photo"</string>
+ <string name="deleted" msgid="2036165115527228127">"Deleted"</string>
+ <string name="undo" msgid="5110048345890050107">"UNDO"</string>
+ <string name="details" msgid="4404020741542549488">"Details"</string>
+ <string name="close" msgid="4826166926297479820">"Close"</string>
+ <string name="show_on_map" msgid="8542853913632649160">"Show on map"</string>
+ <string name="rotate_left" msgid="2618440058490662604">"Rotate left"</string>
+ <string name="rotate_right" msgid="4896096424267838355">"Rotate right"</string>
+ <string name="edit" msgid="2776879395749004347">"Edit"</string>
+ <string name="crop_action" msgid="6933589718464132714">"Crop"</string>
+ <string name="trim_action" msgid="4736803320203951827">"Trim"</string>
+ <string name="set_as" msgid="5469055085024870081">"Set as"</string>
+ <string name="video_err" msgid="1562566029875081552">"Cannot play video"</string>
+ <string name="title" msgid="8061744305671964703">"Title"</string>
+ <string name="description" msgid="8193138501982849808">"Description"</string>
+ <string name="time" msgid="5248213506417024287">"Time"</string>
+ <string name="location" msgid="564326205780827668">"Location"</string>
+ <string name="path" msgid="5927003361865586353">"Path"</string>
+ <string name="width" msgid="7045750687833828758">"Width"</string>
+ <string name="height" msgid="5186001199353423689">"Height"</string>
+ <string name="orientation" msgid="3883761294106680270">"Orientation"</string>
+ <string name="duration" msgid="5316211067383665008">"Duration"</string>
+ <string name="mimetype" msgid="6415940055077963944">"MIME type"</string>
+ <string name="file_size" msgid="6841070748357980676">"File size"</string>
+ <string name="maker" msgid="698691509121545856">"Maker"</string>
+ <string name="model" msgid="8547493604023069452">"Model"</string>
+ <string name="flash" msgid="995041910749174196">"Flash"</string>
+ <string name="aperture" msgid="2453802098282814022">"Aperture"</string>
+ <string name="focal_length" msgid="8351221512187346229">"Focal Length"</string>
+ <string name="white_balance" msgid="1600142743496129085">"White balance"</string>
+ <string name="exposure_time" msgid="949787291620767754">"Exposure time"</string>
+ <string name="iso" msgid="8578773821062054902">"ISO"</string>
+ <string name="unit_mm" msgid="5210344300697638286">"mm"</string>
+ <string name="manual" msgid="2444400953521760140">"Manual"</string>
+ <string name="auto" msgid="2552649885114400474">"Auto"</string>
+ <string name="flash_on" msgid="6573457197393807642">"Flash fired"</string>
+ <string name="flash_off" msgid="7889323512830926273">"No flash"</string>
+ <string name="unknown" msgid="564184550182858146">"Unknown"</string>
+ <string name="try_to_set_local_album_available_offline" msgid="3363125545009254117">"This item is stored locally and available offline."</string>
+ <string name="please_wait" msgid="1416313324505140068">"Please wait"</string>
+ <string name="camera_error_title" msgid="6200558085072670067">"Camera error"</string>
+ <string name="error_cannot_connect_camera" msgid="2713059773224193128">"Can\'t connect to the camera."</string>
+ <string name="error_camera_disabled" msgid="5582398275657419692">"Camera has been disabled because of security policies."</string>
+ <string name="error_media_storage_failure" msgid="7711687330673245629">"There was a problem saving your photo or video."</string>
+ <string name="error_permissions" msgid="3454167403425651254">"The app does not have critical permissions needed to run. Please check your permissions settings."</string>
+ <string name="reason_storage_failure" msgid="6818898304774654969">"Photo storage failure."</string>
+ <string name="wait" msgid="765601745709933047">"Please wait…"</string>
+ <string name="no_storage" product="default" msgid="5922012950780548098">"Insert an SD card before using the camera."</string>
+ <string name="preparing_sd" product="default" msgid="7435693655017362767">"Preparing SD card…"</string>
+ <string name="access_sd_fail" product="default" msgid="2634861611082499811">"Couldn\'t access SD card."</string>
+ <string name="time_lapse_title" msgid="3267978566401228497">"Time lapse recording"</string>
+ <string name="feedback_description_camera_access" msgid="419090951070170132">"The app couldn\'t connect to the camera"</string>
+ <string name="feedback_description_save_photo" msgid="8658767358989083228">"Photo or video did not save to the device."</string>
+ <string name="capturing" msgid="5255164204641920893">"Capturing"</string>
+ <string name="pref_camera_id_title" msgid="4680648115225411185">"Choose camera"</string>
+ <string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Back"</string>
+ <string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Front"</string>
+ <string name="pref_camera_save_location_title" msgid="2344235620113384017">"Save location"</string>
+ <string name="pref_camera_location_label" msgid="8695441802378057719">"LOCATION"</string>
+ <string name="pref_camera_timer_title" msgid="4728838281741571323">"Countdown timer"</string>
+ <!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
+ <skip />
+ <string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Beep during countdown"</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">"Video quality"</string>
+ <string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Time lapse"</string>
+ <string name="pref_camera_settings_category" msgid="4274141528139077830">"Camera settings"</string>
+ <string name="pref_camcorder_settings_category" msgid="3553148484755353397">"Camcorder settings"</string>
+ <string name="pref_camera_picturesize_title" msgid="686045304547541815">"Picture size"</string>
+ <string name="pref_camera_picturesize_entry_large" msgid="9014447075089601575">"Large"</string>
+ <string name="pref_camera_picturesize_entry_medium" msgid="7708839551627003154">"Medium"</string>
+ <string name="pref_camera_picturesize_entry_small" msgid="2991239656622539068">"Small"</string>
+ <string name="pref_camera_focusmode_title" msgid="3637702747984180030">"Focus mode"</string>
+ <string name="pref_camera_focusmode_entry_auto" msgid="8977409813328199501">"Auto"</string>
+ <string name="pref_camera_focusmode_entry_infinity" msgid="3887667853236656322">"Infinity"</string>
+ <string name="pref_camera_focusmode_entry_macro" msgid="7632276686726851426">"Macro"</string>
+ <string name="pref_camera_focusmode_label_auto" msgid="4884418453600317694">"AUTO"</string>
+ <string name="pref_camera_focusmode_label_infinity" msgid="1673352016120343314">"INFINITY"</string>
+ <string name="pref_camera_focusmode_label_macro" msgid="5065639298027996399">"MACRO"</string>
+ <string name="pref_camera_flashmode_title" msgid="8363803841022314574">"Flash mode"</string>
+ <string name="pref_camera_flashmode_label" msgid="5852483713534762800">"FLASH MODE"</string>
+ <string name="pref_camera_flashmode_entry_auto" msgid="4211992591841657014">"Auto"</string>
+ <string name="pref_camera_flashmode_entry_on" msgid="3519831202665377698">"On"</string>
+ <string name="pref_camera_flashmode_entry_off" msgid="8861322265566617357">"Off"</string>
+ <string name="pref_camera_flashmode_label_auto" msgid="2309144918900450379">"FLASH AUTO"</string>
+ <string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"FLASH ON"</string>
+ <string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"FLASH OFF"</string>
+ <string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"White balance"</string>
+ <string name="pref_camera_whitebalance_label" msgid="7370366644738746700">"WHITE BALANCE"</string>
+ <string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"Auto"</string>
+ <string name="pref_camera_whitebalance_entry_incandescent" msgid="1140391575294372706">"Incandescent"</string>
+ <string name="pref_camera_whitebalance_entry_daylight" msgid="757833578153467254">"Daylight"</string>
+ <string name="pref_camera_whitebalance_entry_fluorescent" msgid="5157027611220790970">"Fluorescent"</string>
+ <string name="pref_camera_whitebalance_entry_cloudy" msgid="3569589102226796875">"Cloudy"</string>
+ <string name="pref_camera_whitebalance_label_auto" msgid="4305837287360485369">"AUTO"</string>
+ <string name="pref_camera_whitebalance_label_incandescent" msgid="2860805668879945185">"INCANDESCENT"</string>
+ <string name="pref_camera_whitebalance_label_daylight" msgid="4562002095198912409">"DAYLIGHT"</string>
+ <string name="pref_camera_whitebalance_label_fluorescent" msgid="10552295745391742">"FLUORESCENT"</string>
+ <string name="pref_camera_whitebalance_label_cloudy" msgid="4880793739075193336">"CLOUDY"</string>
+ <string name="pref_camera_scenemode_title" msgid="5709932164781367066">"Scene mode"</string>
+ <string name="pref_camera_scenemode_entry_auto" msgid="9205644316260850379">"Auto"</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+ ON"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ OFF"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR ON"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR OFF"</string>
+ <string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Action"</string>
+ <string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Night"</string>
+ <string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Sunset"</string>
+ <string name="pref_camera_scenemode_entry_party" msgid="401232668169066415">"Party"</string>
+ <string name="pref_camera_scenemode_label_auto" msgid="2874586883608401615">"NONE"</string>
+ <string name="pref_camera_scenemode_label_action" msgid="1822814017595414923">"ACTION"</string>
+ <string name="pref_camera_scenemode_label_night" msgid="7764371228088101131">"NIGHT"</string>
+ <string name="pref_camera_scenemode_label_sunset" msgid="3443610538453611123">"SUNSET"</string>
+ <string name="pref_camera_scenemode_label_party" msgid="917499272505930322">"PARTY"</string>
+ <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"TIMER OFF"</string>
+ <string name="pref_camera_countdown_label_one" msgid="7647972711796868848">"1 SECOND"</string>
+ <string name="pref_camera_countdown_label_three" msgid="3154170918067103541">"3 SECONDS"</string>
+ <string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"10 SECONDS"</string>
+ <string name="pref_camera_countdown_label_fifteen" msgid="8469955900530268867">"15 SECONDS"</string>
+ <string name="not_selectable_in_scene_mode" msgid="3260801086980522611">"Not selectable in scene mode."</string>
+ <string name="pref_exposure_title" msgid="7525751789152582800">"Exposure"</string>
+ <string name="pref_exposure_label" msgid="2604738602400261218">"EXPOSURE"</string>
+ <!-- no translation found for pref_camera_hdr_default (5054955236904902318) -->
+ <skip />
+ <!-- no translation found for pref_camera_hdr_plus_default (4827897029274554907) -->
+ <skip />
+ <string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
+ <string name="pref_camera_id_label_back" msgid="1645608049757733858">"FRONT CAMERA"</string>
+ <string name="pref_camera_id_label_front" msgid="349308803062874842">"BACK CAMERA"</string>
+ <string name="dialog_ok" msgid="774141340500181131">"OK"</string>
+ <string name="dialog_cancel" msgid="692365061128351656">"Cancel"</string>
+ <string name="dialog_report" msgid="7616428760369876209">"Report"</string>
+ <string name="dialog_dismiss" msgid="1382550604990470119">"Dismiss"</string>
+ <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"Your SD card is running out of space. Change the quality setting or delete some images or other files."</string>
+ <string name="video_reach_size_limit" msgid="9196836111505731836">"Size limit reached."</string>
+ <string name="pano_too_fast_prompt" msgid="2503148095578052177">"Too fast"</string>
+ <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"Preparing panorama"</string>
+ <string name="pano_dialog_panorama_failed" msgid="6772546547048693619">"Couldn\'t save panorama."</string>
+ <string name="pano_dialog_title" msgid="6662642763395425145">"Panorama"</string>
+ <string name="pano_capture_indication" msgid="4002128831255023954">"Capturing panorama"</string>
+ <string name="pano_dialog_waiting_previous" msgid="2646847402743245320">"Waiting for previous panorama"</string>
+ <string name="pano_review_saving_indication_str" msgid="4691771283450663293">"Saving…"</string>
+ <string name="pano_review_rendering" msgid="2743087719999377155">"Rendering panorama"</string>
+ <string name="tap_to_focus" msgid="3519718196270593468">"Touch to focus."</string>
+ <string name="pref_video_effect_title" msgid="594570613431209010">"Effects"</string>
+ <string name="effect_none" msgid="3102797925086872636">"None"</string>
+ <string name="effect_goofy_face_squeeze" msgid="1362021544829311452">"Squeeze"</string>
+ <string name="effect_goofy_face_big_eyes" msgid="9220121522816762649">"Big eyes"</string>
+ <string name="effect_goofy_face_big_mouth" msgid="2064008284599552683">"Big mouth"</string>
+ <string name="effect_goofy_face_small_mouth" msgid="3105849596912069261">"Small mouth"</string>
+ <string name="effect_goofy_face_big_nose" msgid="6936976307035428164">"Big nose"</string>
+ <string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"Small eyes"</string>
+ <string name="effect_backdropper_space" msgid="9133825395915767627">"In space"</string>
+ <string name="effect_backdropper_sunset" msgid="7354053769863638757">"Sunset"</string>
+ <string name="effect_backdropper_gallery" msgid="2333888391153564920">"Your video"</string>
+ <string name="video_snapshot_hint" msgid="2707403607250082339">"Touch to take photo while recording."</string>
+ <string name="video_recording_started" msgid="3374878415050991030">"Video recording has started."</string>
+ <string name="video_recording_stopped" msgid="4658626532857624974">"Video recording has stopped."</string>
+ <string name="clear_effects" msgid="6192797848995967992">"Clear effects"</string>
+ <string name="effect_silly_faces" msgid="7952713419757286453">"SILLY FACES"</string>
+ <string name="effect_background" msgid="1358432220077975015">"BACKGROUND"</string>
+ <string name="accessibility_shutter_button" msgid="6040483605347230438">"Shutter"</string>
+ <string name="accessibility_cancel_button" msgid="5679989494636116448">"Cancel"</string>
+ <string name="accessibility_menu_button" msgid="7692103503958544723">"Menu button"</string>
+ <string name="accessibility_check_box" msgid="1084094675439953723">"%1$s tick box"</string>
+ <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"Switch to photo"</string>
+ <string name="accessibility_switch_to_video" msgid="8174781871592793967">"Switch to video"</string>
+ <string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"Switch to panorama"</string>
+ <string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"Switch to Photo Sphere"</string>
+ <string name="accessibility_switch_to_gcam" msgid="7562625440767034695">"Switch to high quality"</string>
+ <string name="accessibility_switch_to_refocus" msgid="6796169367953860106">"Switch to Refocus"</string>
+ <string name="accessibility_review_cancel" msgid="5462850829869569629">"Review cancel"</string>
+ <string name="accessibility_review_ok" msgid="3486465319880320270">"Review done"</string>
+ <string name="accessibility_review_retake" msgid="2547112860787022130">"Review retake"</string>
+ <string name="accessibility_mode_options" msgid="6376831760155403217">"Options"</string>
+ <string name="accessibility_mode_list_hidden" msgid="3743267380450401866">"Mode list closed"</string>
+ <string name="accessibility_mode_list_shown" msgid="5284322142734069179">"Mode list open"</string>
+ <string name="media_accessibility_peek" msgid="234540330161031946">"Capture taken"</string>
+ <string name="photo_accessibility_peek" msgid="5934133371001677250">"Photo taken"</string>
+ <string name="video_accessibility_peek" msgid="7845916149291383132">"Video taken"</string>
+ <string name="accessibility_unlock_to_camera" msgid="1251880974313179442">"Unlock to Camera"</string>
+ <string name="media_date_content_description" msgid="2155634843596817141">"Media taken on %s"</string>
+ <string name="photo_date_content_description" msgid="5705865897898465619">"Photo taken on %s"</string>
+ <string name="video_date_content_description" msgid="2151884014634284456">"Video taken on %s"</string>
+ <string name="panorama_date_content_description" msgid="990703578639006144">"Panorama taken on %s"</string>
+ <string name="photosphere_date_content_description" msgid="4183741743409007876">"Photo Sphere taken on %s"</string>
+ <string name="refocus_date_content_description" msgid="5630960320424345547">"Lens blur taken on %s"</string>
+ <string name="media_processing_content_description" msgid="8138587719107183754">"Media processing"</string>
+ <string name="accessibility_mode_list_toggle" msgid="4784230103566918645">"Toggle mode list"</string>
+ <string name="btn_mode_list_toggle" msgid="3986242443098400164">"Mode list"</string>
+ <string name="accessibility_filmstrip_toggle" msgid="6966978483643396442">"Toggle filmstrip"</string>
+ <string name="btn_filmstrip_toggle" msgid="3666693972882351490">"Filmstrip"</string>
+ <string name="accessibility_mode_zoom_plus" msgid="4967389173992713073">"Zoom in"</string>
+ <string name="btn_zoom_plus" msgid="4645138949375961656">"Z+"</string>
+ <string name="accessibility_mode_zoom_minus" msgid="8850636036927992409">"Zoom out"</string>
+ <string name="btn_zoom_minus" msgid="5436240345362098272">"Z-"</string>
+ <string name="accessibility_zoom_announcement" msgid="6976673411698319811">"Zoom value is %.1f"</string>
+ <string name="capital_on" msgid="1118214824959797269">"ON"</string>
+ <string name="capital_off" msgid="3020696135020167263">"OFF"</string>
+ <string name="video_control_play" msgid="6895236811408921715">"Play Video"</string>
+ <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Off"</string>
+ <string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0.5 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 second"</string>
+ <string name="pref_video_time_lapse_frame_interval_1500" msgid="5793250074165436905">"1.5 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_2000" msgid="1821755013078449188">"2 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_2500" msgid="8027471301321122045">"2.5 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_3000" msgid="1411114492405867872">"3 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_4000" msgid="1197483421014140132">"4 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_5000" msgid="7211885329755347592">"5 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_6000" msgid="6665825017557898190">"6 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_10000" msgid="1126841483618922521">"10 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_12000" msgid="8769265988037327085">"12 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_15000" msgid="1452711342185926617">"15 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_24000" msgid="2505505645705111419">"24 seconds"</string>
+ <string name="pref_video_time_lapse_frame_interval_30000" msgid="3965378176246680626">"0.5 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_60000" msgid="1878467100201983878">"1 minute"</string>
+ <string name="pref_video_time_lapse_frame_interval_90000" msgid="496651530019049822">"1.5 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_120000" msgid="126293364329503816">"2 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_150000" msgid="3469164780802564276">"2.5 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_180000" msgid="6840421790710639463">"3 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_240000" msgid="1682865866425206481">"4 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_300000" msgid="6068734332915957652">"5 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_360000" msgid="4692565393277579688">"6 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_600000" msgid="7109530398883649472">"10 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_720000" msgid="259321148909130247">"12 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_900000" msgid="6814816608134052996">"15 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_1440000" msgid="5691479246748705053">"24 minutes"</string>
+ <string name="pref_video_time_lapse_frame_interval_1800000" msgid="8331728629455012478">"0.5 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_3600000" msgid="4829442147263610121">"1 hour"</string>
+ <string name="pref_video_time_lapse_frame_interval_5400000" msgid="7011488725038113884">"1.5 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_7200000" msgid="7399563587870916008">"2 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_9000000" msgid="1545856778907835970">"2.5 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_10800000" msgid="4064231412857457518">"3 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_14400000" msgid="5174457951350690217">"4 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_18000000" msgid="5091441456160949740">"5 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_21600000" msgid="6924571987775154098">"6 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_36000000" msgid="6959912631566981301">"10 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_43200000" msgid="6426833030111269499">"12 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_54000000" msgid="6688725497680331090">"15 hours"</string>
+ <string name="pref_video_time_lapse_frame_interval_86400000" msgid="5510320806095156153">"24 hours"</string>
+ <string name="time_lapse_seconds" msgid="7319683099532506270">"seconds"</string>
+ <string name="time_lapse_minutes" msgid="5325447383033224679">"minutes"</string>
+ <string name="time_lapse_hours" msgid="5294001144133261436">"hours"</string>
+ <string name="time_lapse_interval_set" msgid="2418594453248958440">"Done"</string>
+ <string name="set_time_interval" msgid="2531393962847535331">"Set Time Interval"</string>
+ <string name="set_time_interval_help" msgid="64145154088021389">"Time lapse feature is off. Turn it on to set time interval."</string>
+ <string name="set_duration" msgid="1638453882581604341">"Set duration in seconds"</string>
+ <string name="count_down_title_text" msgid="7586031110595513050">"Counting down to take a photo"</string>
+ <string name="remember_location_title" msgid="3045040613094030429">"Remember photo locations?"</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"Tag your photos and videos with the locations where they\'re taken."</string>
+ <string name="remember_location_no" msgid="4412802756840226925">"No, thanks"</string>
+ <string name="remember_location_yes" msgid="4339424460683531388">"Yes"</string>
+ <string name="camera_menu_more_label" msgid="7951917844735828365">"MORE OPTIONS"</string>
+ <string name="camera_menu_settings_label" msgid="3862756725328016822">"SETTINGS"</string>
+ <string name="create_tiny_planet" msgid="5186918191372107343">"Create Tiny Planet"</string>
+ <string name="saving_tiny_planet" msgid="8828265180177375494">"Saving Tiny Planet …"</string>
+ <string name="tiny_planet_zoom" msgid="2985522360577158474">"Zoom"</string>
+ <string name="tiny_planet_rotate" msgid="5445336705705350004">"Rotate"</string>
+ <string name="photo_editor" msgid="1521994560971367225">"Photo Editor"</string>
+ <string name="crop_save" msgid="2841974981340098579">"Save"</string>
+ <string name="cannot_load_image" msgid="4100136187076585580">"Cannot load the image!"</string>
+ <string name="switch_photo_filmstrip" msgid="1448511001008888767">"Filmstrip view"</string>
+ <string name="setting_wallpaper" msgid="2397759659347872725">"Setting wallpaper"</string>
+ <string name="mode_settings" msgid="2021937261522670921">"Settings"</string>
+ <string name="mode_camera" msgid="279763925715250603">"Camera"</string>
+ <string name="mode_video" msgid="8633929034048169139">"Video"</string>
+ <string name="mode_photosphere" msgid="5082338476237291833">"Photo Sphere"</string>
+ <string name="mode_timelapse" msgid="1517168724627815453">"Time Lapse"</string>
+ <string name="mode_wideangle" msgid="1099640345041696830">"Wide Angle"</string>
+ <string name="mode_panorama" msgid="6882648621305828861">"Panorama"</string>
+ <string name="mode_refocus" msgid="172192967119469061">"Lens Blur"</string>
+ <string name="mode_camera_desc" msgid="3670807361165657278">"Switch to Camera Mode"</string>
+ <string name="mode_video_desc" msgid="4058407412929464689">"Switch to Video Camera"</string>
+ <string name="mode_photosphere_desc" msgid="2403816283825579161">"Switch to Photo Sphere Mode"</string>
+ <string name="mode_panorama_desc" msgid="6023020404237519590">"Switch to Panorama Mode"</string>
+ <string name="mode_refocus_desc" msgid="6171183297515508465">"Switch to Lens Blur Mode"</string>
+ <string name="settings_open_desc" msgid="6914471293841793766">"Open settings"</string>
+ <string name="settings_close_desc" msgid="3095831199632813127">"Close settings"</string>
+ <string name="hdr_plus_off_desc" msgid="5301287296717144319">"HDR Plus off"</string>
+ <string name="hdr_plus_on_desc" msgid="8204780034508139909">"HDR Plus on"</string>
+ <string name="hdr_off_desc" msgid="7921924739852874675">"HDR off"</string>
+ <string name="hdr_on_desc" msgid="4591284110249047558">"HDR on"</string>
+ <string name="flash_off_desc" msgid="7151559466286106797">"Flash off"</string>
+ <string name="flash_auto_desc" msgid="3009043125539675717">"Flash auto"</string>
+ <string name="flash_on_desc" msgid="930372145324854699">"Flash on"</string>
+ <string name="hdr_plus_flash_off_desc" msgid="5335888906983788789">"HDR+ flash off"</string>
+ <string name="hdr_plus_flash_auto_desc" msgid="4812200236263011537">"HDR+ flash auto"</string>
+ <string name="hdr_plus_flash_on_desc" msgid="8323389161987561284">"HDR+ flash on"</string>
+ <string name="torch_on_desc" msgid="3069836196559213365">"Torch on"</string>
+ <string name="torch_off_desc" msgid="8304675202998742618">"Torch off"</string>
+ <string name="camera_id_back_desc" msgid="3566327490758890635">"Back camera"</string>
+ <string name="camera_id_front_desc" msgid="7497517948130254220">"Front camera"</string>
+ <string name="grid_lines_off_desc" msgid="2022385817190451353">"Grid lines off"</string>
+ <string name="grid_lines_on_desc" msgid="4601540461914364817">"Grid lines on"</string>
+ <string name="countdown_timer_off" msgid="1663008439564495948">"Countdown timer is off"</string>
+ <string name="countdown_timer_duration_3s" msgid="7435393834886072664">"Countdown timer duration is set to 3 seconds"</string>
+ <string name="countdown_timer_duration_10s" msgid="9085308782250002795">"Countdown timer duration is set to 10 seconds"</string>
+ <string name="more_options_desc" msgid="4628738800610478353">"More Options"</string>
+ <string name="cancel_button_description" msgid="3801167024006905033">"Cancel"</string>
+ <string name="done_button_description" msgid="1334963435441544592">"Done"</string>
+ <string name="retake_button_description" msgid="4234613030674787714">"Retake"</string>
+ <string name="review_button_description" msgid="7932122063748430080">"Review"</string>
+ <string name="share_button_description" msgid="5108508790540832053">"Share"</string>
+ <string name="view_button_description" msgid="4985768837891362075">"View"</string>
+ <string name="edit_button_description" msgid="98550816724901925">"Edit"</string>
+ <string name="delete_button_description" msgid="2251065309677200911">"Delete"</string>
+ <string name="manual_exposure_compensation_desc" msgid="5595219532556566042">"Manual Exposure Compensation"</string>
+ <string name="exposure_compensation_desc_n2" msgid="8957966533506294324">"Exposure Compensation -2"</string>
+ <string name="exposure_compensation_desc_n1" msgid="3035027224866688267">"Exposure Compensation -1"</string>
+ <string name="exposure_compensation_desc_0" msgid="2820273752287040523">"Exposure Compensation 0"</string>
+ <string name="exposure_compensation_desc_p1" msgid="2328275401634452554">"Exposure Compensation +1"</string>
+ <string name="exposure_compensation_desc_p2" msgid="4555277824096107142">"Exposure Compensation +2"</string>
+ <string name="button_change_announcement" msgid="3759686152778772111">"Button is now %s"</string>
+ <string name="setting_location" msgid="4459859689227893838">"Location"</string>
+ <string name="setting_back_camera_photo" msgid="256738900473265017">"Back camera photo"</string>
+ <string name="setting_back_camera_video" msgid="5220819479408164689">"Back camera video"</string>
+ <string name="setting_front_camera_photo" msgid="4131886734622868637">"Front camera photo"</string>
+ <string name="setting_front_camera_video" msgid="2178799452805359752">"Front camera video"</string>
+ <string name="setting_default_camera" msgid="6954076799301004779">"Default Camera"</string>
+ <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Help & feedback"</string>
+ <string name="processing_hdr_plus" msgid="9160093263037540304">"Processing HDR+ …"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"Open-source licences"</string>
+ <string name="pref_category_general" msgid="6737748849700581019">"General Settings"</string>
+ <string name="pref_category_resolution_quality" msgid="6641462402321962896">"Resolution & quality"</string>
+ <string name="pref_category_about" msgid="1966255405679342337">"About"</string>
+ <string name="pref_title_build_version" msgid="481489988124832651">"Build version"</string>
+ <string name="pref_video_quality_entry_low" msgid="737962621299050603">"Low"</string>
+ <string name="pref_video_quality_entry_high" msgid="1613578418842803393">"High"</string>
+ <string name="pref_video_quality_entry_qcif" msgid="1717816794399266216">"QCIF"</string>
+ <string name="pref_video_quality_entry_cif" msgid="645414019445016434">"CIF"</string>
+ <string name="pref_video_quality_entry_480p" msgid="5880250731066854583">"SD 480p"</string>
+ <string name="pref_video_quality_entry_720p" msgid="4076146428148167262">"HD 720p"</string>
+ <string name="pref_video_quality_entry_1080p" msgid="4539958891524211120">"HD 1080p"</string>
+ <string name="pref_video_quality_entry_qvga" msgid="342600517453781430">"QVGA"</string>
+ <string name="pref_video_quality_entry_2160p" msgid="4522927631413184505">"UHD 4K"</string>
+ <string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s megapixels"</string>
+ <string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s megapixels"</string>
+ <string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"To refocus, touch here"</string>
+ <string name="pref_category_advanced" msgid="5921085080077574872">"Advanced"</string>
+ <string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"Manual exposure"</string>
+ <string name="settings_cling_text" msgid="5368054627268181292">"In Settings, change resolution and quality, or try advanced features."</string>
+ <string name="photo_size_selection_title" msgid="2789753590719172645">"Choose photo size"</string>
+ <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"You can change this later in Settings."</string>
+ <string name="share_to" msgid="5144911209144798122">"Share to"</string>
+ <string name="edit_with" msgid="615569327230783971">"Edit with"</string>
+ <string name="startup_dialog_button_next" msgid="1011831256978228993">"NEXT"</string>
+ <string name="confirm_button_text" msgid="7389949384482206814">"OK, GOT IT"</string>
+ <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"Full sensor \n(4:3)"</string>
+ <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"Cropped sensor \n(16:9)"</string>
+ <string name="pref_boolean_false" msgid="461317129020087333">"0"</string>
+ <string name="pref_boolean_true" msgid="4131945223998878009">"1"</string>
+ <string name="session_saving_image" msgid="8932315404486416826">"Saving..."</string>
+</resources>
diff --git a/res/values-et-rEE/strings.xml b/res/values-et/strings.xml
similarity index 100%
rename from res/values-et-rEE/strings.xml
rename to res/values-et/strings.xml
diff --git a/res/values-eu-rES/strings.xml b/res/values-eu/strings.xml
similarity index 99%
rename from res/values-eu-rES/strings.xml
rename to res/values-eu/strings.xml
index 008852e..086591e 100644
--- a/res/values-eu-rES/strings.xml
+++ b/res/values-eu/strings.xml
@@ -296,7 +296,7 @@
<string name="mode_photosphere" msgid="5082338476237291833">"360°-ko panoramika"</string>
<string name="mode_timelapse" msgid="1517168724627815453">"Denbora-bitartea"</string>
<string name="mode_wideangle" msgid="1099640345041696830">"Angeluhandia"</string>
- <string name="mode_panorama" msgid="6882648621305828861">"Panoramika"</string>
+ <string name="mode_panorama" msgid="6882648621305828861">"Argazki panoramikoa"</string>
<string name="mode_refocus" msgid="172192967119469061">"Fokatze-efektua"</string>
<string name="mode_camera_desc" msgid="3670807361165657278">"Aldatu kamera modura"</string>
<string name="mode_video_desc" msgid="4058407412929464689">"Aldatu bideokamerara"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 1aa1a9c..6cc07d3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/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">"Ajastimen ääni"</string>
- <string name="setting_off" msgid="6782191065550276632">"Ei käyt."</string>
+ <string name="setting_off" msgid="6782191065550276632">"Ei käytössä"</string>
<string name="setting_on" msgid="9086728135773197891">"KÄYTÖSSÄ"</string>
<string name="pref_video_quality_title" msgid="5887153490982738588">"Videon laatu"</string>
<string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Intervallikuvaus"</string>
@@ -227,7 +227,7 @@
<string name="capital_on" msgid="1118214824959797269">"KÄYTÖSSÄ"</string>
<string name="capital_off" msgid="3020696135020167263">"EI KÄYTÖSSÄ"</string>
<string name="video_control_play" msgid="6895236811408921715">"Toista video"</string>
- <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Ei käyt."</string>
+ <string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Ei käytössä"</string>
<string name="pref_video_time_lapse_frame_interval_500" msgid="1425296755074319221">"0,5 sekuntia"</string>
<string name="pref_video_time_lapse_frame_interval_1000" msgid="9126255690984179200">"1 sekunti"</string>
<string name="pref_video_time_lapse_frame_interval_1500" msgid="5793250074165436905">"1,5 sekuntia"</string>
diff --git a/res/values-gl-rES/strings.xml b/res/values-gl/strings.xml
similarity index 99%
rename from res/values-gl-rES/strings.xml
rename to res/values-gl/strings.xml
index 6b84551..37fcd70 100644
--- a/res/values-gl-rES/strings.xml
+++ b/res/values-gl/strings.xml
@@ -303,7 +303,7 @@
<string name="mode_photosphere_desc" msgid="2403816283825579161">"Cambiar ao modo Fotografía esférica"</string>
<string name="mode_panorama_desc" msgid="6023020404237519590">"Cambiar ao modo de panorámica"</string>
<string name="mode_refocus_desc" msgid="6171183297515508465">"Cambiar ao modo Efecto de enfoque"</string>
- <string name="settings_open_desc" msgid="6914471293841793766">"Abrir a configuración"</string>
+ <string name="settings_open_desc" msgid="6914471293841793766">"Abrir configuración"</string>
<string name="settings_close_desc" msgid="3095831199632813127">"Pechar a configuración"</string>
<string name="hdr_plus_off_desc" msgid="5301287296717144319">"HDR Plus desactivado"</string>
<string name="hdr_plus_on_desc" msgid="8204780034508139909">"HDR Plus activado"</string>
@@ -357,9 +357,9 @@
<string name="pref_video_quality_entry_high" msgid="1613578418842803393">"Alta"</string>
<string name="pref_video_quality_entry_qcif" msgid="1717816794399266216">"QCIF"</string>
<string name="pref_video_quality_entry_cif" msgid="645414019445016434">"CIF"</string>
- <string name="pref_video_quality_entry_480p" msgid="5880250731066854583">"SD 480 p"</string>
- <string name="pref_video_quality_entry_720p" msgid="4076146428148167262">"HD 720 p"</string>
- <string name="pref_video_quality_entry_1080p" msgid="4539958891524211120">"HD 1080 p"</string>
+ <string name="pref_video_quality_entry_480p" msgid="5880250731066854583">"SD 480p"</string>
+ <string name="pref_video_quality_entry_720p" msgid="4076146428148167262">"HD 720p"</string>
+ <string name="pref_video_quality_entry_1080p" msgid="4539958891524211120">"HD 1080p"</string>
<string name="pref_video_quality_entry_qvga" msgid="342600517453781430">"QVGA"</string>
<string name="pref_video_quality_entry_2160p" msgid="4522927631413184505">"UHD de 4K"</string>
<string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s megapíxeles"</string>
diff --git a/res/values-gu-rIN/strings.xml b/res/values-gu/strings.xml
similarity index 99%
rename from res/values-gu-rIN/strings.xml
rename to res/values-gu/strings.xml
index 749b0d0..8cb8b1e 100644
--- a/res/values-gu-rIN/strings.xml
+++ b/res/values-gu/strings.xml
@@ -276,7 +276,7 @@
<string name="set_duration" msgid="1638453882581604341">"સેકંડમાં અવધિ સેટ કરો"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"ફોટો લેવા માટે કાઉન્ટ ડાઉન કરી રહ્યું છે"</string>
<string name="remember_location_title" msgid="3045040613094030429">"ફોટો સ્થાનો યાદ રાખીએ?"</string>
- <string name="remember_location_prompt" msgid="3006013504489919474">"તમારા ફોટા અને વિડિઓઝને તે જ્યાંથી લેવાયેલા તે સ્થાનો સાથે ટેગ કરો."</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"તમારા ફોટો અને વિડિઓઝને તે જ્યાંથી લેવાયેલા તે સ્થાનો સાથે ટેગ કરો."</string>
<string name="remember_location_no" msgid="4412802756840226925">"નહીં આભાર"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"હા"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"વધુ વિકલ્પો"</string>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 00c7a9a..7680ecf 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -22,14 +22,14 @@
<string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
<string name="set_image" msgid="3969690281401045698">"फ़ोटो को इस रूप में सेट करें"</string>
<string name="delete" msgid="2714492172818940424">"हटाएं"</string>
- <string name="share" msgid="8581089487762243115">"साझा करें"</string>
- <string name="share_panorama" msgid="3558466186935359444">"पैनोरामा को साझा करें"</string>
- <string name="share_as_photo" msgid="4831213580709167218">"फ़ोटो के रूप में साझा करें"</string>
+ <string name="share" msgid="8581089487762243115">"शेयर करें"</string>
+ <string name="share_panorama" msgid="3558466186935359444">"पैनोरामा को शेयर करें"</string>
+ <string name="share_as_photo" msgid="4831213580709167218">"फ़ोटो के रूप में शेयर करें"</string>
<string name="deleted" msgid="2036165115527228127">"हटाया गया"</string>
<string name="undo" msgid="5110048345890050107">"वापस लाएं"</string>
<string name="details" msgid="4404020741542549488">"विवरण"</string>
<string name="close" msgid="4826166926297479820">"बंद करें"</string>
- <string name="show_on_map" msgid="8542853913632649160">"मानचित्र पर दिखाएं"</string>
+ <string name="show_on_map" msgid="8542853913632649160">"मैप पर दिखाएं"</string>
<string name="rotate_left" msgid="2618440058490662604">"बाएं घुमाएं"</string>
<string name="rotate_right" msgid="4896096424267838355">"दाएं घुमाएं"</string>
<string name="edit" msgid="2776879395749004347">"संपादित करें"</string>
@@ -68,7 +68,7 @@
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"कैमरे से कनेक्ट नहीं किया जा सकता."</string>
<string name="error_camera_disabled" msgid="5582398275657419692">"सुरक्षा नीतियों के कारण कैमरा अक्षम कर दिया गया है."</string>
<string name="error_media_storage_failure" msgid="7711687330673245629">"आपकी फ़ोटो या वीडियो को सहेजते समय समस्या हुई थी."</string>
- <string name="error_permissions" msgid="3454167403425651254">"ऐप के पास चलने के लिए महत्वपूर्ण अनुमतियां नहीं हैं. कृपया अपनी अनुमतियां सेटिंग जांचें."</string>
+ <string name="error_permissions" msgid="3454167403425651254">"ऐप के पास चलने के लिए महत्वपूर्ण अनुमतियां नहीं हैं. कृपया अपनी अनुमतियां सेटिंग जाँचें."</string>
<string name="reason_storage_failure" msgid="6818898304774654969">"फ़ोटो मेमोरी विफलता."</string>
<string name="wait" msgid="765601745709933047">"कृपया प्रतीक्षा करें..."</string>
<string name="no_storage" product="default" msgid="5922012950780548098">"कैमरे का उपयोग करने से पहले SD कार्ड डालें."</string>
@@ -329,7 +329,7 @@
<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>
+ <string name="share_button_description" msgid="5108508790540832053">"शेयर करें"</string>
<string name="view_button_description" msgid="4985768837891362075">"देखें"</string>
<string name="edit_button_description" msgid="98550816724901925">"संपादित करें"</string>
<string name="delete_button_description" msgid="2251065309677200911">"हटाएं"</string>
@@ -370,7 +370,7 @@
<string name="settings_cling_text" msgid="5368054627268181292">"सेटिंग में, रिज़ॉल्यूशन और गुणवत्ता बदलें, या अतिरिक्त सुविधाओं को आज़माएं."</string>
<string name="photo_size_selection_title" msgid="2789753590719172645">"फ़ोटो आकार चुनें"</string>
<string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"आप इसे बाद में सेटिंग में बदल सकते हैं."</string>
- <string name="share_to" msgid="5144911209144798122">"इनसे साझा करें:"</string>
+ <string name="share_to" msgid="5144911209144798122">"इनसे शेयर करें:"</string>
<string name="edit_with" msgid="615569327230783971">"इससे संपादित करें:"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"आगे"</string>
<string name="confirm_button_text" msgid="7389949384482206814">"ठीक है, समझ लिया"</string>
diff --git a/res/values-hy-rAM/strings.xml b/res/values-hy/strings.xml
similarity index 98%
rename from res/values-hy-rAM/strings.xml
rename to res/values-hy/strings.xml
index b5319d3..63294dc 100644
--- a/res/values-hy-rAM/strings.xml
+++ b/res/values-hy/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_name" msgid="1175086483881127797">"Ֆոտոխցիկ"</string>
+ <string name="app_name" msgid="1175086483881127797">"Տեսախցիկ"</string>
<string name="video_camera_label" msgid="1723708322021743770">"Տեսախցիկ"</string>
<string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
<string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
@@ -81,14 +81,14 @@
<string name="pref_camera_id_title" msgid="4680648115225411185">"Ընտրել տեսախցիկը"</string>
<string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Հետևի"</string>
<string name="pref_camera_id_entry_front" msgid="6233067010315787044">"Առջևի"</string>
- <string name="pref_camera_save_location_title" msgid="2344235620113384017">"Պահել տեղադրությունը"</string>
+ <string name="pref_camera_save_location_title" msgid="2344235620113384017">"Նկարահանման վայրը"</string>
<string name="pref_camera_location_label" msgid="8695441802378057719">"ՏԵՂԱԴՐՈՒԹՅՈՒՆ"</string>
<string name="pref_camera_timer_title" msgid="4728838281741571323">"Հետհաշվարկի ժամաչափ"</string>
<!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
<skip />
<string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"Հետհաշվարկի նշան"</string>
<string name="setting_off" msgid="6782191065550276632">"Անջատված"</string>
- <string name="setting_on" msgid="9086728135773197891">"Միացված"</string>
+ <string name="setting_on" msgid="9086728135773197891">"Միացված է"</string>
<string name="pref_video_quality_title" msgid="5887153490982738588">"Տեսանյութի որակը"</string>
<string name="pref_video_time_lapse_frame_interval_title" msgid="4975260837607993569">"Ժամանակի սպառում"</string>
<string name="pref_camera_settings_category" msgid="4274141528139077830">"Տեսախցիկի կարգավորումներ"</string>
@@ -107,7 +107,7 @@
<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_on" msgid="3519831202665377698">"Միացված"</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>
<string name="pref_camera_flashmode_label_on" msgid="373595517770024934">"ԼՈՒՍԱԹԱՐԹԻՉԸ ՄԻԱՑՎԱԾ Է"</string>
@@ -224,7 +224,7 @@
<string name="accessibility_mode_zoom_minus" msgid="8850636036927992409">"Փոքրացնել"</string>
<string name="btn_zoom_minus" msgid="5436240345362098272">"Z-"</string>
<string name="accessibility_zoom_announcement" msgid="6976673411698319811">"Չափերի փոփոխման ընթացիկ արժեքն է %.1f"</string>
- <string name="capital_on" msgid="1118214824959797269">"Միացված"</string>
+ <string name="capital_on" msgid="1118214824959797269">"ՄԻԱՑ"</string>
<string name="capital_off" msgid="3020696135020167263">"Անջատված"</string>
<string name="video_control_play" msgid="6895236811408921715">"Նվագարկել տեսանյութը"</string>
<string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"Անջատված"</string>
@@ -291,7 +291,7 @@
<string name="switch_photo_filmstrip" msgid="1448511001008888767">"Կինոժապավենի տեսք"</string>
<string name="setting_wallpaper" msgid="2397759659347872725">"Պաստառը տեղադրվում է"</string>
<string name="mode_settings" msgid="2021937261522670921">"Կարգավորումներ"</string>
- <string name="mode_camera" msgid="279763925715250603">"Ֆոտոխցիկ"</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_timelapse" msgid="1517168724627815453">"Ժամանակի սպառում"</string>
@@ -319,8 +319,8 @@
<string name="torch_off_desc" msgid="8304675202998742618">"Լապտերն անջատված է"</string>
<string name="camera_id_back_desc" msgid="3566327490758890635">"Հետևի տեսախցիկ"</string>
<string name="camera_id_front_desc" msgid="7497517948130254220">"Առջևի տեսախցիկ"</string>
- <string name="grid_lines_off_desc" msgid="2022385817190451353">"Ցանցային գծերն անջատված են"</string>
- <string name="grid_lines_on_desc" msgid="4601540461914364817">"Ցանցային գծերը միացված են"</string>
+ <string name="grid_lines_off_desc" msgid="2022385817190451353">"Ցանցագծերն անջատված են"</string>
+ <string name="grid_lines_on_desc" msgid="4601540461914364817">"Ցանցագծերը միացված են"</string>
<string name="countdown_timer_off" msgid="1663008439564495948">"Հետհաշվարկի ժամաչափն անջատված է"</string>
<string name="countdown_timer_duration_3s" msgid="7435393834886072664">"Հետհաշվարկի ժամաչափի տևողությունը սահմանված է 3 վայրկյան"</string>
<string name="countdown_timer_duration_10s" msgid="9085308782250002795">"Հետհաշվարկի ժամաչափի տևողությունը սահմանված է 10 վայրկյան"</string>
@@ -352,7 +352,7 @@
<string name="pref_category_general" msgid="6737748849700581019">"Հիմնական կարգավորումներ"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"Լուծաչափ և որակ"</string>
<string name="pref_category_about" msgid="1966255405679342337">"Ծրագրի մասին"</string>
- <string name="pref_title_build_version" msgid="481489988124832651">"Պատրաստման տարբերակը"</string>
+ <string name="pref_title_build_version" msgid="481489988124832651">"Կառուցման տարբերակը"</string>
<string name="pref_video_quality_entry_low" msgid="737962621299050603">"Ցածր"</string>
<string name="pref_video_quality_entry_high" msgid="1613578418842803393">"Բարձր"</string>
<string name="pref_video_quality_entry_qcif" msgid="1717816794399266216">"QCIF"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 54a8add..1392a0d 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -348,7 +348,7 @@
<string name="setting_default_camera" msgid="6954076799301004779">"Kamera Default"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Bantuan & masukan"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"Memproses HDR+ …"</string>
- <string name="open_source_licenses" msgid="2169711954264883060">"Lisensi sumber terbuka"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"Lisensi open source"</string>
<string name="pref_category_general" msgid="6737748849700581019">"Setelan Umum"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"Resolusi & kualitas"</string>
<string name="pref_category_about" msgid="1966255405679342337">"Tentang"</string>
diff --git a/res/values-is-rIS/strings.xml b/res/values-is/strings.xml
similarity index 100%
rename from res/values-is-rIS/strings.xml
rename to res/values-is/strings.xml
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 64a6ba6..d4f65f6 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -158,7 +158,7 @@
<string name="pref_camera_id_label_front" msgid="349308803062874842">"מצלמה אחורית"</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_report" msgid="7616428760369876209">"דיווח"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"סגור"</string>
<string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"השטח בכרטיס ה-SD אוזל. שנה את הגדרת האיכות או מחק חלק מהתמונות או קבצים אחרים."</string>
<string name="video_reach_size_limit" msgid="9196836111505731836">"הגעת למגבלת הגודל."</string>
diff --git a/res/values-ka-rGE/strings.xml b/res/values-ka/strings.xml
similarity index 100%
rename from res/values-ka-rGE/strings.xml
rename to res/values-ka/strings.xml
diff --git a/res/values-kk-rKZ/strings.xml b/res/values-kk/strings.xml
similarity index 100%
rename from res/values-kk-rKZ/strings.xml
rename to res/values-kk/strings.xml
diff --git a/res/values-km-rKH/strings.xml b/res/values-km/strings.xml
similarity index 100%
rename from res/values-km-rKH/strings.xml
rename to res/values-km/strings.xml
diff --git a/res/values-kn-rIN/strings.xml b/res/values-kn/strings.xml
similarity index 99%
rename from res/values-kn-rIN/strings.xml
rename to res/values-kn/strings.xml
index db7204e..13b7f71 100644
--- a/res/values-kn-rIN/strings.xml
+++ b/res/values-kn/strings.xml
@@ -21,7 +21,7 @@
<string name="details_ms" msgid="6618163484662724641">"%1$02d:%2$02d"</string>
<string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
<string name="set_image" msgid="3969690281401045698">"ಚಿತ್ರವನ್ನು ಹೀಗೆ ಹೊಂದಿಸಿ"</string>
- <string name="delete" msgid="2714492172818940424">"ಅಳಿಸು"</string>
+ <string name="delete" msgid="2714492172818940424">"ಅಳಿಸಿ"</string>
<string name="share" msgid="8581089487762243115">"ಹಂಚು"</string>
<string name="share_panorama" msgid="3558466186935359444">"ಪನೋರಮಾ ಹಂಚಿಕೊಳ್ಳಿ"</string>
<string name="share_as_photo" msgid="4831213580709167218">"ಫೋಟೋ ರೂಪದಲ್ಲಿ ಹಂಚಿರಿ"</string>
@@ -40,7 +40,7 @@
<string name="title" msgid="8061744305671964703">"ಶೀರ್ಷಿಕೆ"</string>
<string name="description" msgid="8193138501982849808">"ವಿವರಣೆ"</string>
<string name="time" msgid="5248213506417024287">"ಸಮಯ"</string>
- <string name="location" msgid="564326205780827668">"ಸ್ಥಾನ"</string>
+ <string name="location" msgid="564326205780827668">"ಸ್ಥಳ"</string>
<string name="path" msgid="5927003361865586353">"ಹಾದಿ"</string>
<string name="width" msgid="7045750687833828758">"ಅಗಲ"</string>
<string name="height" msgid="5186001199353423689">"ಎತ್ತರ"</string>
@@ -159,7 +159,7 @@
<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>
+ <string name="dialog_dismiss" msgid="1382550604990470119">"ವಜಾಗೊಳಿಸಿ"</string>
<string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"ನಿಮ್ಮ SD ಕಾರ್ಡ್ ಸ್ಥಳವು ಭರ್ತಿಯಾಗಿದೆ. ಗುಣಮಟ್ಟದ ಸೆಟ್ಟಿಂಗ್ ಬದಲಾಯಿಸಿ ಅಥವಾ ಕೆಲವು ಚಿತ್ರಗಳನ್ನು ಇಲ್ಲವೇ ಇತರ ಫೈಲ್ಗಳನ್ನು ಅಳಿಸಿ."</string>
<string name="video_reach_size_limit" msgid="9196836111505731836">"ಗಾತ್ರದ ಮಿತಿ ತಲುಪಿದೆ."</string>
<string name="pano_too_fast_prompt" msgid="2503148095578052177">"ತುಂಬಾ ವೇಗವಾಗಿದೆ"</string>
@@ -224,7 +224,7 @@
<string name="accessibility_mode_zoom_minus" msgid="8850636036927992409">"ಝೂಮ್ ಔಟ್"</string>
<string name="btn_zoom_minus" msgid="5436240345362098272">"Z-"</string>
<string name="accessibility_zoom_announcement" msgid="6976673411698319811">"ಝೂಮ್ ಮೌಲ್ಯ %.1f"</string>
- <string name="capital_on" msgid="1118214824959797269">"ಆನ್ ಮಾಡು"</string>
+ <string name="capital_on" msgid="1118214824959797269">"ಆನ್ ಮಾಡಿ"</string>
<string name="capital_off" msgid="3020696135020167263">"ಆಫ್ ಮಾಡು"</string>
<string name="video_control_play" msgid="6895236811408921715">"ವೀಡಿಯೊವನ್ನು ಪ್ಲೇ ಮಾಡಿ"</string>
<string name="pref_video_time_lapse_frame_interval_off" msgid="3909611941842585497">"ಆಫ್ ಆಗಿದೆ"</string>
@@ -332,7 +332,7 @@
<string name="share_button_description" msgid="5108508790540832053">"ಹಂಚಿಕೊಳ್ಳಿ"</string>
<string name="view_button_description" msgid="4985768837891362075">"ವೀಕ್ಷಿಸು"</string>
<string name="edit_button_description" msgid="98550816724901925">"ಎಡಿಟ್"</string>
- <string name="delete_button_description" msgid="2251065309677200911">"ಅಳಿಸು"</string>
+ <string name="delete_button_description" msgid="2251065309677200911">"ಅಳಿಸಿ"</string>
<string name="manual_exposure_compensation_desc" msgid="5595219532556566042">"ಮ್ಯಾನುಯಲ್ ಮಾನ್ಯತೆ ಪರಿಹಾರ"</string>
<string name="exposure_compensation_desc_n2" msgid="8957966533506294324">"ಮಾನ್ಯತೆ ಪರಿಹಾರ -2"</string>
<string name="exposure_compensation_desc_n1" msgid="3035027224866688267">"ಮಾನ್ಯತೆ ಪರಿಹಾರ -1"</string>
@@ -340,7 +340,7 @@
<string name="exposure_compensation_desc_p1" msgid="2328275401634452554">"ಮಾನ್ಯತೆ ಪರಿಹಾರ +1"</string>
<string name="exposure_compensation_desc_p2" msgid="4555277824096107142">"ಮಾನ್ಯತೆ ಪರಿಹಾರ +2"</string>
<string name="button_change_announcement" msgid="3759686152778772111">"ಬಟನ್ ಇದೀಗ %s ಆಗಿದೆ"</string>
- <string name="setting_location" msgid="4459859689227893838">"ಸ್ಥಾನ"</string>
+ <string name="setting_location" msgid="4459859689227893838">"ಸ್ಥಳ"</string>
<string name="setting_back_camera_photo" msgid="256738900473265017">"ಬ್ಯಾಕ್ ಕ್ಯಾಮರಾ ಫೋಟೋ"</string>
<string name="setting_back_camera_video" msgid="5220819479408164689">"ಬ್ಯಾಕ್ ಕ್ಯಾಮರಾ ವೀಡಿಯೊ"</string>
<string name="setting_front_camera_photo" msgid="4131886734622868637">"ಫ್ರಂಟ್ ಕ್ಯಾಮರಾ ಫೋಟೋ"</string>
@@ -348,7 +348,7 @@
<string name="setting_default_camera" msgid="6954076799301004779">"ಡಿಫಾಲ್ಟ್ ಕ್ಯಾಮರಾ"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"ಸಹಾಯ & ಪ್ರತಿಕ್ರಿಯೆ"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ ಪ್ರಕ್ರಿಯೆಯಲ್ಲಿದೆ…"</string>
- <string name="open_source_licenses" msgid="2169711954264883060">"ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"ಓಪನ್ ಸೋರ್ಸ್ ಪರವಾನಗಿಗಳು"</string>
<string name="pref_category_general" msgid="6737748849700581019">"ಸಾಮಾನ್ಯ ಸೆಟ್ಟಿಂಗ್ಗಳು"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"ರೆಸಲ್ಯೂಷನ್ & ಗುಣಮಟ್ಟ"</string>
<string name="pref_category_about" msgid="1966255405679342337">"ಕುರಿತು"</string>
diff --git a/res/values-ky-rKG/strings.xml b/res/values-ky/strings.xml
similarity index 99%
rename from res/values-ky-rKG/strings.xml
rename to res/values-ky/strings.xml
index 42d076e..a966017 100644
--- a/res/values-ky-rKG/strings.xml
+++ b/res/values-ky/strings.xml
@@ -346,7 +346,7 @@
<string name="setting_front_camera_photo" msgid="4131886734622868637">"Алдыңкы камера сүрөтү"</string>
<string name="setting_front_camera_video" msgid="2178799452805359752">"Алдыңкы камера видеосу"</string>
<string name="setting_default_camera" msgid="6954076799301004779">"Абалкы камера"</string>
- <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Жардам жана жооп пикир"</string>
+ <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Жардам/пикир билдирүү"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ иштетилүүдө …"</string>
<string name="open_source_licenses" msgid="2169711954264883060">"Ачык программа уруксаттамалары"</string>
<string name="pref_category_general" msgid="6737748849700581019">"Жалпы тууралоолор"</string>
diff --git a/res/values-lo-rLA/strings.xml b/res/values-lo/strings.xml
similarity index 100%
rename from res/values-lo-rLA/strings.xml
rename to res/values-lo/strings.xml
diff --git a/res/values-mk-rMK/strings.xml b/res/values-mk/strings.xml
similarity index 98%
rename from res/values-mk-rMK/strings.xml
rename to res/values-mk/strings.xml
index 412af6e..b332e09 100644
--- a/res/values-mk-rMK/strings.xml
+++ b/res/values-mk/strings.xml
@@ -32,7 +32,7 @@
<string name="show_on_map" msgid="8542853913632649160">"Прикажи на карта"</string>
<string name="rotate_left" msgid="2618440058490662604">"Ротирај налево"</string>
<string name="rotate_right" msgid="4896096424267838355">"Ротирај надесно"</string>
- <string name="edit" msgid="2776879395749004347">"Уреди"</string>
+ <string name="edit" msgid="2776879395749004347">"Измени"</string>
<string name="crop_action" msgid="6933589718464132714">"Исечи"</string>
<string name="trim_action" msgid="4736803320203951827">"Скрати"</string>
<string name="set_as" msgid="5469055085024870081">"Постави како"</string>
@@ -277,7 +277,7 @@
<string name="count_down_title_text" msgid="7586031110595513050">"Одбројува за да фотографира"</string>
<string name="remember_location_title" msgid="3045040613094030429">"Се сеќавате на локациите на фотографиите?"</string>
<string name="remember_location_prompt" msgid="3006013504489919474">"Означете ги фотографиите и видеата со локациите каде што се создадени."</string>
- <string name="remember_location_no" msgid="4412802756840226925">"Не, благодарам"</string>
+ <string name="remember_location_no" msgid="4412802756840226925">"Не, фала"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"Да"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"ПОВЕЌЕ ОПЦИИ"</string>
<string name="camera_menu_settings_label" msgid="3862756725328016822">"ПОДЕСУВАЊА"</string>
@@ -303,8 +303,8 @@
<string name="mode_photosphere_desc" msgid="2403816283825579161">"Префрли на „Режим на Фотосфера“"</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>
- <string name="settings_close_desc" msgid="3095831199632813127">"Затвори подесувања"</string>
+ <string name="settings_open_desc" msgid="6914471293841793766">"Отвори поставки"</string>
+ <string name="settings_close_desc" msgid="3095831199632813127">"Затвори поставки"</string>
<string name="hdr_plus_off_desc" msgid="5301287296717144319">"HDR Плус исклучено"</string>
<string name="hdr_plus_on_desc" msgid="8204780034508139909">"HDR Плус е вклучено"</string>
<string name="hdr_off_desc" msgid="7921924739852874675">"HDR исклучено"</string>
@@ -331,7 +331,7 @@
<string name="review_button_description" msgid="7932122063748430080">"Преглед"</string>
<string name="share_button_description" msgid="5108508790540832053">"Сподели"</string>
<string name="view_button_description" msgid="4985768837891362075">"Прикажи"</string>
- <string name="edit_button_description" msgid="98550816724901925">"Уреди"</string>
+ <string name="edit_button_description" msgid="98550816724901925">"Измени"</string>
<string name="delete_button_description" msgid="2251065309677200911">"Избриши"</string>
<string name="manual_exposure_compensation_desc" msgid="5595219532556566042">"Рачна компензација на експозиција"</string>
<string name="exposure_compensation_desc_n2" msgid="8957966533506294324">"Компензација на експозиција -2"</string>
@@ -349,7 +349,7 @@
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Помош и информации"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"Обработка на HDR+..."</string>
<string name="open_source_licenses" msgid="2169711954264883060">"Лиценци со отворен код"</string>
- <string name="pref_category_general" msgid="6737748849700581019">"Општи подесувања"</string>
+ <string name="pref_category_general" msgid="6737748849700581019">"Општи поставки"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"Резолуција и квалитет"</string>
<string name="pref_category_about" msgid="1966255405679342337">"За"</string>
<string name="pref_title_build_version" msgid="481489988124832651">"Изгради верзија"</string>
@@ -371,7 +371,7 @@
<string name="photo_size_selection_title" msgid="2789753590719172645">"Изберете големина на фотографија"</string>
<string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"Ова може да го промените подоцна во Поставки."</string>
<string name="share_to" msgid="5144911209144798122">"Сподели на"</string>
- <string name="edit_with" msgid="615569327230783971">"Уреди со"</string>
+ <string name="edit_with" msgid="615569327230783971">"Измени со"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"СЛЕДНО"</string>
<string name="confirm_button_text" msgid="7389949384482206814">"ВО РЕД, СФАТИВ"</string>
<string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"Целосен сензор \n(4:3)"</string>
diff --git a/res/values-ml-rIN/strings.xml b/res/values-ml/strings.xml
similarity index 100%
rename from res/values-ml-rIN/strings.xml
rename to res/values-ml/strings.xml
diff --git a/res/values-mn-rMN/strings.xml b/res/values-mn/strings.xml
similarity index 100%
rename from res/values-mn-rMN/strings.xml
rename to res/values-mn/strings.xml
diff --git a/res/values-mr-rIN/strings.xml b/res/values-mr/strings.xml
similarity index 93%
rename from res/values-mr-rIN/strings.xml
rename to res/values-mr/strings.xml
index b850508..7dc363e 100644
--- a/res/values-mr-rIN/strings.xml
+++ b/res/values-mr/strings.xml
@@ -22,10 +22,10 @@
<string name="details_hms" msgid="4842276230698703554">"%1$d:%2$02d:%3$02d"</string>
<string name="set_image" msgid="3969690281401045698">"चित्र या रूपात सेट करा"</string>
<string name="delete" msgid="2714492172818940424">"हटवा"</string>
- <string name="share" msgid="8581089487762243115">"सामायिक करा"</string>
- <string name="share_panorama" msgid="3558466186935359444">"पॅनोरामा सामायिक करा"</string>
- <string name="share_as_photo" msgid="4831213580709167218">"फोटो म्हणून सामायिक करा"</string>
- <string name="deleted" msgid="2036165115527228127">"हटविला"</string>
+ <string name="share" msgid="8581089487762243115">"शेअर करा"</string>
+ <string name="share_panorama" msgid="3558466186935359444">"पॅनोरामा शेअर करा"</string>
+ <string name="share_as_photo" msgid="4831213580709167218">"फोटो म्हणून शेअर करा"</string>
+ <string name="deleted" msgid="2036165115527228127">"हटवला"</string>
<string name="undo" msgid="5110048345890050107">"पूर्ववत करा"</string>
<string name="details" msgid="4404020741542549488">"तपशील"</string>
<string name="close" msgid="4826166926297479820">"बंद करा"</string>
@@ -62,28 +62,28 @@
<string name="flash_on" msgid="6573457197393807642">"फ्लॅश टाकला"</string>
<string name="flash_off" msgid="7889323512830926273">"फ्लॅश नाही"</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="camera_error_title" msgid="6200558085072670067">"कॅमेरा एरर"</string>
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"कॅमेर्याशी कनेक्ट करु शकत नाही."</string>
<string name="error_camera_disabled" msgid="5582398275657419692">"सुरक्षा धोरणांमुळे कॅमेरा अक्षम केला गेला आहे."</string>
- <string name="error_media_storage_failure" msgid="7711687330673245629">"आपला फोटो किंवा व्हिडिओ जतन करण्यात समस्या आली."</string>
- <string name="error_permissions" msgid="3454167403425651254">"अॅपला चालविण्यासाठी आवश्यक गंभीर परवानग्या नाहीत. कृपया आपल्या परवानग्या सेटिंग्ज तपासा."</string>
+ <string name="error_media_storage_failure" msgid="7711687330673245629">"तुमचा फोटो किंवा व्हिडिओ सेव्ह करण्यात समस्या आली."</string>
+ <string name="error_permissions" msgid="3454167403425651254">"अॅपला चालविण्यासाठी आवश्यक गंभीर परवानग्या नाहीत. कृपया तुमच्या परवानग्या सेटिंग्ज तपासा."</string>
<string name="reason_storage_failure" msgid="6818898304774654969">"फोटो संचयन बिघाड."</string>
<string name="wait" msgid="765601745709933047">"कृपया प्रतीक्षा करा..."</string>
<string name="no_storage" product="default" msgid="5922012950780548098">"कॅमेरा वापरण्यापूर्वी SD कार्ड घाला."</string>
- <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD कार्ड तयार करीत आहे..."</string>
+ <string name="preparing_sd" product="default" msgid="7435693655017362767">"SD कार्ड तयार करत आहे..."</string>
<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="capturing" msgid="5255164204641920893">"कॅप्चर करीत आहे"</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>
<string name="pref_camera_id_entry_front" msgid="6233067010315787044">"समोर"</string>
- <string name="pref_camera_save_location_title" msgid="2344235620113384017">"स्थान जतन करा"</string>
+ <string name="pref_camera_save_location_title" msgid="2344235620113384017">"स्थान सेव्ह करा"</string>
<string name="pref_camera_location_label" msgid="8695441802378057719">"स्थान"</string>
- <string name="pref_camera_timer_title" msgid="4728838281741571323">"उलटगणती टाइमर"</string>
+ <string name="pref_camera_timer_title" msgid="4728838281741571323">"उलटगणती टायमर"</string>
<!-- no translation found for pref_camera_timer_sound_default (6225207881203007747) -->
<skip />
<string name="pref_camera_timer_sound_title" msgid="9036987234878551217">"उलटगणती दरम्यान बीप"</string>
@@ -141,7 +141,7 @@
<string name="pref_camera_scenemode_label_night" msgid="7764371228088101131">"रात्र"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="3443610538453611123">"सूर्यास्त"</string>
<string name="pref_camera_scenemode_label_party" msgid="917499272505930322">"पार्टी"</string>
- <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"टाइमर बंद"</string>
+ <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"टायमर बंद"</string>
<string name="pref_camera_countdown_label_one" msgid="7647972711796868848">"1 सेकंद"</string>
<string name="pref_camera_countdown_label_three" msgid="3154170918067103541">"3 सेकंद"</string>
<string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"10 सेकंद"</string>
@@ -160,16 +160,16 @@
<string name="dialog_cancel" msgid="692365061128351656">"रद्द करा"</string>
<string name="dialog_report" msgid="7616428760369876209">"अहवाल द्या"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"डिसमिस करा"</string>
- <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"आपल्या SD कार्डावरील स्थान समाप्त झाले आहे. गुणवत्ता सेटिंग बदला किंवा काही प्रतिमा किंवा इतर फायली हटवा."</string>
+ <string name="spaceIsLow_content" product="default" msgid="4522771065344332702">"तुमच्या SD कार्डावरील स्थान समाप्त झाले आहे. गुणवत्ता सेटिंग बदला किंवा काही इमेज किंवा इतर फायली हटवा."</string>
<string name="video_reach_size_limit" msgid="9196836111505731836">"आकार मर्यादा गाठली."</string>
<string name="pano_too_fast_prompt" msgid="2503148095578052177">"खूप जलद"</string>
- <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"पॅनोरामा तयार करीत आहे"</string>
- <string name="pano_dialog_panorama_failed" msgid="6772546547048693619">"पॅनोरामा जतन करु शकलो नाही."</string>
+ <string name="pano_dialog_prepare_preview" msgid="4445235163599534263">"पॅनोरामा तयार करत आहे"</string>
+ <string name="pano_dialog_panorama_failed" msgid="6772546547048693619">"पॅनोरामा सेव्ह करु शकलो नाही."</string>
<string name="pano_dialog_title" msgid="6662642763395425145">"पॅनोरामा"</string>
- <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_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="tap_to_focus" msgid="3519718196270593468">"फोकस करण्यासाठी स्पर्श करा."</string>
<string name="pref_video_effect_title" msgid="594570613431209010">"प्रभाव"</string>
<string name="effect_none" msgid="3102797925086872636">"काहीही नाही"</string>
@@ -181,7 +181,7 @@
<string name="effect_goofy_face_small_eyes" msgid="558042211252573238">"लहान डोळे"</string>
<string name="effect_backdropper_space" msgid="9133825395915767627">"अंतराळात"</string>
<string name="effect_backdropper_sunset" msgid="7354053769863638757">"सूर्यास्त"</string>
- <string name="effect_backdropper_gallery" msgid="2333888391153564920">"आपला व्हिडिओ"</string>
+ <string name="effect_backdropper_gallery" msgid="2333888391153564920">"तुमचा व्हिडिओ"</string>
<string name="video_snapshot_hint" msgid="2707403607250082339">"रेकॉर्डिंग करताना फोटो घेण्यासाठी स्पर्श करा."</string>
<string name="video_recording_started" msgid="3374878415050991030">"व्हिडिओ रेकॉर्डिंग सुरू झाले."</string>
<string name="video_recording_stopped" msgid="4658626532857624974">"व्हिडिओ रेकॉर्डिंग थांबविले."</string>
@@ -214,12 +214,12 @@
<string name="panorama_date_content_description" msgid="990703578639006144">"%s रोजी पॅनोरामा घेतला"</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="media_processing_content_description" msgid="8138587719107183754">"मीडिया प्रक्रिया करत आहे"</string>
<string name="accessibility_mode_list_toggle" msgid="4784230103566918645">"मोड सूची टॉगल करा"</string>
<string name="btn_mode_list_toggle" msgid="3986242443098400164">"मोड सूची"</string>
<string name="accessibility_filmstrip_toggle" msgid="6966978483643396442">"फिल्मस्ट्रीप टॉगल करा"</string>
<string name="btn_filmstrip_toggle" msgid="3666693972882351490">"फिल्मस्ट्रीप"</string>
- <string name="accessibility_mode_zoom_plus" msgid="4967389173992713073">"झूम वाढवा"</string>
+ <string name="accessibility_mode_zoom_plus" msgid="4967389173992713073">"झूम इन करा"</string>
<string name="btn_zoom_plus" msgid="4645138949375961656">"Z+"</string>
<string name="accessibility_mode_zoom_minus" msgid="8850636036927992409">"झूम कमी करा"</string>
<string name="btn_zoom_minus" msgid="5436240345362098272">"Z-"</string>
@@ -276,18 +276,18 @@
<string name="set_duration" msgid="1638453882581604341">"कालावधी सेकंदांमध्ये सेट करा"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"फोटो घेण्यासाठी उलट गणना करत आहे"</string>
<string name="remember_location_title" msgid="3045040613094030429">"फोटो स्थान लक्षात ठेवायचे?"</string>
- <string name="remember_location_prompt" msgid="3006013504489919474">"आपले फोटो आणि व्हिडिओ जिथून घेतले त्या स्थानांसह ते टॅग करा."</string>
- <string name="remember_location_no" msgid="4412802756840226925">"नाही धन्यवाद"</string>
+ <string name="remember_location_prompt" msgid="3006013504489919474">"तुमचे फोटो आणि व्हिडिओ जिथून घेतले त्या स्थानांसह ते टॅग करा."</string>
+ <string name="remember_location_no" msgid="4412802756840226925">"नाही, नको"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"होय"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"अधिक पर्याय"</string>
<string name="camera_menu_settings_label" msgid="3862756725328016822">"सेटिंग्ज"</string>
<string name="create_tiny_planet" msgid="5186918191372107343">"लहान ग्रह तयार करा"</string>
- <string name="saving_tiny_planet" msgid="8828265180177375494">"लहान प्लॅनेट जतन करत आहे …"</string>
+ <string name="saving_tiny_planet" msgid="8828265180177375494">"लहान प्लॅनेट सेव्ह करत आहे …"</string>
<string name="tiny_planet_zoom" msgid="2985522360577158474">"झूम करा"</string>
<string name="tiny_planet_rotate" msgid="5445336705705350004">"चक्राकृती फिरवा"</string>
<string name="photo_editor" msgid="1521994560971367225">"फोटो संपादक"</string>
- <string name="crop_save" msgid="2841974981340098579">"जतन करा"</string>
- <string name="cannot_load_image" msgid="4100136187076585580">"प्रतिमा लोड करु शकत नाही!"</string>
+ <string name="crop_save" msgid="2841974981340098579">"सेव्ह करा"</string>
+ <string name="cannot_load_image" msgid="4100136187076585580">"इमेज लोड करु शकत नाही!"</string>
<string name="switch_photo_filmstrip" msgid="1448511001008888767">"फिल्मस्ट्रीप दृश्य"</string>
<string name="setting_wallpaper" msgid="2397759659347872725">"वॉलपेपर सेट करत आहे"</string>
<string name="mode_settings" msgid="2021937261522670921">"सेटिंग्ज"</string>
@@ -329,7 +329,7 @@
<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>
+ <string name="share_button_description" msgid="5108508790540832053">"शेअर करा"</string>
<string name="view_button_description" msgid="4985768837891362075">"पहा"</string>
<string name="edit_button_description" msgid="98550816724901925">"संपादित करा"</string>
<string name="delete_button_description" msgid="2251065309677200911">"हटवा"</string>
@@ -369,8 +369,8 @@
<string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"व्यक्तिचलित प्रदर्शन"</string>
<string name="settings_cling_text" msgid="5368054627268181292">"सेटिंग्ज मध्ये, रिझॉल्यूशन आणि गुणवत्ता बदला किंवा प्रगत वैशिष्ट्ये वापरून पहा."</string>
<string name="photo_size_selection_title" msgid="2789753590719172645">"फोटो आकार निवडा"</string>
- <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"आपण हे नंतर सेटिंग्ज मध्ये बदलू शकता."</string>
- <string name="share_to" msgid="5144911209144798122">"यावर सामायिक करा"</string>
+ <string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"तुम्ही हे नंतर सेटिंग्ज मध्ये बदलू शकता."</string>
+ <string name="share_to" msgid="5144911209144798122">"यावर शेअर करा"</string>
<string name="edit_with" msgid="615569327230783971">"सह संपादित करा"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"पुढील"</string>
<string name="confirm_button_text" msgid="7389949384482206814">"ठीक आहे, समजले"</string>
@@ -378,5 +378,5 @@
<string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"क्रॉप केलेला सेन्सर \n(16:9)"</string>
<string name="pref_boolean_false" msgid="461317129020087333">"0"</string>
<string name="pref_boolean_true" msgid="4131945223998878009">"1"</string>
- <string name="session_saving_image" msgid="8932315404486416826">"जतन करत आहे..."</string>
+ <string name="session_saving_image" msgid="8932315404486416826">"सेव्ह करत आहे..."</string>
</resources>
diff --git a/res/values-ms-rMY/strings.xml b/res/values-ms/strings.xml
similarity index 100%
rename from res/values-ms-rMY/strings.xml
rename to res/values-ms/strings.xml
diff --git a/res/values-my-rMM/strings.xml b/res/values-my/strings.xml
similarity index 99%
rename from res/values-my-rMM/strings.xml
rename to res/values-my/strings.xml
index 681de9f..9406b2b 100644
--- a/res/values-my-rMM/strings.xml
+++ b/res/values-my/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">"OK"</string>
<string name="dialog_cancel" msgid="692365061128351656">"မလုပ်တော့"</string>
<string name="dialog_report" msgid="7616428760369876209">"သတင်းပို့ပါ"</string>
<string name="dialog_dismiss" msgid="1382550604990470119">"ပယ်ရန်"</string>
@@ -364,7 +364,7 @@
<string name="pref_video_quality_entry_2160p" msgid="4522927631413184505">"UHD 4K"</string>
<string name="setting_summary_x_megapixels" msgid="6533463462760866830">"%1$s မီဂါပစ်ဇယ်"</string>
<string name="setting_summary_aspect_ratio_and_megapixels" msgid="5828440902461064821">"(%1$d:%2$d) %3$s မီဂါပစ်ဇယ်"</string>
- <string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"ဆုံချက် ပြန်ညှိရန် ဒီမှာ ထိပါ"</string>
+ <string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"ဆုံချက် ပြင်ဆင်သတ်မှတ်ရန် ဒီမှာ ထိပါ"</string>
<string name="pref_category_advanced" msgid="5921085080077574872">"အဆင့်မြင့်"</string>
<string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"လက်ဖြင့် အလင်းပေး"</string>
<string name="settings_cling_text" msgid="5368054627268181292">"ဆက်တင် ထဲမှာ၊ ပြတ်သားမှု နှင့် အရည်အသွေးကို ပြောင်းပါ၊ သို့မဟုတ် အဆင့်မြင့် အင်္ဂါရပ်များကို စမ်းကြည့်ပါ။"</string>
@@ -373,9 +373,9 @@
<string name="share_to" msgid="5144911209144798122">"...အား မျှဝေရန်"</string>
<string name="edit_with" msgid="615569327230783971">"...နှင့် တည်းဖြတ်ရန်"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"ရှေ့သို့"</string>
- <string name="confirm_button_text" msgid="7389949384482206814">"အိုကေ၊ ရပါပြီ"</string>
- <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"အာရုံခံပုံ အပြည့် \n(4:3)"</string>
- <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"အာရုံခံကိရိယာမှ ဖြတ်ထား\n(16:9)"</string>
+ <string name="confirm_button_text" msgid="7389949384482206814">"OK၊ ရပါပြီ"</string>
+ <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"အာရုံခံပုံ အပြည့် \n(၄x၃)"</string>
+ <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"အာရုံခံကိရိယာမှ ဖြတ်ထား\n(၁၆x၉)"</string>
<string name="pref_boolean_false" msgid="461317129020087333">"၀"</string>
<string name="pref_boolean_true" msgid="4131945223998878009">"၁"</string>
<string name="session_saving_image" msgid="8932315404486416826">"သိမ်းနေစဉ်…"</string>
diff --git a/res/values-ne-rNP/strings.xml b/res/values-ne/strings.xml
similarity index 98%
rename from res/values-ne-rNP/strings.xml
rename to res/values-ne/strings.xml
index 2028a69..c2c4aca 100644
--- a/res/values-ne-rNP/strings.xml
+++ b/res/values-ne/strings.xml
@@ -68,7 +68,7 @@
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"क्यामेरासँग जडान गर्न सक्दैन।"</string>
<string name="error_camera_disabled" msgid="5582398275657419692">"सुरक्षा नीतिहरूका कारण क्यामरा निष्क्रिय गरिएको छ।"</string>
<string name="error_media_storage_failure" msgid="7711687330673245629">"तपाईँको तस्बिर वा भिडियो सुरक्षित गर्दा एउटा समस्या भयो।"</string>
- <string name="error_permissions" msgid="3454167403425651254">"सञ्चालन गर्नका लागि अनुप्रयोगसँग अति आवश्यकता अनुमति छैन। कृपया तपाईँको अनुमति सेटिङहरू जाँच गर्नुहोस्।"</string>
+ <string name="error_permissions" msgid="3454167403425651254">"सञ्चालन गर्नाका लागि अनुप्रयोगसँग अति आवश्यकता अनुमति छैन। कृपया तपाईँको अनुमति सेटिङहरू जाँच गर्नुहोस्।"</string>
<string name="reason_storage_failure" msgid="6818898304774654969">"तस्बिर भण्डारण विफलता।"</string>
<string name="wait" msgid="765601745709933047">"कृपया प्रतीक्षा गर्नुहोस्..."</string>
<string name="no_storage" product="default" msgid="5922012950780548098">"क्यामेराको उपयोग गर्नु अघि एउटा SD कार्ड भित्र राख्नुहोस्।"</string>
@@ -156,7 +156,7 @@
<string name="pref_camera_hdr_label" msgid="1918040375414771185">"HDR"</string>
<string name="pref_camera_id_label_back" msgid="1645608049757733858">"FRONT CAMERA"</string>
<string name="pref_camera_id_label_front" msgid="349308803062874842">"BACK CAMERA"</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>
@@ -377,7 +377,7 @@
<string name="share_to" msgid="5144911209144798122">"साझेदारी गर्नुहोस्"</string>
<string name="edit_with" msgid="615569327230783971">"संग सम्पादन गर्नुहोस्"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"NEXT"</string>
- <string name="confirm_button_text" msgid="7389949384482206814">"ठीक छ, बुझे"</string>
+ <string name="confirm_button_text" msgid="7389949384482206814">"ठिक छ, बुझे"</string>
<string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"पूर्ण सेन्सरर \n(४:३)"</string>
<string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"क्रप गरिएको सेन्सर \n(१६:९)"</string>
<string name="pref_boolean_false" msgid="461317129020087333">"०"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 704ac6f..b12090c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -173,7 +173,7 @@
<string name="tap_to_focus" msgid="3519718196270593468">"Raak aan voor scherpstellen."</string>
<string name="pref_video_effect_title" msgid="594570613431209010">"Effecten"</string>
<string name="effect_none" msgid="3102797925086872636">"Geen"</string>
- <string name="effect_goofy_face_squeeze" msgid="1362021544829311452">"Samendrukken"</string>
+ <string name="effect_goofy_face_squeeze" msgid="1362021544829311452">"Knijpen"</string>
<string name="effect_goofy_face_big_eyes" msgid="9220121522816762649">"Grote ogen"</string>
<string name="effect_goofy_face_big_mouth" msgid="2064008284599552683">"Grote mond"</string>
<string name="effect_goofy_face_small_mouth" msgid="3105849596912069261">"Kleine mond"</string>
@@ -346,7 +346,7 @@
<string name="setting_front_camera_photo" msgid="4131886734622868637">"Fotocamera voorzijde"</string>
<string name="setting_front_camera_video" msgid="2178799452805359752">"Videocamera voorzijde"</string>
<string name="setting_default_camera" msgid="6954076799301004779">"Standaardcamera"</string>
- <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Help en feedback"</string>
+ <string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Hulp en feedback"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ verwerken…"</string>
<string name="open_source_licenses" msgid="2169711954264883060">"Open-sourcelicenties"</string>
<string name="pref_category_general" msgid="6737748849700581019">"Algemene instellingen"</string>
diff --git a/res/values-pa-rIN/strings.xml b/res/values-pa/strings.xml
similarity index 99%
rename from res/values-pa-rIN/strings.xml
rename to res/values-pa/strings.xml
index 7fe27d0..704a744 100644
--- a/res/values-pa-rIN/strings.xml
+++ b/res/values-pa/strings.xml
@@ -62,7 +62,7 @@
<string name="flash_on" msgid="6573457197393807642">"ਫਲੈਸ਼ ਫਾਇਰਡ"</string>
<string name="flash_off" msgid="7889323512830926273">"ਕੋਈ ਫਲੈਸ਼ ਨਹੀਂ"</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>
@@ -207,7 +207,7 @@
<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="accessibility_unlock_to_camera" msgid="1251880974313179442">"ਕੈਮਰੇ ਲਈ ਅਨਲੌਕ ਕਰੋ"</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>
<string name="video_date_content_description" msgid="2151884014634284456">"ਵੀਡੀਓ %s ਨੂੰ ਲਿਆ ਗਿਆ"</string>
@@ -345,7 +345,7 @@
<string name="setting_back_camera_video" msgid="5220819479408164689">"ਬੈਕ ਕੈਮਰਾ ਵੀਡੀਓ"</string>
<string name="setting_front_camera_photo" msgid="4131886734622868637">"ਫ੍ਰੰਟ ਕੈਮਰਾ ਫ਼ੋਟੋ"</string>
<string name="setting_front_camera_video" msgid="2178799452805359752">"ਫ੍ਰੰਟ ਕੈਮਰਾ ਵੀਡੀਓ"</string>
- <string name="setting_default_camera" msgid="6954076799301004779">"ਡਿਫੌਲਟ ਕੈਮਰਾ"</string>
+ <string name="setting_default_camera" msgid="6954076799301004779">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਕੈਮਰਾ"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"ਮਦਦ & ਫੀਡਬੈਕ"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"HDR+ ਦੀ ਪ੍ਰਕਿਰਿਆ ਕਰ ਰਿਹਾ ਹੈ …"</string>
<string name="open_source_licenses" msgid="2169711954264883060">"ਓਪਨ ਸਰੋਤ ਲਾਇਸੰਸ"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 62cabc2..ce6d617 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -24,7 +24,7 @@
<string name="delete" msgid="2714492172818940424">"Eliminar"</string>
<string name="share" msgid="8581089487762243115">"Partilhar"</string>
<string name="share_panorama" msgid="3558466186935359444">"Partilhar panorama"</string>
- <string name="share_as_photo" msgid="4831213580709167218">"Partilhar como fotografia"</string>
+ <string name="share_as_photo" msgid="4831213580709167218">"Partilhar como foto"</string>
<string name="deleted" msgid="2036165115527228127">"Eliminada"</string>
<string name="undo" msgid="5110048345890050107">"ANULAR"</string>
<string name="details" msgid="4404020741542549488">"Detalhes"</string>
@@ -67,16 +67,16 @@
<string name="camera_error_title" msgid="6200558085072670067">"Erro da câmara"</string>
<string name="error_cannot_connect_camera" msgid="2713059773224193128">"Não é possível ligar à câmara."</string>
<string name="error_camera_disabled" msgid="5582398275657419692">"Devido às políticas de segurança, a câmara foi desativada."</string>
- <string name="error_media_storage_failure" msgid="7711687330673245629">"Ocorreu um problema ao guardar a fotografia ou o vídeo."</string>
+ <string name="error_media_storage_failure" msgid="7711687330673245629">"Ocorreu um problema ao guardar a foto ou o vídeo."</string>
<string name="error_permissions" msgid="3454167403425651254">"A aplicação não tem autorizações críticas que são necessárias para ser executada. Verifique as definições das autorizações."</string>
- <string name="reason_storage_failure" msgid="6818898304774654969">"Falha no armazenamento da fotografia."</string>
+ <string name="reason_storage_failure" msgid="6818898304774654969">"Falha no armazenamento da foto."</string>
<string name="wait" msgid="765601745709933047">"Aguarde..."</string>
<string name="no_storage" product="default" msgid="5922012950780548098">"Insira um cartão SD antes de utilizar a câmara."</string>
<string name="preparing_sd" product="default" msgid="7435693655017362767">"A preparar cartão SD..."</string>
<string name="access_sd_fail" product="default" msgid="2634861611082499811">"Não foi possível aceder ao cartão SD."</string>
<string name="time_lapse_title" msgid="3267978566401228497">"Gravação com intervalo de tempo"</string>
<string name="feedback_description_camera_access" msgid="419090951070170132">"Não foi possível ligar a aplicação à câmara"</string>
- <string name="feedback_description_save_photo" msgid="8658767358989083228">"A fotografia ou o vídeo não foi guardado no dispositivo."</string>
+ <string name="feedback_description_save_photo" msgid="8658767358989083228">"A foto ou o vídeo não foi guardado no dispositivo."</string>
<string name="capturing" msgid="5255164204641920893">"A capturar"</string>
<string name="pref_camera_id_title" msgid="4680648115225411185">"Escolher câmara"</string>
<string name="pref_camera_id_entry_back" msgid="6386943973628160510">"Anterior"</string>
@@ -182,7 +182,7 @@
<string name="effect_backdropper_space" msgid="9133825395915767627">"No espaço"</string>
<string name="effect_backdropper_sunset" msgid="7354053769863638757">"Pôr do sol"</string>
<string name="effect_backdropper_gallery" msgid="2333888391153564920">"O seu vídeo"</string>
- <string name="video_snapshot_hint" msgid="2707403607250082339">"Toque para tirar uma fotografia durante a gravação."</string>
+ <string name="video_snapshot_hint" msgid="2707403607250082339">"Toque para tirar uma foto durante a gravação."</string>
<string name="video_recording_started" msgid="3374878415050991030">"A gravação de vídeo foi iniciada."</string>
<string name="video_recording_stopped" msgid="4658626532857624974">"A gravação de vídeo foi interrompida."</string>
<string name="clear_effects" msgid="6192797848995967992">"Limpar efeitos"</string>
@@ -192,7 +192,7 @@
<string name="accessibility_cancel_button" msgid="5679989494636116448">"Cancelar"</string>
<string name="accessibility_menu_button" msgid="7692103503958544723">"Botão do menu"</string>
<string name="accessibility_check_box" msgid="1084094675439953723">"Caixa de verificação %1$s"</string>
- <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"Mudar para fotografia"</string>
+ <string name="accessibility_switch_to_camera" msgid="4518394037216725274">"Mudar para foto"</string>
<string name="accessibility_switch_to_video" msgid="8174781871592793967">"Mudar para vídeo"</string>
<string name="accessibility_switch_to_panorama" msgid="8322228859117808037">"Mudar para panorama"</string>
<string name="accessibility_switch_to_photo_sphere" msgid="5803217570370854725">"Mudar para Photo Sphere"</string>
@@ -276,7 +276,7 @@
<string name="set_time_interval" msgid="2531393962847535331">"Definir intervalo de tempo"</string>
<string name="set_time_interval_help" msgid="64145154088021389">"A funcionalidade de intervalo de tempo está desativada. Ative-a para definir o intervalo de tempo."</string>
<string name="set_duration" msgid="1638453882581604341">"Definir a duração em segundos"</string>
- <string name="count_down_title_text" msgid="7586031110595513050">"Contagem decrescente para tirar uma fotografia"</string>
+ <string name="count_down_title_text" msgid="7586031110595513050">"Contagem decrescente para tirar uma foto"</string>
<string name="remember_location_title" msgid="3045040613094030429">"Memorizar localizações das fotos?"</string>
<string name="remember_location_prompt" msgid="3006013504489919474">"Adicione etiquetas às fotos e aos vídeos com as localizações onde foram capturados."</string>
<string name="remember_location_no" msgid="4412802756840226925">"Não, obrigado"</string>
@@ -370,7 +370,7 @@
<string name="pref_category_advanced" msgid="5921085080077574872">"Avançadas"</string>
<string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"Exposição manual"</string>
<string name="settings_cling_text" msgid="5368054627268181292">"Em Definições, altere a resolução e a qualidade ou experimente as funcionalidades avançadas."</string>
- <string name="photo_size_selection_title" msgid="2789753590719172645">"Escolha o tamanho da fotografia"</string>
+ <string name="photo_size_selection_title" msgid="2789753590719172645">"Escolha o tamanho da foto"</string>
<string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"Pode alterar esta opção mais tarde em Definições."</string>
<string name="share_to" msgid="5144911209144798122">"Partilhar com"</string>
<string name="edit_with" msgid="615569327230783971">"Editar com"</string>
diff --git a/res/values-si-rLK/strings.xml b/res/values-si/strings.xml
similarity index 100%
rename from res/values-si-rLK/strings.xml
rename to res/values-si/strings.xml
diff --git a/res/values-sq-rAL/strings.xml b/res/values-sq/strings.xml
similarity index 100%
rename from res/values-sq-rAL/strings.xml
rename to res/values-sq/strings.xml
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 305df12..de1a154 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -297,7 +297,7 @@
<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_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>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 99521cf..3dfd5fa 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -347,7 +347,7 @@
<string name="setting_back_camera_video" msgid="5220819479408164689">"Video ya kamera ya nyuma"</string>
<string name="setting_front_camera_photo" msgid="4131886734622868637">"Picha ya kamera ya mbele"</string>
<string name="setting_front_camera_video" msgid="2178799452805359752">"Video ya kamera ya mbele"</string>
- <string name="setting_default_camera" msgid="6954076799301004779">"Kamera ya chaguo-msingi"</string>
+ <string name="setting_default_camera" msgid="6954076799301004779">"Kamera ya chaguomsingi"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"Usaidizi na maoni"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"Inachakata HDR+ ..."</string>
<string name="open_source_licenses" msgid="2169711954264883060">"Leseni za programu huria"</string>
@@ -376,8 +376,8 @@
<string name="edit_with" msgid="615569327230783971">"Badilisha kwa"</string>
<string name="startup_dialog_button_next" msgid="1011831256978228993">"INAYOFUATA"</string>
<string name="confirm_button_text" msgid="7389949384482206814">"SAWA, NIMEELEWA"</string>
- <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"Kihisi kamili \n(4:03)"</string>
- <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"Kihisi kilichopunguzwa \n(16:09)"</string>
+ <string name="full_sensor_4x3_aspect_ratio" msgid="1270461419743888925">"Kitambuzi kamili \n(4:03)"</string>
+ <string name="cropped_sensor_16x9_aspect_ratio" msgid="4742161537633251795">"Kitambuzi kilichopunguzwa \n(16:09)"</string>
<string name="pref_boolean_false" msgid="461317129020087333">"0"</string>
<string name="pref_boolean_true" msgid="4131945223998878009">"1"</string>
<string name="session_saving_image" msgid="8932315404486416826">"Inahifadhiwa…"</string>
diff --git a/res/values-ta-rIN/strings.xml b/res/values-ta/strings.xml
similarity index 100%
rename from res/values-ta-rIN/strings.xml
rename to res/values-ta/strings.xml
diff --git a/res/values-te-rIN/strings.xml b/res/values-te/strings.xml
similarity index 100%
rename from res/values-te-rIN/strings.xml
rename to res/values-te/strings.xml
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 9f9d880..ce21f9e 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -272,7 +272,7 @@
<string name="time_lapse_hours" msgid="5294001144133261436">"ชั่วโมง"</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_time_interval_help" msgid="64145154088021389">"ฟีเจอร์ช่วงเวลาปิดอยู่ เปิดฟีเจอร์นี้เพื่อตั้งค่าช่วงเวลา"</string>
<string name="set_duration" msgid="1638453882581604341">"ตั้งระยะเวลาเป็นวินาที"</string>
<string name="count_down_title_text" msgid="7586031110595513050">"นับถอยหลังเพื่อถ่ายภาพ"</string>
<string name="remember_location_title" msgid="3045040613094030429">"จดจำตำแหน่งภาพไหม"</string>
@@ -348,7 +348,7 @@
<string name="setting_default_camera" msgid="6954076799301004779">"กล้องถ่ายรูปเริ่มต้น"</string>
<string name="setting_google_help_and_feedback" msgid="2079580537079242775">"ความช่วยเหลือและความเห็น"</string>
<string name="processing_hdr_plus" msgid="9160093263037540304">"กำลังดำเนินการ HDR+ …"</string>
- <string name="open_source_licenses" msgid="2169711954264883060">"สัญญาอนุญาตสำหรับโอเพนซอร์ส"</string>
+ <string name="open_source_licenses" msgid="2169711954264883060">"ใบอนุญาตโอเพนซอร์ส"</string>
<string name="pref_category_general" msgid="6737748849700581019">"การตั้งค่าทั่วไป"</string>
<string name="pref_category_resolution_quality" msgid="6641462402321962896">"ความละเอียดและคุณภาพ"</string>
<string name="pref_category_about" msgid="1966255405679342337">"เกี่ยวกับ"</string>
@@ -367,7 +367,7 @@
<string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"แตะที่นี่ เพื่อปรับโฟกัส"</string>
<string name="pref_category_advanced" msgid="5921085080077574872">"ขั้นสูง"</string>
<string name="pref_camera_exposure_compensation" msgid="4143245817259719147">"การรับแสงแบบปรับเอง"</string>
- <string name="settings_cling_text" msgid="5368054627268181292">"ใน \"การตั้งค่า\" ให้เปลี่ยนความละเอียดและคุณภาพ หรือลองใช้คุณลักษณะขั้นสูง"</string>
+ <string name="settings_cling_text" msgid="5368054627268181292">"ใน \"การตั้งค่า\" ให้เปลี่ยนความละเอียดและคุณภาพ หรือลองใช้ฟีเจอร์ขั้นสูง"</string>
<string name="photo_size_selection_title" msgid="2789753590719172645">"เลือกขนาดรูปภาพ"</string>
<string name="photo_aspect_ratio_selection_content" msgid="6668224437962196229">"คุณสามารถเปลี่ยนค่านี้ได้ภายหลัง ใน \"การตั้งค่า\""</string>
<string name="share_to" msgid="5144911209144798122">"แชร์ไปยัง"</string>
diff --git a/res/values-ur-rPK/strings.xml b/res/values-ur/strings.xml
similarity index 100%
rename from res/values-ur-rPK/strings.xml
rename to res/values-ur/strings.xml
diff --git a/res/values-uz-rUZ/strings.xml b/res/values-uz/strings.xml
similarity index 98%
rename from res/values-uz-rUZ/strings.xml
rename to res/values-uz/strings.xml
index b31a2e9..828edb1 100644
--- a/res/values-uz-rUZ/strings.xml
+++ b/res/values-uz/strings.xml
@@ -111,7 +111,7 @@
<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>
+ <string name="pref_camera_flashmode_label_off" msgid="7175863901446001441">"CHAQNOQ YOQILMAGAN"</string>
<string name="pref_camera_whitebalance_title" msgid="7962809566612868179">"Oq rang muvozanati"</string>
<string name="pref_camera_whitebalance_label" msgid="7370366644738746700">"OQ RANG MUVOZANATI"</string>
<string name="pref_camera_whitebalance_entry_auto" msgid="1390631794449502796">"Avto"</string>
@@ -129,9 +129,9 @@
<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+ YONIQ"</string>
- <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ O‘CHIQ"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_plus_off" msgid="2668770361856397834">"HDR+ YOQILMAGAN"</string>
<string name="pref_camera_scenemode_entry_turn_hdr_on" msgid="5232394324298489502">"HDR YONIQ"</string>
- <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR O‘CHIQ"</string>
+ <string name="pref_camera_scenemode_entry_turn_hdr_off" msgid="7694606461440250206">"HDR YOQILMAGAN"</string>
<string name="pref_camera_scenemode_entry_action" msgid="5753183620959062015">"Harakat"</string>
<string name="pref_camera_scenemode_entry_night" msgid="3468037364159759991">"Tunda"</string>
<string name="pref_camera_scenemode_entry_sunset" msgid="5884302914893488509">"Quyosh botishi"</string>
@@ -141,7 +141,7 @@
<string name="pref_camera_scenemode_label_night" msgid="7764371228088101131">"TUN"</string>
<string name="pref_camera_scenemode_label_sunset" msgid="3443610538453611123">"QUYOSH BOTISHI"</string>
<string name="pref_camera_scenemode_label_party" msgid="917499272505930322">"BAZM KECHASI"</string>
- <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"TAYMER O‘CHIQ"</string>
+ <string name="pref_camera_countdown_label_off" msgid="3986433580620011481">"TAYMER YOQILMAGAN"</string>
<string name="pref_camera_countdown_label_one" msgid="7647972711796868848">"1 SONIYA"</string>
<string name="pref_camera_countdown_label_three" msgid="3154170918067103541">"3 SONIYA"</string>
<string name="pref_camera_countdown_label_ten" msgid="4372650985906500604">"10 SONIYA"</string>
@@ -225,7 +225,7 @@
<string name="btn_zoom_minus" msgid="5436240345362098272">"Z-"</string>
<string name="accessibility_zoom_announcement" msgid="6976673411698319811">"Miqyos qiymati – %.1f"</string>
<string name="capital_on" msgid="1118214824959797269">"YONIQ"</string>
- <string name="capital_off" msgid="3020696135020167263">"O‘CHIQ"</string>
+ <string name="capital_off" msgid="3020696135020167263">"YOQILMAGAN"</string>
<string name="video_control_play" msgid="6895236811408921715">"Videoni ijro etish"</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>
@@ -277,7 +277,7 @@
<string name="count_down_title_text" msgid="7586031110595513050">"Rasm suratga olish uchun ortga sanalmoqda"</string>
<string name="remember_location_title" msgid="3045040613094030429">"Suratga olish joyi saqlansinmi?"</string>
<string name="remember_location_prompt" msgid="3006013504489919474">"Rasm va videolaringizga suratga olish joyi haqidagi ma’lumotni qo‘shing."</string>
- <string name="remember_location_no" msgid="4412802756840226925">"Yo‘q, kerak emas"</string>
+ <string name="remember_location_no" msgid="4412802756840226925">"Kerak emas"</string>
<string name="remember_location_yes" msgid="4339424460683531388">"Ha"</string>
<string name="camera_menu_more_label" msgid="7951917844735828365">"QO‘SHIMCHA MOSLAMALAR"</string>
<string name="camera_menu_settings_label" msgid="3862756725328016822">"Sozlamalar"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index ab3a655..39b2e7e 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -283,7 +283,7 @@
<string name="camera_menu_settings_label" msgid="3862756725328016822">"设置"</string>
<string name="create_tiny_planet" msgid="5186918191372107343">"创建小星球图片"</string>
<string name="saving_tiny_planet" msgid="8828265180177375494">"正在保存小星球图片…"</string>
- <string name="tiny_planet_zoom" msgid="2985522360577158474">"缩放"</string>
+ <string name="tiny_planet_zoom" msgid="2985522360577158474">"变焦"</string>
<string name="tiny_planet_rotate" msgid="5445336705705350004">"旋转"</string>
<string name="photo_editor" msgid="1521994560971367225">"照片编辑器"</string>
<string name="crop_save" msgid="2841974981340098579">"保存"</string>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b9735d9..3f0ea51 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -77,4 +77,5 @@
<color name="mode_icon_hover_highlight">#2DFFFFFF</color>
<color name="blue_button_text_color">#00838F</color>
+ <color name="ic_launcher_background">#4285f4</color>
</resources>
diff --git a/res_p/mipmap-anydpi/logo_camera_color.xml b/res_p/mipmap-anydpi/logo_camera_color.xml
new file mode 100644
index 0000000..f9cf273
--- /dev/null
+++ b/res_p/mipmap-anydpi/logo_camera_color.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2012 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@color/ic_launcher_background"/>
+ <foreground android:drawable="@mipmap/logo_camera_color_foreground"/>
+</adaptive-icon>
diff --git a/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 1ac6b58..0000000
--- a/res_p/mipmap-hdpi/logo_camera_color_44in48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/mipmap-hdpi/logo_camera_color_foreground.png b/res_p/mipmap-hdpi/logo_camera_color_foreground.png
new file mode 100644
index 0000000..c172419
--- /dev/null
+++ b/res_p/mipmap-hdpi/logo_camera_color_foreground.png
Binary files differ
diff --git a/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 3868f15..0000000
--- a/res_p/mipmap-mdpi/logo_camera_color_44in48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/mipmap-mdpi/logo_camera_color_foreground.png b/res_p/mipmap-mdpi/logo_camera_color_foreground.png
new file mode 100644
index 0000000..aaad2a9
--- /dev/null
+++ b/res_p/mipmap-mdpi/logo_camera_color_foreground.png
Binary files differ
diff --git a/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 7593dc3..0000000
--- a/res_p/mipmap-xhdpi/logo_camera_color_44in48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/mipmap-xhdpi/logo_camera_color_foreground.png b/res_p/mipmap-xhdpi/logo_camera_color_foreground.png
new file mode 100644
index 0000000..8046dbf
--- /dev/null
+++ b/res_p/mipmap-xhdpi/logo_camera_color_foreground.png
Binary files differ
diff --git a/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index a989efe..0000000
--- a/res_p/mipmap-xxhdpi/logo_camera_color_44in48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/mipmap-xxhdpi/logo_camera_color_foreground.png b/res_p/mipmap-xxhdpi/logo_camera_color_foreground.png
new file mode 100644
index 0000000..d517b97
--- /dev/null
+++ b/res_p/mipmap-xxhdpi/logo_camera_color_foreground.png
Binary files differ
diff --git a/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png b/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
deleted file mode 100644
index 9264c34..0000000
--- a/res_p/mipmap-xxxhdpi/logo_camera_color_44in48dp.png
+++ /dev/null
Binary files differ
diff --git a/res_p/mipmap-xxxhdpi/logo_camera_color_foreground.png b/res_p/mipmap-xxxhdpi/logo_camera_color_foreground.png
new file mode 100644
index 0000000..fad721f
--- /dev/null
+++ b/res_p/mipmap-xxxhdpi/logo_camera_color_foreground.png
Binary files differ
diff --git a/src/com/android/camera/AccessibilityUtil.java b/src/com/android/camera/AccessibilityUtil.java
index 155a149..3b4c8f5 100644
--- a/src/com/android/camera/AccessibilityUtil.java
+++ b/src/com/android/camera/AccessibilityUtil.java
@@ -2,7 +2,7 @@
import android.accessibilityservice.AccessibilityServiceInfo;
import android.content.Context;
-import android.support.v4.view.accessibility.AccessibilityManagerCompat;
+import androidx.core.view.accessibility.AccessibilityManagerCompat;
import android.view.View;
import android.view.accessibility.AccessibilityManager;
import android.widget.Button;
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index bf48898..8efc25f 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -29,6 +29,7 @@
import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.ActivityInfo;
+import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.Bitmap;
@@ -158,6 +159,7 @@
import com.bumptech.glide.MemoryCategory;
import com.bumptech.glide.load.DecodeFormat;
import com.bumptech.glide.load.engine.executor.FifoPriorityThreadPoolExecutor;
+import com.android.camera.exif.ExifInterface;
import com.google.common.base.Optional;
import com.google.common.logging.eventprotos;
@@ -192,9 +194,6 @@
private static final long SCREEN_DELAY_MS = 2 * 60 * 1000; // 2 mins.
/** Load metadata for 10 items ahead of our current. */
private static final int FILMSTRIP_PRELOAD_AHEAD_ITEMS = 10;
- private static final int PERMISSIONS_ACTIVITY_REQUEST_CODE = 1;
- private static final int PERMISSIONS_RESULT_CODE_OK = 1;
- private static final int PERMISSIONS_RESULT_CODE_FAILED = 2;
/** Should be used wherever a context is needed. */
private Context mAppContext;
@@ -848,6 +847,7 @@
messageId > 0 ? getString(messageId) : "");
}
+ // Candidate for deletion as Android Beam is deprecated in Android Q
private void setupNfcBeamPush() {
NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mAppContext);
if (adapter == null) {
@@ -1335,7 +1335,7 @@
private void removeItemAt(int index) {
mDataAdapter.removeAt(index);
- if (mDataAdapter.getTotalNumber() > 1) {
+ if (mDataAdapter.getTotalNumber() > 0) {
showUndoDeletionBar();
} else {
// If camera preview is the only view left in filmstrip,
@@ -1433,7 +1433,7 @@
mOnCreateTime = System.currentTimeMillis();
mAppContext = getApplicationContext();
mMainHandler = new MainHandler(this, getMainLooper());
- mLocationManager = new LocationManager(mAppContext);
+ mLocationManager = new LocationManager(mAppContext, shouldUseNoOpLocation());
mOrientationManager = new OrientationManagerImpl(this, mMainHandler);
mSettingsManager = getServices().getSettingsManager();
mSoundPlayer = new SoundPlayer(mAppContext);
@@ -1503,7 +1503,9 @@
// version.
profile.mark();
try {
- (new PictureSizeLoader(mAppContext)).computePictureSizes();
+ PictureSizeLoader pictureSizeLoader = new PictureSizeLoader(mAppContext);
+ pictureSizeLoader.computePictureSizes();
+ pictureSizeLoader.release();
} catch (AssertionError e) {
Log.e(TAG, "Creating camera controller failed.", e);
mFatalErrorHandler.onGenericCameraAccessFailure();
@@ -1629,6 +1631,7 @@
preloadFilmstripItems();
+ // Candidate for deletion as Android Beam is deprecated in Android Q
setupNfcBeamPush();
mLocalImagesObserver = new FilmstripContentObserver();
@@ -1655,7 +1658,7 @@
mMotionManager = getServices().getMotionManager();
mFirstRunDialog = new FirstRunDialog(this,
- getAndroidContext(),
+ this /* as context */,
mResolutionSetting,
mSettingsManager,
mOneCameraManager,
@@ -1729,6 +1732,35 @@
}
/**
+ * Incase the calling package doesn't have ACCESS_FINE_LOCATION permissions, we should not pass
+ * it valid location information in exif.
+ */
+ private boolean shouldUseNoOpLocation () {
+ String callingPackage = getCallingPackage();
+ if (callingPackage == null) {
+ // Activity not started through startActivityForResult.
+ return false;
+ }
+ PackageInfo packageInfo = null;
+ try {
+ packageInfo = getPackageManager().getPackageInfo(callingPackage,
+ PackageManager.GET_PERMISSIONS);
+ } catch (Exception e) {
+ Log.w(TAG, "Unable to get PackageInfo for callingPackage " + callingPackage);
+ }
+ if (packageInfo != null) {
+ for (int i = 0; i < packageInfo.requestedPermissions.length; i++) {
+ if (packageInfo.requestedPermissions[i].equals(
+ Manifest.permission.ACCESS_FINE_LOCATION) &&
+ (packageInfo.requestedPermissionsFlags[i] &
+ PackageInfo.REQUESTED_PERMISSION_GRANTED) != 0) {
+ return false;
+ }
+ }
+ }
+ return true;
+ }
+ /**
* Call this whenever the mode drawer or filmstrip change the visibility
* state.
*/
@@ -1862,7 +1894,7 @@
finish();
return;
}
- if (!mSecureCamera) {
+ if (!isSecureCamera() && !isCaptureIntent()) {
// Show the dialog if necessary. The rest resume logic will be invoked
// at the onFirstRunStateReady() callback.
try {
@@ -1901,10 +1933,14 @@
} else {
mHasCriticalPermissions = false;
}
-
- if ((checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED &&
- !mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL, Keys.KEY_HAS_SEEN_PERMISSIONS_DIALOGS)) ||
- !mHasCriticalPermissions) {
+ if (!mHasCriticalPermissions || (mSettingsManager.getBoolean(
+ SettingsManager.SCOPE_GLOBAL, Keys.KEY_RECORD_LOCATION) &&
+ (checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
+ != PackageManager.PERMISSION_GRANTED) &&
+ !mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL,
+ Keys.KEY_HAS_SEEN_PERMISSIONS_DIALOGS))) {
+ // TODO: Convert PermissionsActivity into a dialog so we
+ // don't lose the state of CameraActivity.
Intent intent = new Intent(this, PermissionsActivity.class);
startActivity(intent);
finish();
@@ -2189,6 +2225,9 @@
if (mSoundPlayer != null) {
mSoundPlayer.release();
}
+ if (mFirstRunDialog != null) {
+ mFirstRunDialog.dismiss();
+ }
CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.AUTO);
}
diff --git a/src/com/android/camera/CaptureModule.java b/src/com/android/camera/CaptureModule.java
index 640da4f..00a58cd 100644
--- a/src/com/android/camera/CaptureModule.java
+++ b/src/com/android/camera/CaptureModule.java
@@ -1537,12 +1537,10 @@
/**
* Returns which way around the camera is facing, based on it's ID.
- * <p>
- * TODO: This needs to change so that we store the direction directly in the
- * settings, rather than a Camera ID.
*/
- private static Facing getFacingFromCameraId(int cameraId) {
- return cameraId == 1 ? Facing.FRONT : Facing.BACK;
+ private Facing getFacingFromCameraId(int cameraId) {
+ return mAppController.getCameraProvider().getCharacteristics(cameraId)
+ .isFacingFront() ? Facing.FRONT : Facing.BACK;
}
private void resetTextureBufferSize() {
diff --git a/src/com/android/camera/DisableCameraReceiver.java b/src/com/android/camera/DisableCameraReceiver.java
index aea6ec5..5237c1d 100644
--- a/src/com/android/camera/DisableCameraReceiver.java
+++ b/src/com/android/camera/DisableCameraReceiver.java
@@ -30,7 +30,7 @@
// this receiver will be disabled, so it will not run again.
public class DisableCameraReceiver extends BroadcastReceiver {
private static final Log.Tag TAG = new Log.Tag("DisableCamRcver");
- private static final boolean CHECK_BACK_CAMERA_ONLY = true;
+ private static final boolean CHECK_BACK_CAMERA_ONLY = false;
private static final String ACTIVITIES[] = {
"com.android.camera.CameraLauncher",
};
diff --git a/src/com/android/camera/PermissionsActivity.java b/src/com/android/camera/PermissionsActivity.java
index 3fda04a..aca4778 100644
--- a/src/com/android/camera/PermissionsActivity.java
+++ b/src/com/android/camera/PermissionsActivity.java
@@ -24,6 +24,9 @@
/**
* Activity that shows permissions request dialogs and handles lack of critical permissions.
+ * TODO: Convert PermissionsActivity into a dialog to be emitted from
+ * CameraActivity as not to have to restart CameraActivity from
+ * scratch.
*/
public class PermissionsActivity extends QuickActivity {
private static final Log.Tag TAG = new Log.Tag("PermissionsActivity");
@@ -36,14 +39,17 @@
private int mIndexPermissionRequestMicrophone;
private int mIndexPermissionRequestLocation;
private int mIndexPermissionRequestStorage;
+ private int mIndexPermissionRequestWriteStorage;
private boolean mShouldRequestCameraPermission;
private boolean mShouldRequestMicrophonePermission;
private boolean mShouldRequestLocationPermission;
private boolean mShouldRequestStoragePermission;
+ private boolean mShouldRequestWriteStoragePermission;
private int mNumPermissionsToRequest;
private boolean mFlagHasCameraPermission;
private boolean mFlagHasMicrophonePermission;
private boolean mFlagHasStoragePermission;
+ private boolean mFlagHasWriteStoragePermission;
private SettingsManager mSettingsManager;
/**
@@ -121,9 +127,19 @@
mFlagHasStoragePermission = true;
}
- if (checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
+ if (checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE)
!= PackageManager.PERMISSION_GRANTED) {
mNumPermissionsToRequest++;
+ mShouldRequestWriteStoragePermission = true;
+ } else {
+ mFlagHasWriteStoragePermission = true;
+ }
+
+ if (mSettingsManager.getBoolean(SettingsManager.SCOPE_GLOBAL,
+ Keys.KEY_RECORD_LOCATION)
+ && (checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
+ != PackageManager.PERMISSION_GRANTED)) {
+ mNumPermissionsToRequest++;
mShouldRequestLocationPermission = true;
}
@@ -160,6 +176,11 @@
mIndexPermissionRequestStorage = permissionsRequestIndex;
permissionsRequestIndex++;
}
+ if (mShouldRequestWriteStoragePermission) {
+ permissionsToRequest[permissionsRequestIndex] = Manifest.permission.WRITE_EXTERNAL_STORAGE;
+ mIndexPermissionRequestWriteStorage = permissionsRequestIndex;
+ permissionsRequestIndex++;
+ }
if (mShouldRequestLocationPermission) {
permissionsToRequest[permissionsRequestIndex] = Manifest.permission.ACCESS_COARSE_LOCATION;
mIndexPermissionRequestLocation = permissionsRequestIndex;
@@ -202,6 +223,14 @@
handlePermissionsFailure();
}
}
+ if (mShouldRequestWriteStoragePermission) {
+ if (grantResults.length > 0 && grantResults[mIndexPermissionRequestWriteStorage] ==
+ PackageManager.PERMISSION_GRANTED) {
+ mFlagHasWriteStoragePermission = true;
+ } else {
+ handlePermissionsFailure();
+ }
+ }
if (mShouldRequestLocationPermission) {
if (grantResults.length > 0 && grantResults[mIndexPermissionRequestLocation] ==
@@ -212,7 +241,8 @@
}
}
- if (mFlagHasCameraPermission && mFlagHasMicrophonePermission && mFlagHasStoragePermission) {
+ if (mFlagHasCameraPermission && mFlagHasMicrophonePermission &&
+ mFlagHasStoragePermission && mFlagHasWriteStoragePermission) {
handlePermissionsSuccess();
}
}
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index c08e900..f29b08e 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1455,6 +1455,10 @@
return;
}
+ // Close the review UI if it's currently visible.
+ mUI.hidePostCaptureAlert();
+ mUI.hideIntentReviewImageView();
+
requestCameraOpen();
mJpegPictureCallbackTime = 0;
diff --git a/src/com/android/camera/SoundPlayer.java b/src/com/android/camera/SoundPlayer.java
index ff3f37f..6e76eb5 100644
--- a/src/com/android/camera/SoundPlayer.java
+++ b/src/com/android/camera/SoundPlayer.java
@@ -17,6 +17,7 @@
package com.android.camera;
import android.content.Context;
+import android.media.AudioAttributes;
import android.media.AudioManager;
import android.media.SoundPool;
import android.util.SparseIntArray;
@@ -39,8 +40,14 @@
*/
public SoundPlayer(Context appContext) {
mAppContext = appContext;
- final int audioType = getAudioTypeForSoundPool();
- mSoundPool = new SoundPool(1 /* max streams */, audioType, 0 /* quality */);
+ mSoundPool = new SoundPool.Builder()
+ .setMaxStreams(1)
+ .setAudioAttributes(new AudioAttributes.Builder()
+ .setUsage(AudioAttributes.USAGE_ASSISTANCE_SONIFICATION)
+ .setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+ .setFlags(AudioAttributes.FLAG_AUDIBILITY_ENFORCED)
+ .build())
+ .build();
}
/**
@@ -86,10 +93,4 @@
public boolean isReleased() {
return mIsReleased;
}
-
- private static int getAudioTypeForSoundPool() {
- // STREAM_SYSTEM_ENFORCED is hidden API.
- return ApiHelper.getIntFieldIfExists(AudioManager.class,
- "STREAM_SYSTEM_ENFORCED", null, AudioManager.STREAM_RING);
- }
}
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index 9a941c7..e8222f6 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -808,7 +808,8 @@
*/
private static Point getDesiredPreviewSize(CameraCapabilities capabilities,
CamcorderProfile profile, Point previewScreenSize) {
- if (capabilities.getSupportedVideoSizes() == null) {
+ if (capabilities.getSupportedVideoSizes() == null ||
+ capabilities.getSupportedVideoSizes().isEmpty()) {
// Driver doesn't support separate outputs for preview and video.
return new Point(profile.videoFrameWidth, profile.videoFrameHeight);
}
diff --git a/src/com/android/camera/app/FirstRunDialog.java b/src/com/android/camera/app/FirstRunDialog.java
index d810c4b..58e1fcb 100644
--- a/src/com/android/camera/app/FirstRunDialog.java
+++ b/src/com/android/camera/app/FirstRunDialog.java
@@ -16,9 +16,12 @@
package com.android.camera.app;
+import android.Manifest;
import android.app.Dialog;
+import android.app.Activity;
import android.content.Context;
import android.content.DialogInterface;
+import android.content.pm.PackageManager;
import android.view.ViewGroup;
import com.android.camera.device.CameraId;
@@ -51,6 +54,9 @@
/** The default preference of whether enabling location recording. */
private static final boolean DEFAULT_LOCATION_RECORDING_ENABLED = true;
+ /** Request code to PackageManager */
+ private static final int PERMISSION_REQUEST_CODE = 1;
+
/** Listener to receive events. */
private final FirstRunDialogListener mListener;
@@ -60,7 +66,7 @@
/** The hardware manager. */
private final OneCameraManager mOneCameraManager;
- /** The app context. */
+ /** The activity context. */
private final Context mContext;
/** The resolution settings. */
@@ -81,13 +87,13 @@
*/
public FirstRunDialog(
AppController appController,
- Context androidContext,
+ Context activityContext,
ResolutionSetting resolutionSetting,
SettingsManager settingManager,
OneCameraManager hardwareManager,
FirstRunDialogListener listener) {
mAppController = appController;
- mContext = androidContext;
+ mContext = activityContext;
mResolutionSetting = resolutionSetting;
mSettingsManager = settingManager;
mOneCameraManager = hardwareManager;
@@ -203,6 +209,18 @@
mAspectRatioPreferenceDialog.show();
}
+ private void checkLocationPermission() {
+ if (mContext.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
+ != PackageManager.PERMISSION_GRANTED) {
+ Activity activity = (Activity) mContext;
+ activity.requestPermissions(
+ new String[] {Manifest.permission.ACCESS_COARSE_LOCATION},
+ PERMISSION_REQUEST_CODE);
+ mSettingsManager.set(SettingsManager.SCOPE_GLOBAL,
+ Keys.KEY_HAS_SEEN_PERMISSIONS_DIALOGS, true);
+ }
+ }
+
/**
* Prompts a dialog to allow people to choose location preference when
* people open the app for the first time. If the preference has been set,
@@ -220,6 +238,9 @@
SettingsManager.SCOPE_GLOBAL,
Keys.KEY_RECORD_LOCATION,
locationRecordingEnabled);
+ if (locationRecordingEnabled) {
+ checkLocationPermission();
+ }
if (shouldShowAspectRatioDialog()) {
// Prompt the second dialog about aspect ratio preference.
diff --git a/src/com/android/camera/app/NoOpLocationProvider.java b/src/com/android/camera/app/NoOpLocationProvider.java
new file mode 100644
index 0000000..1cdbda3
--- /dev/null
+++ b/src/com/android/camera/app/NoOpLocationProvider.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (C) 2019 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.camera.app;
+
+import android.content.Context;
+import android.location.Location;
+
+/**
+ * Dummy Location provider to be used when location information shouldn't be provided to the client.
+ */
+public class NoOpLocationProvider implements LocationProvider {
+
+ public NoOpLocationProvider(Context context) {
+ }
+
+ @Override
+ public Location getCurrentLocation() {
+ return null;
+ }
+
+ @Override
+ public void recordLocation(boolean recordLocation) {
+ }
+
+ @Override
+ public void disconnect() {
+ }
+}
diff --git a/src/com/android/camera/async/Futures2.java b/src/com/android/camera/async/Futures2.java
index 6669132..052c722 100644
--- a/src/com/android/camera/async/Futures2.java
+++ b/src/com/android/camera/async/Futures2.java
@@ -20,6 +20,7 @@
import com.google.common.util.concurrent.ForwardingListenableFuture;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.List;
@@ -96,7 +97,7 @@
// allAsList will propagate the failures instead of null values to the
// parameters of the supplied function.
ListenableFuture<List<Object>> result = Futures.<Object>allAsList(futures);
- return Futures.transform(result, new AsyncFunction<List<Object>, TResult>() {
+ return Futures.transformAsync(result, new AsyncFunction<List<Object>, TResult>() {
@Override
public ListenableFuture<TResult> apply(@Nullable List<Object> list) throws Exception {
T1 value1 = (T1) list.get(0);
@@ -104,7 +105,7 @@
return fn.apply(value1, value2);
}
- });
+ }, MoreExecutors.directExecutor());
}
/**
@@ -141,7 +142,7 @@
// allAsList will propagate the failures instead of null values to the
// parameters of the supplied function.
ListenableFuture<List<Object>> result = Futures.<Object>allAsList(futures);
- return Futures.transform(result, new AsyncFunction<List<Object>, TResult>() {
+ return Futures.transformAsync(result, new AsyncFunction<List<Object>, TResult>() {
@Override
public ListenableFuture<TResult> apply(@Nullable List<Object> list) throws Exception {
T1 value1 = (T1) list.get(0);
@@ -150,7 +151,7 @@
return fn.apply(value1, value2, value3);
}
- });
+ }, MoreExecutors.directExecutor());
}
/**
diff --git a/src/com/android/camera/async/Observables.java b/src/com/android/camera/async/Observables.java
index e946fee..0fbfc6c 100644
--- a/src/com/android/camera/async/Observables.java
+++ b/src/com/android/camera/async/Observables.java
@@ -114,6 +114,6 @@
public void run() {
callback.update(observable.get());
}
- }, MoreExecutors.sameThreadExecutor());
+ }, MoreExecutors.directExecutor());
}
}
diff --git a/src/com/android/camera/burst/RingBuffer.java b/src/com/android/camera/burst/RingBuffer.java
index 04fa7de..d5090c2 100644
--- a/src/com/android/camera/burst/RingBuffer.java
+++ b/src/com/android/camera/burst/RingBuffer.java
@@ -16,7 +16,7 @@
package com.android.camera.burst;
-import android.support.v4.util.LongSparseArray;
+import androidx.collection.LongSparseArray;
import com.android.camera.async.SafeCloseable;
import com.android.camera.one.v2.camera2proxy.ImageProxy;
diff --git a/src/com/android/camera/captureintent/CaptureIntentSession.java b/src/com/android/camera/captureintent/CaptureIntentSession.java
index 6fb22c6..bdc0ea8 100644
--- a/src/com/android/camera/captureintent/CaptureIntentSession.java
+++ b/src/com/android/camera/captureintent/CaptureIntentSession.java
@@ -33,6 +33,8 @@
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import javax.annotation.Nonnull;
/**
@@ -149,7 +151,15 @@
@Override
public synchronized ListenableFuture<Optional<Uri>> saveAndFinish(byte[] data, int width,
int height, int orientation, ExifInterface exif) {
- mSessionNotifier.notifySessionPictureDataAvailable(data, orientation);
+ ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+ try {
+ exif.writeExif(data, byteArrayOutputStream);
+ } catch (IOException e) {
+ Log.e(TAG, "exception while trying to append exif to jpeg data");
+ }
+ byte[] dataWithExif = byteArrayOutputStream.toByteArray();
+ //No need to close byteArrayOutputStream since that has no effect.
+ mSessionNotifier.notifySessionPictureDataAvailable(dataWithExif, orientation);
return Futures.immediateFuture(Optional.<Uri> absent());
}
diff --git a/src/com/android/camera/captureintent/PictureDecoder.java b/src/com/android/camera/captureintent/PictureDecoder.java
index 3f1fc9c..faea254 100644
--- a/src/com/android/camera/captureintent/PictureDecoder.java
+++ b/src/com/android/camera/captureintent/PictureDecoder.java
@@ -43,11 +43,11 @@
Matrix m = new Matrix();
// Rotate if needed.
if (pictureOrientation != 0) {
- m.preRotate(pictureOrientation);
+ m.setRotate(pictureOrientation);
}
// Flip horizontally if needed.
if (needMirror) {
- m.setScale(-1f, 1f);
+ m.postScale(-1f, 1f);
}
return Bitmap.createBitmap(
pictureBitmap, 0, 0, pictureBitmap.getWidth(), pictureBitmap.getHeight(), m, false);
diff --git a/src/com/android/camera/captureintent/resource/ResourceConstructedImpl.java b/src/com/android/camera/captureintent/resource/ResourceConstructedImpl.java
index 588b7d4..5e90f40 100644
--- a/src/com/android/camera/captureintent/resource/ResourceConstructedImpl.java
+++ b/src/com/android/camera/captureintent/resource/ResourceConstructedImpl.java
@@ -76,7 +76,7 @@
AppController appController,
FatalErrorHandler fatalErrorHandler) {
final CameraFacingSetting cameraFacingSetting = new CameraFacingSetting(
- context.getResources(), settingsManager, settingScopeNamespace);
+ context.getResources(), settingsManager, settingScopeNamespace, appController);
final ResolutionSetting resolutionSetting = new ResolutionSetting(
settingsManager, oneCameraManager, context.getContentResolver());
return new RefCountBase<ResourceConstructed>(new ResourceConstructedImpl(
diff --git a/src/com/android/camera/one/OneCameraCharacteristics.java b/src/com/android/camera/one/OneCameraCharacteristics.java
index 24584da..27504a2 100644
--- a/src/com/android/camera/one/OneCameraCharacteristics.java
+++ b/src/com/android/camera/one/OneCameraCharacteristics.java
@@ -135,6 +135,11 @@
public boolean isAutoFocusSupported();
/**
+ * @return true if this camera supports continuous picture autofocus.
+ */
+ public boolean isContinuousPictureAutoFocusSupported();
+
+ /**
* @return true if this camera supports custom AutoExposure regions.
*/
public boolean isAutoExposureSupported();
diff --git a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
index 3e0fb9d..dc7f900 100644
--- a/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
+++ b/src/com/android/camera/one/config/OneCameraFeatureConfigCreator.java
@@ -131,8 +131,12 @@
}
private static boolean supportsReprocessing(CameraCharacteristics characteristics) {
- int maxNumInputStreams = characteristics.get(
+ Integer maxNumInputStreams = characteristics.get(
CameraCharacteristics.REQUEST_MAX_NUM_INPUT_STREAMS);
+ if (maxNumInputStreams == null) {
+ Log.e(TAG, "Camera does not have maximum number of input streams.");
+ return false;
+ }
if (maxNumInputStreams == 0) {
return false;
}
diff --git a/src/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java b/src/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
index b14e66e..c525b57 100644
--- a/src/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
+++ b/src/com/android/camera/one/v1/OneCameraCharacteristicsImpl.java
@@ -176,6 +176,11 @@
}
@Override
+ public boolean isContinuousPictureAutoFocusSupported() {
+ return getCameraDirection() == Facing.BACK;
+ }
+
+ @Override
public boolean isAutoExposureSupported() {
// Custom AE is only supported on the back camera for legacy devices.
return getCameraDirection() == Facing.BACK;
diff --git a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
index a4b5a9b..283ac67 100644
--- a/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
+++ b/src/com/android/camera/one/v2/Camera2OneCameraManagerImpl.java
@@ -34,6 +34,8 @@
import com.android.camera.util.ApiHelper;
import com.google.common.base.Optional;
+import java.util.Hashtable;
+
import javax.annotation.Nonnull;
/**
@@ -62,9 +64,19 @@
}
private final CameraManager mCameraManager;
+ private Hashtable<Facing, String> mCameraFacingCache = new Hashtable<Facing, String>();
public Camera2OneCameraManagerImpl(CameraManager cameraManger) {
mCameraManager = cameraManger;
+
+ //Camera facing queries depending on camera implementation can be
+ //expensive and involve additional IPC with side effects. Cache front&
+ //back camera ids as early as possible.
+ if (mCameraManager != null) {
+ mCameraFacingCache.clear();
+ findFirstCameraFacing(Facing.BACK);
+ findFirstCameraFacing(Facing.FRONT);
+ }
}
@Override
@@ -122,11 +134,21 @@
/** Returns the ID of the first camera facing the given direction. */
private String findCameraId(Facing facing) {
- if (facing == Facing.FRONT) {
- return findFirstFrontCameraId();
- } else {
- return findFirstBackCameraId();
+ String id = mCameraFacingCache.get(facing);
+ if (id != null) {
+ return id;
}
+
+ if (facing == Facing.FRONT) {
+ id = findFirstFrontCameraId();
+ } else {
+ id = findFirstBackCameraId();
+ }
+
+ if (id != null) {
+ mCameraFacingCache.put(facing, id);
+ }
+ return id;
}
/** Returns the ID of the first back-facing camera. */
diff --git a/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java b/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
index f7a2b7e..77e9a81 100644
--- a/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraCharacteristicsImpl.java
@@ -244,6 +244,20 @@
}
@Override
+ public boolean isContinuousPictureAutoFocusSupported() {
+ int[] availableAfModes =
+ mCameraCharacteristics.get(CameraCharacteristics.CONTROL_AF_AVAILABLE_MODES);
+ boolean continuousPictureAfModeAvailable = false;
+ for (int i = 0; i < availableAfModes.length; i++) {
+ if (availableAfModes[i] == CameraCharacteristics.CONTROL_AF_MODE_CONTINUOUS_PICTURE) {
+ continuousPictureAfModeAvailable = true;
+ break;
+ }
+ }
+ return isAutoFocusSupported() && continuousPictureAfModeAvailable;
+ }
+
+ @Override
public boolean isAutoExposureSupported() {
Integer maxAeRegions = mCameraCharacteristics.get(
CameraCharacteristics.CONTROL_MAX_REGIONS_AE);
diff --git a/src/com/android/camera/one/v2/OneCameraImpl.java b/src/com/android/camera/one/v2/OneCameraImpl.java
index d4c7cba..c3b8ecb 100644
--- a/src/com/android/camera/one/v2/OneCameraImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraImpl.java
@@ -71,6 +71,7 @@
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.io.File;
import java.io.FileOutputStream;
@@ -512,7 +513,7 @@
public void onFailure(Throwable throwable) {
captureParams.callback.onPictureSaved(null);
}
- });
+ }, MoreExecutors.directExecutor());
}
/**
diff --git a/src/com/android/camera/one/v2/OneCameraZslImpl.java b/src/com/android/camera/one/v2/OneCameraZslImpl.java
index 6bdad44..a35a6c1 100644
--- a/src/com/android/camera/one/v2/OneCameraZslImpl.java
+++ b/src/com/android/camera/one/v2/OneCameraZslImpl.java
@@ -39,7 +39,7 @@
import android.os.Handler;
import android.os.HandlerThread;
import android.os.SystemClock;
-import android.support.v4.util.Pools;
+import androidx.core.util.Pools;
import android.view.Surface;
import com.android.camera.CaptureModuleUtil;
@@ -71,6 +71,7 @@
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.nio.ByteBuffer;
import java.security.InvalidParameterException;
@@ -649,7 +650,7 @@
public void onFailure(Throwable throwable) {
captureParams.callback.onPictureSaved(null);
}
- });
+ }, MoreExecutors.directExecutor());
}
/**
diff --git a/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java b/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
index 95d2523..86721ac 100644
--- a/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
+++ b/src/com/android/camera/one/v2/autofocus/TriggerStateMachine.java
@@ -17,7 +17,7 @@
package com.android.camera.one.v2.autofocus;
import android.hardware.camera2.CaptureResult;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
import com.android.camera.async.Updatable;
diff --git a/src/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java b/src/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
index 3dc5d65..ef9baa5 100644
--- a/src/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
+++ b/src/com/android/camera/one/v2/camera2proxy/AndroidImageProxy.java
@@ -19,6 +19,7 @@
import android.graphics.Rect;
import android.media.Image;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
@@ -203,7 +204,7 @@
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("format", getFormat())
.add("timestamp", getTimestamp())
.add("width", getWidth())
diff --git a/src/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java b/src/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
index 8a59c83..e4c0638 100644
--- a/src/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
+++ b/src/com/android/camera/one/v2/camera2proxy/AndroidImageReaderProxy.java
@@ -21,7 +21,7 @@
import android.os.Handler;
import android.view.Surface;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
@@ -160,9 +160,9 @@
@Override
public String toString() {
- Objects.ToStringHelper tsh;
+ MoreObjects.ToStringHelper tsh;
synchronized (mLock) {
- tsh = Objects.toStringHelper(mDelegate);
+ tsh = MoreObjects.toStringHelper(mDelegate);
}
return tsh.add("width", getWidth())
.add("height", getHeight())
diff --git a/src/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java b/src/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
index 545ff60..98d972e 100644
--- a/src/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
+++ b/src/com/android/camera/one/v2/camera2proxy/ForwardingImageProxy.java
@@ -19,6 +19,7 @@
import android.graphics.Rect;
import android.media.Image;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.util.List;
@@ -102,7 +103,7 @@
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("timestamp", getTimestamp())
.add("width", getWidth())
.add("height", getHeight())
diff --git a/src/com/android/camera/one/v2/common/BasicCameraFactory.java b/src/com/android/camera/one/v2/common/BasicCameraFactory.java
index 2cd4098..44883ea 100644
--- a/src/com/android/camera/one/v2/common/BasicCameraFactory.java
+++ b/src/com/android/camera/one/v2/common/BasicCameraFactory.java
@@ -87,8 +87,12 @@
Observable<Boolean> hdrSceneSetting,
int templateType) {
RequestTemplate requestTemplate = new RequestTemplate(rootTemplate);
- requestTemplate.setParam(
- CaptureRequest.CONTROL_AF_MODE, CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+ if (cameraCharacteristics.isContinuousPictureAutoFocusSupported()) {
+ requestTemplate.setParam(
+ CaptureRequest.CONTROL_AF_MODE,
+ CaptureRequest.CONTROL_AF_MODE_CONTINUOUS_PICTURE);
+ }
+
requestTemplate.setParam(
CaptureRequest.CONTROL_AE_MODE, new FlashBasedAEMode(flash, hdrSceneSetting));
requestTemplate.setParam(
@@ -126,16 +130,16 @@
// Also, de-register these callbacks when the camera is closed (to
// not leak memory).
SafeCloseable zoomCallback = zoom.addCallback(mPreviewUpdater, MoreExecutors
- .sameThreadExecutor());
+ .directExecutor());
lifetime.add(zoomCallback);
SafeCloseable flashCallback = flash.addCallback(mPreviewUpdater, MoreExecutors
- .sameThreadExecutor());
+ .directExecutor());
lifetime.add(flashCallback);
SafeCloseable exposureCallback = exposure.addCallback(mPreviewUpdater, MoreExecutors
- .sameThreadExecutor());
+ .directExecutor());
lifetime.add(exposureCallback);
SafeCloseable hdrCallback = hdrSceneSetting.addCallback(mPreviewUpdater, MoreExecutors
- .sameThreadExecutor());
+ .directExecutor());
lifetime.add(hdrCallback);
int sensorOrientation = cameraCharacteristics.getSensorOrientation();
diff --git a/src/com/android/camera/one/v2/common/PictureSizeCalculator.java b/src/com/android/camera/one/v2/common/PictureSizeCalculator.java
index eb25be0..8f2fb6a 100644
--- a/src/com/android/camera/one/v2/common/PictureSizeCalculator.java
+++ b/src/com/android/camera/one/v2/common/PictureSizeCalculator.java
@@ -22,6 +22,7 @@
import com.android.camera.one.OneCameraCharacteristics;
import com.android.camera.util.AspectRatio;
import com.android.camera.util.Size;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -76,7 +77,7 @@
@Override
public String toString() {
- return Objects.toStringHelper("PictureSizeCalculator.Configuration")
+ return MoreObjects.toStringHelper("PictureSizeCalculator.Configuration")
.add("native size", mSize)
.add("crop", mPostCrop)
.toString();
diff --git a/src/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java b/src/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
index f966bfd..472378f 100644
--- a/src/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
+++ b/src/com/android/camera/one/v2/initialization/GenericOneCameraImpl.java
@@ -35,6 +35,7 @@
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.concurrent.Executor;
@@ -159,7 +160,7 @@
public void onFailure(@Nonnull Throwable throwable) {
listener.onSetupFailed();
}
- });
+ }, MoreExecutors.directExecutor());
}
@Override
diff --git a/src/com/android/camera/one/v2/initialization/PreviewStarter.java b/src/com/android/camera/one/v2/initialization/PreviewStarter.java
index 99c34a3..17a0966 100644
--- a/src/com/android/camera/one/v2/initialization/PreviewStarter.java
+++ b/src/com/android/camera/one/v2/initialization/PreviewStarter.java
@@ -24,6 +24,7 @@
import com.google.common.util.concurrent.AsyncFunction;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.util.ArrayList;
import java.util.List;
@@ -82,7 +83,7 @@
final ListenableFuture<CameraCaptureSessionProxy> sessionFuture =
mCaptureSessionCreator.createCaptureSession(surfaceList);
- return Futures.transform(sessionFuture,
+ return Futures.transformAsync(sessionFuture,
new AsyncFunction<CameraCaptureSessionProxy, Void>() {
@Override
public ListenableFuture<Void> apply(
@@ -90,6 +91,6 @@
mSessionListener.onCameraCaptureSessionCreated(captureSession, surface);
return Futures.immediateFuture(null);
}
- });
+ }, MoreExecutors.directExecutor());
}
}
diff --git a/src/com/android/camera/one/v2/photo/PictureTakerImpl.java b/src/com/android/camera/one/v2/photo/PictureTakerImpl.java
index 13498c7..59245da 100644
--- a/src/com/android/camera/one/v2/photo/PictureTakerImpl.java
+++ b/src/com/android/camera/one/v2/photo/PictureTakerImpl.java
@@ -28,7 +28,7 @@
import com.android.camera.one.v2.core.ResourceAcquisitionFailedException;
import com.android.camera.one.v2.imagesaver.ImageSaver;
import com.android.camera.session.CaptureSession;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
class PictureTakerImpl implements PictureTaker {
private final MainThread mMainExecutor;
@@ -70,7 +70,7 @@
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("command", mCommand)
.toString();
}
diff --git a/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java b/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
index 4b8e8fc..cb4edd7 100644
--- a/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
+++ b/src/com/android/camera/one/v2/photo/zsl/ZslImageCaptureCommand.java
@@ -17,7 +17,7 @@
package com.android.camera.one.v2.photo.zsl;
import android.hardware.camera2.CameraAccessException;
-import android.support.v4.util.Pair;
+import androidx.core.util.Pair;
import com.android.camera.async.BufferQueue;
import com.android.camera.async.Updatable;
diff --git a/src/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java b/src/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
index 8500ebe..5be9032 100644
--- a/src/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
+++ b/src/com/android/camera/one/v2/sharedimagereader/metadatasynchronizer/MetadataPoolImpl.java
@@ -25,6 +25,7 @@
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import com.google.common.util.concurrent.SettableFuture;
import java.util.HashMap;
@@ -81,7 +82,7 @@
public void onFailure(Throwable throwable) {
throw new UnsupportedOperationException();
}
- });
+ }, MoreExecutors.directExecutor());
return Futures2.nonCancellationPropagating(future);
}
diff --git a/src/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java b/src/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
index 1530c48..11350f2 100644
--- a/src/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
+++ b/src/com/android/camera/one/v2/sharedimagereader/ringbuffer/DynamicRingBufferFactory.java
@@ -51,7 +51,7 @@
public void run() {
ringBuffer.setMaxSize(Math.max(0, maxRingBufferSize.get()));
}
- }, MoreExecutors.sameThreadExecutor()));
+ }, MoreExecutors.directExecutor()));
ringBuffer.setMaxSize(Math.max(0, maxRingBufferSize.get()));
mOutputTicketPool = ringBuffer;
diff --git a/src/com/android/camera/processing/ProcessingService.java b/src/com/android/camera/processing/ProcessingService.java
index c67ebd6..1e48095 100644
--- a/src/com/android/camera/processing/ProcessingService.java
+++ b/src/com/android/camera/processing/ProcessingService.java
@@ -27,7 +27,7 @@
import android.os.PowerManager;
import android.os.PowerManager.WakeLock;
import android.os.Process;
-import android.support.v4.content.LocalBroadcastManager;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
import com.android.camera.app.CameraServices;
import com.android.camera.app.CameraServicesImpl;
diff --git a/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java b/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
index e1d1689..7a2caf9 100644
--- a/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
+++ b/src/com/android/camera/processing/imagebackend/TaskCompressImageToJpeg.java
@@ -39,6 +39,7 @@
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.MoreExecutors;
import java.nio.ByteBuffer;
import java.util.HashMap;
@@ -354,7 +355,7 @@
@Override
public void onFailure(Throwable throwable) {
}
- });
+ }, MoreExecutors.directExecutor());
final ListenableFuture<TotalCaptureResultProxy> requestMetadata = img.metadata;
// If TotalCaptureResults are available add them to the capture event.
diff --git a/src/com/android/camera/settings/AppUpgrader.java b/src/com/android/camera/settings/AppUpgrader.java
index 92bd953..930c3e2 100644
--- a/src/com/android/camera/settings/AppUpgrader.java
+++ b/src/com/android/camera/settings/AppUpgrader.java
@@ -145,6 +145,7 @@
// chooser if applicable.
settingsManager.remove(SettingsManager.SCOPE_GLOBAL,
Keys.KEY_STARTUP_MODULE_INDEX);
+ CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
}
if (lastVersion < CAMERA_MODULE_SETTINGS_FILES_RENAMED_VERSION) {
diff --git a/src/com/android/camera/settings/CameraFacingSetting.java b/src/com/android/camera/settings/CameraFacingSetting.java
index 1881d7e..8227ad6 100644
--- a/src/com/android/camera/settings/CameraFacingSetting.java
+++ b/src/com/android/camera/settings/CameraFacingSetting.java
@@ -16,6 +16,7 @@
package com.android.camera.settings;
+import com.android.camera.app.AppController;
import com.android.camera.CameraActivity;
import com.android.camera.one.OneCamera;
import com.android.camera2.R;
@@ -40,18 +41,24 @@
public CameraFacingSetting(
Resources resources,
SettingsManager settingsManager,
- String moduleSettingScope) {
+ String moduleSettingScope,
+ AppController appController) {
mSettingsManager = settingsManager;
mSettingScope = SettingsManager.getModuleSettingScope(moduleSettingScope);
mCameraFacingSettingKey = Keys.KEY_CAMERA_ID;
- mCameraFacingBackValue =
- Integer.parseInt(resources.getString(R.string.pref_camera_id_entry_back_value));
- mCameraFacingFrontValue =
- Integer.parseInt(resources.getString(R.string.pref_camera_id_entry_front_value));
mCameraFacingDefaultValue =
Integer.parseInt(resources.getString(R.string.pref_camera_id_default));
+
+ if (appController.getCameraProvider().getCharacteristics(mCameraFacingDefaultValue).
+ isFacingFront()) {
+ mCameraFacingFrontValue = 0;
+ mCameraFacingBackValue = 1;
+ } else {
+ mCameraFacingBackValue = 0;
+ mCameraFacingFrontValue = 1;
+ }
}
@Override
diff --git a/src/com/android/camera/settings/CameraSettingsActivity.java b/src/com/android/camera/settings/CameraSettingsActivity.java
index 50641fd..c2e060a 100644
--- a/src/com/android/camera/settings/CameraSettingsActivity.java
+++ b/src/com/android/camera/settings/CameraSettingsActivity.java
@@ -16,10 +16,12 @@
package com.android.camera.settings;
+import android.Manifest;
import android.app.ActionBar;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.os.Bundle;
@@ -29,7 +31,7 @@
import android.preference.PreferenceFragment;
import android.preference.PreferenceGroup;
import android.preference.PreferenceScreen;
-import android.support.v4.app.FragmentActivity;
+import androidx.fragment.app.FragmentActivity;
import android.view.MenuItem;
import com.android.camera.FatalErrorHandler;
@@ -69,6 +71,7 @@
*/
public static final String PREF_SCREEN_EXTRA = "pref_screen_extra";
public static final String HIDE_ADVANCED_SCREEN = "hide_advanced";
+ private static final int PERMISSION_REQUEST_CODE = 1;
private OneCameraManager mOneCameraManager;
@Override
@@ -180,6 +183,7 @@
mInfos = CameraAgentFactory
.getAndroidCameraAgent(context, CameraAgentFactory.CameraApi.API_1)
.getCameraDeviceInfo();
+ CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
}
@Override
@@ -354,6 +358,15 @@
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
setSummary(findPreference(key));
+ if (key.equals(Keys.KEY_RECORD_LOCATION)
+ && sharedPreferences.getString(key, "0").equals("1")) {
+ Context context = this.getActivity().getApplicationContext();
+ if (context.checkSelfPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
+ != PackageManager.PERMISSION_GRANTED) {
+ requestPermissions(new String[] {Manifest.permission.ACCESS_COARSE_LOCATION},
+ PERMISSION_REQUEST_CODE);
+ }
+ }
}
/**
@@ -498,6 +511,7 @@
}
PictureSizeLoader loader = new PictureSizeLoader(getActivity().getApplicationContext());
mPictureSizes = loader.computePictureSizes();
+ loader.release();
}
/**
diff --git a/src/com/android/camera/settings/PictureSizeLoader.java b/src/com/android/camera/settings/PictureSizeLoader.java
index a3cb49b..582d77f 100644
--- a/src/com/android/camera/settings/PictureSizeLoader.java
+++ b/src/com/android/camera/settings/PictureSizeLoader.java
@@ -97,6 +97,10 @@
mCachedOnly = cachedOnly;
}
+ public void release(){
+ CameraAgentFactory.recycle(CameraAgentFactory.CameraApi.API_1);
+ }
+
/**
* Computes the list of picture sizes that should be displayed by settings.
* <p>
diff --git a/src/com/android/camera/ui/focus/FocusRingView.java b/src/com/android/camera/ui/focus/FocusRingView.java
index 6b5cca0..1b4960d 100644
--- a/src/com/android/camera/ui/focus/FocusRingView.java
+++ b/src/com/android/camera/ui/focus/FocusRingView.java
@@ -172,7 +172,7 @@
}
if (mPreviewSize != null) {
- canvas.clipRect(mPreviewSize, Region.Op.REPLACE);
+ canvas.clipRect(mPreviewSize);
}
mAnimator.draw(canvas);
diff --git a/src/com/android/camera/util/AndroidContext.java b/src/com/android/camera/util/AndroidContext.java
index 6fc50c4..72f3478 100644
--- a/src/com/android/camera/util/AndroidContext.java
+++ b/src/com/android/camera/util/AndroidContext.java
@@ -17,7 +17,7 @@
package com.android.camera.util;
import android.content.Context;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
/**
* Initializable singleton for providing the application level context
diff --git a/src_pd/com/android/camera/app/LocationManager.java b/src_pd/com/android/camera/app/LocationManager.java
index 6a3440b..90839b0 100644
--- a/src_pd/com/android/camera/app/LocationManager.java
+++ b/src_pd/com/android/camera/app/LocationManager.java
@@ -31,10 +31,12 @@
LocationProvider mLocationProvider;
private boolean mRecordLocation;
- public LocationManager(Context context) {
- Log.d(TAG, "Using legacy location provider.");
- LegacyLocationProvider llp = new LegacyLocationProvider(context);
- mLocationProvider = llp;
+ public LocationManager(Context context, boolean NoOpLocationProvider) {
+ Log.d(TAG, "Using " +
+ (NoOpLocationProvider ? "NoOpLocationProvider" : "LegacyLocationProvider"));
+ LocationProvider lp = NoOpLocationProvider ? new NoOpLocationProvider(context) :
+ new LegacyLocationProvider(context);
+ mLocationProvider = lp;
}
/**
diff --git a/version.mk b/version.mk
index 7b38210..9c3997e 100644
--- a/version.mk
+++ b/version.mk
@@ -43,7 +43,7 @@
#####################################################
#####################################################
# Collect automatic version code parameters
-ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
+ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
# This is an eng build
base_version_buildtype := 0
else
@@ -85,10 +85,10 @@
# where nnnnnn is the build number from the build server (no zero-padding)
# On eng builds, the BUILD_NUMBER has the user and timestamp inline
ifdef TARGET_BUILD_APPS
-ifneq "" "$(filter eng.%,$(BUILD_NUMBER))"
+ifeq ($(strip $(HAS_BUILD_NUMBER)),false)
git_hash := $(shell git --git-dir $(LOCAL_PATH)/.git log -n 1 --pretty=format:%h)
date_string := $$(date +%m%d%y_%H%M%S)
- version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) (eng.$(USER).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density))
+ version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) (eng.$(BUILD_USERNAME).$(git_hash).$(date_string)-$(base_version_arch)$(base_version_density))
else
version_name_package := $(base_version_major).$(base_version_minor).$(base_version_build) ($(BUILD_NUMBER_FROM_FILE)-$(base_version_arch)$(base_version_density))
endif
