Merge "Revert "Include v4, use AAPT2"" into oc-dev am: 487830bbcf

am: 69c572d803

Change-Id: Ic99f16c26b8317748d47336729a57c5e9fdb474a

diff --git a/jni/Android.mk b/jni/Android.mk
old mode 100755 (executable)
new mode 100644 (file)
index 80c827a..d8c66a2
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -9,7 +9,8 @@ LOCAL_SDK_VERSION := 17
 LOCAL_MODULE    := libjni_tinyplanet
 LOCAL_SRC_FILES := tinyplanet.cc
 
-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,7 +18,6 @@ include $(BUILD_SHARED_LIBRARY)
 # JpegUtil
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS := -std=c++11
 LOCAL_NDK_STL_VARIANT := c++_static
 LOCAL_LDFLAGS   := -llog -ldl -ljnigraphics
 LOCAL_SDK_VERSION := 17
@@ -26,7 +26,9 @@ LOCAL_SRC_FILES := jpegutil.cpp jpegutilnative.cpp
 
 LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk
 
-LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS := -std=c++11
+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 (file)
--- a/jni/jpegutil.cpp
+++ b/jni/jpegutil.cpp
@@ -230,7 +230,7 @@ int jpegutil::Compress(int img_width, int img_height,
     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 @@ int jpegutil::Compress(
   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 (file)
--- a/jni/jpegutil.h
+++ b/jni/jpegutil.h
@@ -181,7 +181,7 @@ template <unsigned int ROWS>
 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 @@ const std::array<unsigned char*, ROWS> jpegutil::RowIterator<ROWS>::LoadAt(
     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 (file)
--- a/jni/jpegutilnative.cpp
+++ b/jni/jpegutilnative.cpp
@@ -67,7 +67,7 @@ using namespace jpegutil;
  */
 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 @@ Java_com_android_camera_util_JpegUtilNative_compressJpegFromYUV420pNative(
  */
 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 (file)
--- a/jni/tinyplanet.cc
+++ b/jni/tinyplanet.cc
@@ -130,7 +130,9 @@ void StereographicProjection(float scale, float angle, unsigned char* input_imag
 }
 
 
-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/values-ar/strings.xml b/res/values-ar/strings.xml
index 4a39ac4..c108c21 100644 (file)
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -69,7 +69,7 @@
     <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">"أخÙ\81Ù\82 تخزين الصورة."</string>
+    <string name="reason_storage_failure" msgid="6818898304774654969">"تعذÙ\91ر تخزين الصورة."</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>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index d01fc17..e4d34f5 100644 (file)
--- 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-hy/strings.xml b/res/values-hy/strings.xml
index b5319d3..304449a 100644 (file)
--- a/res/values-hy/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">"Õ\96Õ¸Õ¿Õ¸խցիկ"</string>
+    <string name="app_name" msgid="1175086483881127797">"Õ\8fÕ¥Õ½Õ¡խցիկ"</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">"Õ\8aÕ¡Õ°Õ¥Õ¬ Õ¿Õ¥Õ²Õ¡Õ¤Ö\80Õ¸Ö\82Õ©ÕµÕ¸Ö\82Õ¶ը"</string>
+    <string name="pref_camera_save_location_title" msgid="2344235620113384017">"Õ\86Õ¯Õ¡Ö\80Õ¡Õ°Õ¡Õ¶Õ´Õ¡Õ¶ Õ¾Õ¡ÕµÖ\80ը"</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">"Õ\96Õ¸Õ¿Õ¸խցիկ"</string>
+    <string name="mode_camera" msgid="279763925715250603">"Õ\8fÕ¥Õ½Õ¡խցիկ"</string>
     <string name="mode_video" msgid="8633929034048169139">"Տեսանյութ"</string>
     <string name="mode_photosphere" msgid="5082338476237291833">"Photo Sphere"</string>
     <string name="mode_timelapse" msgid="1517168724627815453">"Ժամանակի սպառում"</string>

diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index db7204e..b27004f 100644 (file)
--- a/res/values-kn/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">"à²\85ಳಿಸà³\81"</string>
+    <string name="delete" msgid="2714492172818940424">"à²\85ಳಿಸಿ"</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">"ಸà³\8dಥಾನ"</string>
+    <string name="location" msgid="564326205780827668">"ಸà³\8dಥಳ"</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">"ವà²\9cಾà²\97à³\8aಳಿಸà³\81"</string>
+    <string name="dialog_dismiss" msgid="1382550604990470119">"ವà²\9cಾà²\97à³\8aಳಿಸಿ"</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">"à²\85ಳಿಸà³\81"</string>
+    <string name="delete_button_description" msgid="2251065309677200911">"à²\85ಳಿಸಿ"</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">"ಸà³\8dಥಾನ"</string>
+    <string name="setting_location" msgid="4459859689227893838">"ಸà³\8dಥಳ"</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>

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index 42d076e..a966017 100644 (file)
--- a/res/values-ky/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-mk/strings.xml b/res/values-mk/strings.xml
index 412af6e..5ff533c 100644 (file)
--- a/res/values-mk/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">"УÑ\80еди"</string>
+    <string name="edit" msgid="2776879395749004347">"Ð\98змени"</string>
     <string name="crop_action" msgid="6933589718464132714">"Исечи"</string>
     <string name="trim_action" msgid="4736803320203951827">"Скрати"</string>
     <string name="set_as" msgid="5469055085024870081">"Постави како"</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">"УÑ\80еди"</string>
+    <string name="edit_button_description" msgid="98550816724901925">"Ð\98змени"</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>
@@ -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">"УÑ\80еди со"</string>
+    <string name="edit_with" msgid="615569327230783971">"Ð\98змени со"</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-my/strings.xml b/res/values-my/strings.xml
index 681de9f..458ebb0 100644 (file)
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -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">"á\80\86á\80¯á\80¶á\80\81á\80»á\80\80á\80º á\80\95á\80¼á\80\94á\80ºá\80\8aá\80¾á\80­ရန် ဒီမှာ ထိပါ"</string>
+    <string name="cling_text_for_refocus_editor_button" msgid="4785017397116829802">"á\80\86á\80¯á\80¶á\80\81á\80»á\80\80á\80º á\80\95á\80¼á\80\84á\80ºá\80\86á\80\84á\80ºá\80\9eá\80\90á\80ºá\80\99á\80¾á\80\90á\80ºရန် ဒီမှာ ထိပါ"</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>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index 829a21a..2028a69 100644 (file)
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -261,17 +261,17 @@
     <string name="pref_video_time_lapse_frame_interval_5400000" msgid="7011488725038113884">"१.५ घन्टा"</string>
     <string name="pref_video_time_lapse_frame_interval_7200000" msgid="7399563587870916008">"२ घन्टा"</string>
     <string name="pref_video_time_lapse_frame_interval_9000000" msgid="1545856778907835970">"२.५ घन्टा"</string>
-    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="4064231412857457518">"३ à¤\98ण्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_10800000" msgid="4064231412857457518">"३ à¤\98न्टा"</string>
     <string name="pref_video_time_lapse_frame_interval_14400000" msgid="5174457951350690217">"४ घन्टा"</string>
     <string name="pref_video_time_lapse_frame_interval_18000000" msgid="5091441456160949740">"५ घन्टा"</string>
-    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="6924571987775154098">"६ à¤\98ण्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_21600000" msgid="6924571987775154098">"६ à¤\98न्टा"</string>
     <string name="pref_video_time_lapse_frame_interval_36000000" msgid="6959912631566981301">"१० घन्टा"</string>
-    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="6426833030111269499">"१२ à¤\98ण्टा"</string>
+    <string name="pref_video_time_lapse_frame_interval_43200000" msgid="6426833030111269499">"१२ à¤\98न्टा"</string>
     <string name="pref_video_time_lapse_frame_interval_54000000" msgid="6688725497680331090">"१५ घन्टा"</string>
     <string name="pref_video_time_lapse_frame_interval_86400000" msgid="5510320806095156153">"२४ घन्टा"</string>
     <string name="time_lapse_seconds" msgid="7319683099532506270">"सेकेण्ड"</string>
     <string name="time_lapse_minutes" msgid="5325447383033224679">"मिनेट"</string>
-    <string name="time_lapse_hours" msgid="5294001144133261436">"à¤\98ण्टा"</string>
+    <string name="time_lapse_hours" msgid="5294001144133261436">"à¤\98न्टा"</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>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 305df12..de1a154 100644 (file)
--- 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..b1dd567 100644 (file)
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -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>