Commit 08dd2c9b authored by Michael Bestas's avatar Michael Bestas

Merge tag 'android-8.1.0_r15' of...

Merge tag 'android-8.1.0_r15' of https://android.googlesource.com/platform/packages/apps/Gallery2 into HEAD

Android 8.1.0 Release 15 (OPM1.171019.021)

* Excludes "Adaptive icon for Gallery2 AOSP" since we have our own icon

Conflicts:
	Android.mk
	AndroidManifest.xml
	jni/Android.mk
	jni/filters/geometry.c
	proguard.flags
	res/values/colors.xml
	src/com/android/gallery3d/filtershow/pipeline/Buffer.java

Change-Id: I003571ce6e7719e4d110fd9b546126e52eef1204
parents 1554c642 f50ea21b
......@@ -7,22 +7,27 @@ LOCAL_MODULE_TAGS := optional
LOCAL_JAVA_LIBRARIES := telephony-common
LOCAL_STATIC_JAVA_LIBRARIES += android-support-design
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v7-appcompat
LOCAL_STATIC_JAVA_LIBRARIES += android-support-v13
LOCAL_STATIC_JAVA_LIBRARIES += org.codeaurora.gallery.common
LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
LOCAL_SRC_FILES := \
$(call all-java-files-under, src) \
$(call all-renderscript-files-under, src)
LOCAL_SRC_FILES += $(call all-java-files-under, src_pd)
LOCAL_RESOURCE_DIR += \
$(LOCAL_PATH)/res \
$(TOP)/frameworks/support/compat/res \
$(TOP)/frameworks/support/design/res \
$(TOP)/frameworks/support/v7/appcompat/res
LOCAL_AAPT_FLAGS := \
--auto-add-overlay \
--extra-packages android.support.compat \
--extra-packages android.support.design \
--extra-packages android.support.transition \
--extra-packages android.support.v7.appcompat
......
......@@ -24,7 +24,7 @@
<original-package android:name="com.android.gallery3d" />
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26"/>
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
android:protectionLevel="signatureOrSystem" />
......
......@@ -3,6 +3,7 @@ LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -Wno-unused-parameter
LOCAL_CFLAGS += -Wall -Wextra
LOCAL_SRC_FILES := jni_egl_fence.cpp
......@@ -45,6 +46,7 @@ LOCAL_SRC_FILES := filters/gradient.c \
filters/kmeans.cc
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops -Wno-unused-parameter
LOCAL_CFLAGS += -Wall -Wextra
LOCAL_LDLIBS := -llog -ljnigraphics
LOCAL_ARM_MODE := arm
......
......@@ -36,7 +36,7 @@ typedef unsigned int Color;
#define LOG(msg...) __android_log_print(ANDROID_LOG_VERBOSE, "NativeFilters", msg)
#define JNIFUNCF(cls, name, vars...) Java_com_android_gallery3d_filtershow_filters_ ## cls ## _ ## name(JNIEnv* env, jobject obj, vars)
#define JNIFUNCF(cls, name, vars...) Java_com_android_gallery3d_filtershow_filters_ ## cls ## _ ## name(JNIEnv* env, jobject obj_unused __unused, vars)
#define RED i
#define GREEN (i+1)
......
......@@ -29,8 +29,8 @@ __inline__ int interp(unsigned char *src, int p , int *off ,float dr,float dg,
return (int)frbg ;
}
void JNIFUNCF(ImageFilterFx, nativeApplyFilter, jobject bitmap, jint width, jint height,
jobject lutbitmap, jint lutwidth, jint lutheight,
void JNIFUNCF(ImageFilterFx, nativeApplyFilter, jobject bitmap, jint width __unused,
jint height __unused, jobject lutbitmap, jint lutwidth, jint lutheight,
jint start, jint end)
{
char* destination = 0;
......
......@@ -19,7 +19,8 @@
#include "filters.h"
static __inline__ void flipVertical(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
static __inline__ void flipVertical(char * source, int srcWidth, int srcHeight, char * destination,
int dstWidth __unused, int dstHeight __unused) {
//Vertical
size_t cpy_bytes = sizeof(char) * 4;
int width = cpy_bytes * srcWidth;
......@@ -33,7 +34,8 @@ static __inline__ void flipVertical(char * source, int srcWidth, int srcHeight,
}
}
static __inline__ void flipHorizontal(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
static __inline__ void flipHorizontal(char * source, int srcWidth, int srcHeight,
char * destination, int dstWidth __unused, int dstHeight __unused) {
//Horizontal
size_t cpy_bytes = sizeof(char) * 4;
int width = cpy_bytes * srcWidth;
......@@ -72,11 +74,11 @@ static __inline__ void flip_fun(int flip, char * source, int srcWidth, int srcHe
}
//90 CCW (opposite of what's used in UI?)
static __inline__ void rotate90(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
static __inline__ void rotate90(char * source, int srcWidth, int srcHeight, char * destination,
int dstWidth __unused, int dstHeight __unused) {
size_t cpy_bytes = sizeof(char) * 4;
int width = cpy_bytes * srcWidth;
int length = srcHeight;
int total = length * width;
for (size_t j = 0; j < length * cpy_bytes; j+= cpy_bytes){
for (int i = 0; i < width; i+=cpy_bytes){
int column_disp = (width - cpy_bytes - i) * length;
......@@ -120,7 +122,6 @@ static __inline__ void crop(char * source, int srcWidth, int srcHeight, char * d
if ((srcWidth > dstWidth + offsetWidth) || (srcHeight > dstHeight + offsetHeight)){
return;
}
int i = 0;
int j = 0;
for (j = offsetHeight; j < offsetHeight + dstHeight; j++){
memcpy(destination + (j - offsetHeight) * new_row_width, source + j * row_width + offsetWidth * cpy_bytes, cpy_bytes * dstWidth );
......@@ -143,7 +144,6 @@ void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterFlip, jobject src, jint srcW
void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterRotate, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jint rotate) {
char* destination = 0;
char* source = 0;
int len = dstWidth * dstHeight * 4;
AndroidBitmap_lockPixels(env, src, (void**) &source);
AndroidBitmap_lockPixels(env, dst, (void**) &destination);
rotate_fun(rotate, source, srcWidth, srcHeight, destination, dstWidth, dstHeight);
......@@ -154,7 +154,6 @@ void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterRotate, jobject src, jint sr
void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterCrop, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jint offsetWidth, jint offsetHeight) {
char* destination = 0;
char* source = 0;
int len = dstWidth * dstHeight * 4;
AndroidBitmap_lockPixels(env, src, (void**) &source);
AndroidBitmap_lockPixels(env, dst, (void**) &destination);
crop(source, srcWidth, srcHeight, destination, dstWidth, dstHeight, offsetWidth, offsetHeight);
......@@ -162,7 +161,9 @@ void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterCrop, jobject src, jint srcW
AndroidBitmap_unlockPixels(env, src);
}
void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterStraighten, jobject src, jint srcWidth, jint srcHeight, jobject dst, jint dstWidth, jint dstHeight, jfloat straightenAngle) {
void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterStraighten, jobject src, jint srcWidth __unused,
jint srcHeight __unused, jobject dst, jint dstWidth, jint dstHeight,
jfloat straightenAngle __unused) {
char* destination = 0;
char* source = 0;
int len = dstWidth * dstHeight * 4;
......@@ -171,11 +172,8 @@ void JNIFUNCF(ImageFilterGeometry, nativeApplyFilterStraighten, jobject src, jin
// TODO: implement straighten
int i = 0;
for (; i < len; i += 4) {
int r = source[RED];
int g = source[GREEN];
int b = source[BLUE];
destination[RED] = 128;
destination[GREEN] = g;
destination[GREEN] = source[GREEN];
destination[BLUE] = 128;
}
AndroidBitmap_unlockPixels(env, dst);
......
......@@ -32,8 +32,8 @@ int isRed(unsigned char *src, int p) {
return ((r * 100 / (max + 2) > 160) & (max < 80));
}
void findPossible(unsigned char *src, unsigned char *mask, int iw, int ih,
short *rect) {
void findPossible(unsigned char *src, unsigned char *mask, int iw,
int ih __unused, short *rect) {
int recX = rect[0], recY = rect[1], recW = rect[2], recH = rect[3];
int y, x;
......@@ -53,7 +53,7 @@ void findPossible(unsigned char *src, unsigned char *mask, int iw, int ih,
}
}
void findReds(unsigned char *src, unsigned char *mask, int iw, int ih,
void findReds(unsigned char *src, unsigned char *mask, int iw, int ih __unused,
short *rect) {
int recX = rect[0], recY = rect[1], recW = rect[2], recH = rect[3];
int y, x;
......@@ -70,8 +70,8 @@ void findReds(unsigned char *src, unsigned char *mask, int iw, int ih,
}
}
void dialateMaskIfRed(unsigned char *src, int iw, int ih, unsigned char *mask,
unsigned char *out, short *rect) {
void dialateMaskIfRed(unsigned char *src, int iw, int ih __unused,
unsigned char *mask, unsigned char *out, short *rect) {
int recX = rect[0], recY = rect[1], recW = rect[2], recH = rect[3];
int y, x;
......@@ -113,7 +113,6 @@ void filterRedEye(unsigned char *src, unsigned char *dest, int iw, int ih, short
int recX = rect[0], recY = rect[1], recW = rect[2], recH = rect[3];
unsigned char *mask1 = (unsigned char *) malloc(recW * recH);
unsigned char *mask2 = (unsigned char *)malloc(recW*recH);
int QUE_LEN = 100;
int y, x, i;
rect[0] = MAX(rect[0],0);
......
......@@ -36,7 +36,6 @@ void JNIFUNCF(ImageFilterSaturated, nativeApplyFilter, jobject bitmap, jint widt
int r = destination[RED];
int g = destination[GREEN];
int b = destination[BLUE];
int t = (r + g) / 2;
R = r;
G = g;
B = b;
......
......@@ -45,7 +45,6 @@ void JNIFUNCF(ImageFilterVibrance, nativeApplyFilter, jobject bitmap, jint width
Rt = Rf * MS;
Gt = Gf * MS;
Bt = Bf * MS;
int t = (r + g) / 2;
R = r;
G = g;
B = b;
......
......@@ -38,7 +38,7 @@ static bool egl_khr_fence_sync_supported = false;
bool IsEglKHRFenceSyncSupported() {
if (!initialized) {
EGLDisplay display = eglGetCurrentDisplay();
const char* eglExtensions = eglQueryString(eglGetCurrentDisplay(), EGL_EXTENSIONS);
const char* eglExtensions = eglQueryString(display, EGL_EXTENSIONS);
if (eglExtensions && strstr(eglExtensions, "EGL_KHR_fence_sync")) {
FuncEglCreateSyncKHR = (TypeEglCreateSyncKHR) eglGetProcAddress("eglCreateSyncKHR");
FuncEglClientWaitSyncKHR = (TypeEglClientWaitSyncKHR) eglGetProcAddress("eglClientWaitSyncKHR");
......@@ -54,8 +54,8 @@ bool IsEglKHRFenceSyncSupported() {
}
void
Java_com_android_gallery3d_photoeditor_FilterStack_nativeEglSetFenceAndWait(JNIEnv* env,
jobject thiz) {
Java_com_android_gallery3d_photoeditor_FilterStack_nativeEglSetFenceAndWait(
JNIEnv* env __unused, jobject thiz __unused) {
if (!IsEglKHRFenceSyncSupported()) return;
EGLDisplay display = eglGetCurrentDisplay();
......
......@@ -9,8 +9,7 @@ LOCAL_MODULE := libjni_gallery_jpegstream
LOCAL_NDK_STL_VARIANT := stlport_static
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
$(LOCAL_PATH)/src \
external/jpeg
$(LOCAL_PATH)/src
LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk
......@@ -18,7 +17,7 @@ LOCAL_SDK_VERSION := 17
LOCAL_ARM_MODE := arm
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
LOCAL_CPPFLAGS += $(JNI_CFLAGS)
LOCAL_CFLAGS += -Wall -Wextra
LOCAL_LDLIBS := -llog
LOCAL_CPP_EXTENSION := .cpp
......
......@@ -34,7 +34,6 @@ void ErrExit(j_common_ptr cinfo) {
* to logcat's error log.
*/
void ErrOutput(j_common_ptr cinfo) {
ErrManager* mgr = reinterpret_cast<ErrManager*>(cinfo->err);
char buf[JMSG_LENGTH_MAX];
(*cinfo->err->format_message) (cinfo, buf);
buf[JMSG_LENGTH_MAX - 1] = '\0'; // Force null terminator
......
......@@ -121,7 +121,7 @@ void Mgr_skip_input_data_fcn(j_decompress_ptr cinfo, long num_bytes) {
return;
}
SourceManager *src = reinterpret_cast<SourceManager*>(cinfo->src);
if (src->mgr.bytes_in_buffer >= num_bytes) {
if (src->mgr.bytes_in_buffer >= (size_t)num_bytes) {
src->mgr.bytes_in_buffer -= num_bytes;
src->mgr.next_input_byte += num_bytes;
} else {
......@@ -149,7 +149,7 @@ void Mgr_skip_input_data_fcn(j_decompress_ptr cinfo, long num_bytes) {
}
}
void Mgr_term_source_fcn(j_decompress_ptr cinfo) {
void Mgr_term_source_fcn(j_decompress_ptr cinfo __unused) {
//noop
}
......
......@@ -215,7 +215,6 @@ void JpegReader::formatPixels(uint8_t* buf, int32_t len) {
// Do endianness and alpha for output format
if (mFormat == Jpeg_Config::FORMAT_RGBA) {
// Set alphas to 255
uint8_t* end = buf + len - 1;
for (int i = len - 1; i >= 0; i -= 4) {
buf[i] = 255;
buf[i - 1] = *--iter;
......@@ -224,7 +223,6 @@ void JpegReader::formatPixels(uint8_t* buf, int32_t len) {
}
} else if (mFormat == Jpeg_Config::FORMAT_ABGR) {
// Reverse endianness and set alphas to 255
uint8_t* end = buf + len - 1;
int r, g, b;
for (int i = len - 1; i >= 0; i -= 4) {
b = *--iter;
......
......@@ -323,7 +323,7 @@ static int registerNativeMethods(JNIEnv* env, const char* className,
return JNI_TRUE;
}
jint JNI_OnLoad(JavaVM* vm, void* reserved) {
jint JNI_OnLoad(JavaVM* vm, void* reserved __unused) {
JNIEnv* env;
if (vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6) != JNI_OK) {
LOGE("Error: GetEnv failed in JNI_OnLoad");
......
......@@ -87,6 +87,9 @@
-keep class com.android.gallery3d.jpegstream.JPEGInputStream { *; }
-keep class com.android.gallery3d.jpegstream.StreamUtils { *; }
-keep class com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine{
# TODO: remove or rename android.util.Pools.java from our source.
-dontwarn android.util.Pools*
-keep class com.thundersoft.hz.selfportrait.makeup.engine.MakeupEngine {
*;
}
......@@ -56,8 +56,8 @@
<string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
<string name="aspect3to4_effect" msgid="7078163990979248864">"3:4"</string>
<string name="aspect4to6_effect" msgid="1410129351686165654">"4:6"</string>
<string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
<string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
<string name="aspect5to7_effect" msgid="5122395569059384741">"۵:۷"</string>
<string name="aspect7to5_effect" msgid="5780001758108328143">"۷:۵"</string>
<string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
<string name="aspectNone_effect" msgid="6263330561046574134">"لا شيء"</string>
<!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
......
This diff is collapsed.
This diff is collapsed.
......@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="title_activity_filter_show" msgid="2036539130684382763">"ফটো সম্পাদক"</string>
<string name="cannot_load_image" msgid="5023634941212959976">"চিত্রটি লোড করা যাবে না!"</string>
<string name="cannot_load_image" msgid="5023634941212959976">"ছবিটি লোড করা যাবে না!"</string>
<string name="cannot_edit_original" msgid="5890293845882609388">"আসলটি সম্পাদনা করতে পারবেন না"</string>
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
......@@ -27,13 +27,13 @@
<string name="borders" msgid="2067345080568684614">"সীমানাগুলি"</string>
<string name="custom_border" msgid="8679893731790931871">"কাস্টম"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"পূর্বাবস্থায় ফিরুন"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"পুনরায় করুন"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"আবার করুন"</string>
<string name="show_imagestate_panel" msgid="281932769701043015">"প্রয়োগ করা প্রভাবগুলি দেখান"</string>
<string name="hide_imagestate_panel" msgid="7207643485811695257">"প্রয়োগ করা প্রভাবগুলি লুকান"</string>
<string name="export_image" msgid="3202835713172222134">"রপ্তানি"</string>
<string name="print_image" msgid="1942989216591621413">"মুদ্রণ করুন"</string>
<string name="export_flattened" msgid="9046192331465915411">"চ্যাপ্টা চিত্র রপ্তানি করুন"</string>
<string name="select_output_settings" msgid="1268532018080310748">"রপ্তানি করা চিত্রটি ইতিহাস ছাড়া, একটি অনুলিপি হবে।"</string>
<string name="print_image" msgid="1942989216591621413">"প্রিন্ট করুন"</string>
<string name="export_flattened" msgid="9046192331465915411">"চ্যাপ্টা ছবি রপ্তানি করুন"</string>
<string name="select_output_settings" msgid="1268532018080310748">"রপ্তানি করা ছবিটি ইতিহাস ছাড়া, একটি অনুলিপি হবে।"</string>
<string name="quality" msgid="179292110309050529">"গুণমান"</string>
<string name="size" msgid="4639404642236356037">"আকার"</string>
<string name="x" msgid="6810256999024563662">"x"</string>
......@@ -44,13 +44,13 @@
<string name="save_and_processing" msgid="6371565035837463194">"পূর্ণ রেজোলিউশানের চিত্রের প্রক্রিয়া করা হচ্ছে..."</string>
<string name="exit" msgid="242642957038770113">"প্রস্থান করুন"</string>
<string name="history" msgid="455767361472692409">"ইতিহাস"</string>
<string name="reset" msgid="9013181350779592937">"পুনরায় সেট করুন"</string>
<string name="reset" msgid="9013181350779592937">"আবার সেট করুন"</string>
<!-- no translation found for history_original (150973253194312841) -->
<skip />
<string name="imageState" msgid="8632586742752891968">"প্রয়োগ করা প্রভাবগুলি"</string>
<string name="compare_original" msgid="8140838959007796977">"তুলনা করুন"</string>
<string name="apply_effect" msgid="1218288221200568947">"প্রয়োগ করুন"</string>
<string name="reset_effect" msgid="7712605581024929564">"পুনরায় সেট করুন"</string>
<string name="reset_effect" msgid="7712605581024929564">"আবার সেট করুন"</string>
<string name="aspect" msgid="4025244950820813059">"আসপেক্ট"</string>
<string name="aspect1to1_effect" msgid="1159104543795779123">"১:১"</string>
<string name="aspect4to3_effect" msgid="7968067847241223578">"৪.৩"</string>
......@@ -124,19 +124,19 @@
<string name="color_border_color" msgid="8765458414425980711">"রঙ"</string>
<string name="color_border_clear" msgid="4418261191091091722">"সাফ করুন"</string>
<string name="color_pick_select" msgid="734312818059057394">"কাস্টম রঙ চয়ন করুন"</string>
<string name="color_pick_title" msgid="6195567431995308876">"রঙ নির্বাচন করুন"</string>
<string name="draw_size_title" msgid="3121649039610273977">"আকার নির্বাচন করুন"</string>
<string name="color_pick_title" msgid="6195567431995308876">"রঙ বেছে নিন"</string>
<string name="draw_size_title" msgid="3121649039610273977">"আকার বেছে নিন"</string>
<string name="draw_size_accept" msgid="6781529716526190028">"ঠিক আছে"</string>
<string name="state_panel_original" msgid="9069584409934164419">"প্রকৃত"</string>
<string name="state_panel_result" msgid="318640531123298676">"ফলাফল"</string>
<string name="filtershow_notification_label" msgid="1653168445525855247">"চিত্র সংরক্ষণ করা হচ্ছে"</string>
<string name="filtershow_notification_label" msgid="1653168445525855247">"ছবি সংরক্ষণ করা হচ্ছে"</string>
<string name="filtershow_notification_message" msgid="2661871765484036286">"প্রক্রিয়া করা হচ্ছে..."</string>
<string name="filtershow_save_preset" msgid="3933550455577927439">"বর্তমান প্রিসেট সংরক্ষণ করুন"</string>
<string name="filtershow_save_preset" msgid="3933550455577927439">"বর্তমান প্রিসেট সেভ করুন"</string>
<string name="filtershow_manage_preset" msgid="3872896753708921286">"ব্যবহারকারী প্রিসেটগুলি পরিচালনা করুন"</string>
<string name="filtershow_new_preset" msgid="8923930134923416617">"নতুন প্রিসেট"</string>
<string name="filtershow_preset_name" msgid="7015939727047649866">"প্রিসেট নাম"</string>
<string name="filtershow_show_info_panel" msgid="5773036746043711115">"তথ্য"</string>
<string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"চিত্র নাম"</string>
<string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"ছবি নাম"</string>
<string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"চিত্রের আকার"</string>
<string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"হিস্টোগ্রাম"</string>
<string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF ডেটা"</string>
......
This diff is collapsed.
......@@ -131,22 +131,22 @@
<string name="state_panel_result" msgid="318640531123298676">"Resultat"</string>
<string name="filtershow_notification_label" msgid="1653168445525855247">"S\'està desant la imatge"</string>
<string name="filtershow_notification_message" msgid="2661871765484036286">"S\'està processant..."</string>
<string name="filtershow_save_preset" msgid="3933550455577927439">"Desa config. predet. actual"</string>
<string name="filtershow_manage_preset" msgid="3872896753708921286">"Gestiona config. pred. usuari"</string>
<string name="filtershow_new_preset" msgid="8923930134923416617">"Configuració predet. nova"</string>
<string name="filtershow_preset_name" msgid="7015939727047649866">"Nom de la configuració pred."</string>
<string name="filtershow_save_preset" msgid="3933550455577927439">"Desa valor predefinit"</string>
<string name="filtershow_manage_preset" msgid="3872896753708921286">"Gestiona els valors predefinits de l\'usuari"</string>
<string name="filtershow_new_preset" msgid="8923930134923416617">"Nou valor predefinit"</string>
<string name="filtershow_preset_name" msgid="7015939727047649866">"Nom de valors predefinits"</string>
<string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informació"</string>
<string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Nom de la imatge"</string>
<string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Mida de la imatge"</string>
<string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histograma"</string>
<string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Dades EXIF"</string>
<string name="filtershow_add_button_looks" msgid="8630823661416925426">"Configuració predeterminada"</string>
<string name="filtershow_add_button_looks" msgid="8630823661416925426">"Valors predefinits"</string>
<string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versió"</string>
<string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
<string name="filtershow_version_current" msgid="6609334422797468952">"Actual"</string>
<string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
<string name="filtershow_exif_aperture" msgid="5076571522763604380">"Obertura"</string>
<string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Longitud focal"</string>
<string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Distància focal"</string>
<string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
<string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Distància de l\'individu"</string>
<string name="filtershow_exif_date" msgid="8882402253732028544">"Data de realització"</string>
......
......@@ -39,7 +39,7 @@
<string name="x" msgid="6810256999024563662">"x"</string>
<string name="menu_settings" msgid="6428291655769260831">"Einstellungen"</string>
<string name="unsaved" msgid="8704442449002374375">"Das Bild weist nicht gespeicherte Änderungen auf."</string>
<string name="save_before_exit" msgid="2680660633675916712">"Möchten Sie vor dem Schließen speichern?"</string>
<string name="save_before_exit" msgid="2680660633675916712">"Möchtest du vor dem Schließen speichern?"</string>
<string name="save_and_exit" msgid="3628425023766687419">"Speichern und schließen"</string>
<string name="save_and_processing" msgid="6371565035837463194">"Bild mit hoher Auflösung wird verarbeitet..."</string>
<string name="exit" msgid="242642957038770113">"Schließen"</string>
......
This diff is collapsed.
This diff is collapsed.
......@@ -22,7 +22,7 @@
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"تنظیم کاغذدیواری"</string>
<string name="download_failure" msgid="5923323939788582895">"دانلود عکس انجام نشد. شبکه در دسترس نیست."</string>
<string name="download_failure" msgid="5923323939788582895">"بارگیری عکس انجام نشد. شبکه در دسترس نیست."</string>
<string name="original" msgid="3524493791230430897">"اصلی"</string>
<string name="borders" msgid="2067345080568684614">"حاشیه‌ها"</string>
<string name="custom_border" msgid="8679893731790931871">"سفارشی"</string>
......
......@@ -126,7 +126,7 @@
<string name="color_pick_select" msgid="734312818059057394">"કસ્ટમ રંગ પસંદ કરો"</string>
<string name="color_pick_title" msgid="6195567431995308876">"રંગ પસંદ કરો"</string>
<string name="draw_size_title" msgid="3121649039610273977">"કદ પસંદ કરો"</string>
<string name="draw_size_accept" msgid="6781529716526190028">"કે"</string>
<string name="draw_size_accept" msgid="6781529716526190028">"કે"</string>
<string name="state_panel_original" msgid="9069584409934164419">"મૂળભૂત"</string>
<string name="state_panel_result" msgid="318640531123298676">"પરિણામ"</string>
<string name="filtershow_notification_label" msgid="1653168445525855247">"ચિત્ર સાચવી રહ્યું છે"</string>
......
......@@ -33,7 +33,7 @@
<string name="export_image" msgid="3202835713172222134">"निर्यात करें"</string>
<string name="print_image" msgid="1942989216591621413">"प्रिंट करें"</string>
<string name="export_flattened" msgid="9046192331465915411">"चौरस चित्र निर्यात करें"</string>
<string name="select_output_settings" msgid="1268532018080310748">"निर्यात किया गया चित्र, इतिहास के बिना एक प्रतिलिपि होगा."</string>
<string name="select_output_settings" msgid="1268532018080310748">"निर्यात किया गया चित्र, इतिहास के बिना एक कॉपी होगा."</string>
<string name="quality" msgid="179292110309050529">"गुणवत्ता"</string>
<string name="size" msgid="4639404642236356037">"आकार"</string>
<string name="x" msgid="6810256999024563662">"x"</string>
......
......@@ -132,7 +132,7 @@
<string name="filtershow_notification_label" msgid="1653168445525855247">"Պատկերը պահվում է"</string>
<string name="filtershow_notification_message" msgid="2661871765484036286">"Մշակվում է..."</string>
<string name="filtershow_save_preset" msgid="3933550455577927439">"Պահել ներկայիս նախակայումը"</string>
<string name="filtershow_manage_preset" msgid="3872896753708921286">"Կառավարել օգտվողի նախակայումները"</string>
<string name="filtershow_manage_preset" msgid="3872896753708921286">"Կառավարել օգտատիրոջ նախակայումները"</string>
<string name="filtershow_new_preset" msgid="8923930134923416617">"Նոր նախակայում"</string>
<string name="filtershow_preset_name" msgid="7015939727047649866">"Նախակայման անունը"</string>
<string name="filtershow_show_info_panel" msgid="5773036746043711115">"Տեղեկություններ"</string>
......
......@@ -16,9 +16,9 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="title_activity_filter_show" msgid="2036539130684382763">"ಫೋಟೋ ಸಂಪಾದಕ"</string>
<string name="title_activity_filter_show" msgid="2036539130684382763">"ಫೋಟೋ ಎಡಿಟರ್"</string>
<string name="cannot_load_image" msgid="5023634941212959976">"ಚಿತ್ರವನ್ನು ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಿಲ್ಲ!"</string>
<string name="cannot_edit_original" msgid="5890293845882609388">"ಮೂಲ ಚಿತ್ರವನ್ನು ಸಂಪಾದಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
<string name="cannot_edit_original" msgid="5890293845882609388">"ಮೂಲ ಚಿತ್ರವನ್ನು ಎಡಿಟ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ"</string>
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"ವಾಲ್‌ಪೇಪರ್ ಹೊಂದಿಸಲಾಗುತ್ತಿದೆ"</string>
......@@ -26,7 +26,7 @@
<string name="original" msgid="3524493791230430897">"ಮೂಲ"</string>
<string name="borders" msgid="2067345080568684614">"ಅಂಚುಗಳು"</string>
<string name="custom_border" msgid="8679893731790931871">"ಕಸ್ಟಮ್"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"ರದ್ದುಮಾಡ"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"ರದ್ದುಮಾಡಿ"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"ಮತ್ತೆಮಾಡು"</string>
<string name="show_imagestate_panel" msgid="281932769701043015">"ಅನ್ವಯಿಸಿದ ಪರಿಣಾಮಗಳನ್ನು ತೋರಿಸಿ"</string>
<string name="hide_imagestate_panel" msgid="7207643485811695257">"ಅನ್ವಯಿಸಿರುವ ಪರಿಣಾಮಗಳನ್ನು ಮಾರೆಮಾಡಿ"</string>
......@@ -42,7 +42,7 @@
<string name="save_before_exit" msgid="2680660633675916712">"ನೀವು ನಿರ್ಗಮಿಸುವುದಕ್ಕೂ ಮೊದಲು ಉಳಿಸಲು ಬಯಸುತ್ತೀರಾ?"</string>
<string name="save_and_exit" msgid="3628425023766687419">"ಉಳಿಸಿ ಮತ್ತು ನಿರ್ಗಮಿಸಿ"</string>
<string name="save_and_processing" msgid="6371565035837463194">"ಸಂಪೂರ್ಣ ರೆಸಲ್ಯೂಶನ್ ಚಿತ್ರವನ್ನು ಪ್ರಕ್ರಿಯಗೊಳಿಸಲಾಗುತ್ತಿದೆ..."</string>
<string name="exit" msgid="242642957038770113">"ನಿರ್ಗಮಿಸ"</string>
<string name="exit" msgid="242642957038770113">"ನಿರ್ಗಮಿಸಿ"</string>
<string name="history" msgid="455767361472692409">"ಇತಿಹಾಸ"</string>
<string name="reset" msgid="9013181350779592937">"ಮರುಹೊಂದಿಸು"</string>
<!-- no translation found for history_original (150973253194312841) -->
......
......@@ -37,7 +37,7 @@
<string name="quality" msgid="179292110309050529">"Квалитет"</string>
<string name="size" msgid="4639404642236356037">"Големина"</string>
<string name="x" msgid="6810256999024563662">"x"</string>
<string name="menu_settings" msgid="6428291655769260831">"Подесувања"</string>
<string name="menu_settings" msgid="6428291655769260831">"Поставки"</string>
<string name="unsaved" msgid="8704442449002374375">"Постојат незачувани промени на оваа слика."</string>
<string name="save_before_exit" msgid="2680660633675916712">"Дали сакате да зачувате пред да излезете?"</string>
<string name="save_and_exit" msgid="3628425023766687419">"Зачувај и излези"</string>
......
......@@ -152,5 +152,5 @@
<string name="filtershow_exif_date" msgid="8882402253732028544">"എടുത്ത തീയതി"</string>
<string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F നിർത്തുക"</string>
<string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"എക്‌സ്പോഷർ സമയം"</string>
<string name="filtershow_exif_copyright" msgid="8801875918803737581">"പകര്‍പ്പവകാശം"</string>
<string name="filtershow_exif_copyright" msgid="8801875918803737581">"പകപ്പവകാശം"</string>
</resources>
......@@ -17,7 +17,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="title_activity_filter_show" msgid="2036539130684382763">"Фото Засагч"</string>
<string name="cannot_load_image" msgid="5023634941212959976">"Зураг ачааллах боломжгүй!"</string>
<string name="cannot_load_image" msgid="5023634941212959976">"Зураг ачаалах боломжгүй!"</string>
<string name="cannot_edit_original" msgid="5890293845882609388">"Эх хувийг засах боломжгүй"</string>
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
......@@ -126,7 +126,7 @@
<string name="color_pick_select" msgid="734312818059057394">"Өнгө тохируулж сонгох"</string>
<string name="color_pick_title" msgid="6195567431995308876">"Өнгө сонгох"</string>
<string name="draw_size_title" msgid="3121649039610273977">"Хэмжээ сонгох"</string>
<string name="draw_size_accept" msgid="6781529716526190028">"Тийм"</string>
<string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
<string name="state_panel_original" msgid="9069584409934164419">"Эх хувь"</string>
<string name="state_panel_result" msgid="318640531123298676">"Үр дүн"</string>
<string name="filtershow_notification_label" msgid="1653168445525855247">"Зургийг хадгалж байна"</string>
......
......@@ -44,13 +44,13 @@
<string name="save_and_processing" msgid="6371565035837463194">"ကြည်လင်မှုအပြည့်ပုံအား လုပ်ဆောင်နေစဉ်..."</string>
<string name="exit" msgid="242642957038770113">"ထွက်ပေါက်"</string>
<string name="history" msgid="455767361472692409">"မှတ်တမ်း"</string>
<string name="reset" msgid="9013181350779592937">"ပြန်လည်စတင်စေရန်"</string>
<string name="reset" msgid="9013181350779592937">"ပြန်လည်သတ်မှတ်ရန်"</string>
<!-- no translation found for history_original (150973253194312841) -->
<skip />
<string name="imageState" msgid="8632586742752891968">"လုပ်ထားသော အထူးပြုလုပ်ချက်များ"</string>
<string name="compare_original" msgid="8140838959007796977">"နှိုင်းယှဉ်ရန်"</string>
<string name="apply_effect" msgid="1218288221200568947">"လုပ်ဆောင်ရန်"</string>
<string name="reset_effect" msgid="7712605581024929564">"ပြန်လည်စတင်စေရန်"</string>
<string name="reset_effect" msgid="7712605581024929564">"ပြန်လည်သတ်မှတ်ရန်"</string>
<string name="aspect" msgid="4025244950820813059">"အလိုက်သင့်"</string>
<string name="aspect1to1_effect" msgid="1159104543795779123">"၁:၁"</string>
<string name="aspect4to3_effect" msgid="7968067847241223578">"၄:၃"</string>
......@@ -118,11 +118,11 @@
<string name="draw_style_line" msgid="9216476853904429628">"စာကြောင်းများ"</string>
<string name="draw_style_brush_spatter" msgid="7612691122932981554">"မှတ်သားမှု"</string>
<string name="draw_style_brush_marker" msgid="8468302322165644292">"Spatter"</string>
<string name="draw_clear" msgid="6728155515454921052">"ရှင်းလင်းရန်"</string>
<string name="draw_clear" msgid="6728155515454921052">"ဖယ်ရှားရန်"</string>
<string name="color_border_size" msgid="1086895807615869290">"အထူ"</string>
<string name="color_border_corner_size" msgid="7637235159438869979">"ထောင့်အရွယ်"</string>
<string name="color_border_color" msgid="8765458414425980711">"ရောင်စုံ"</string>
<string name="color_border_clear" msgid="4418261191091091722">"ရှင်းလင်းရန်"</string>
<string name="color_border_clear" msgid="4418261191091091722">"ဖယ်ရှားရန်"</string>
<string name="color_pick_select" msgid="734312818059057394">"မိမိစိတ်ကြိုက်အရောင်းရွေးရန်"</string>
<string name="color_pick_title" msgid="6195567431995308876">"အရောင်ရွေးရန်"</string>
<string name="draw_size_title" msgid="3121649039610273977">"အရွယ်အစားရွေးရန်"</string>
......
......@@ -16,30 +16,30 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="title_activity_filter_show" msgid="2036539130684382763">"फोटो सम्पादक"</string>
<string name="title_activity_filter_show" msgid="2036539130684382763">"तस्बिर सम्पादक"</string>
<string name="cannot_load_image" msgid="5023634941212959976">"तस्बिर लोड गर्न सकेन!"</string>
<string name="cannot_edit_original" msgid="5890293845882609388">"मूल सम्पादन गर्न सक्दैन"</string>
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"सेटिङ वालपेपर"</string>
<string name="download_failure" msgid="5923323939788582895">"फोटो डाउनलोड गर्न सकेन। नेटवर्क उपलब्ध छैन।"</string>
<string name="download_failure" msgid="5923323939788582895">"तस्बिर डाउनलोड गर्न सकेन। नेटवर्क उपलब्ध छैन।"</string>
<string name="original" msgid="3524493791230430897">"मूल"</string>
<string name="borders" msgid="2067345080568684614">"किनाराहरू"</string>
<string name="custom_border" msgid="8679893731790931871">"अनुकूलन"</string>
<string name="custom_border" msgid="8679893731790931871">"आफू अनुकूल"</string>
<string name="filtershow_undo" msgid="6781743189243585101">"अन्डु गर्नुहोस्"</string>
<string name="filtershow_redo" msgid="4219489910543059747">"पुनःगर्नुहोस्"</string>
<string name="show_imagestate_panel" msgid="281932769701043015">"एप्लाइड प्रभावहरू देखाउनुहोस्"</string>
<string name="hide_imagestate_panel" msgid="7207643485811695257">"एप्लाइड प्रभाव लुकाउनुहोस्"</string>
<string name="export_image" msgid="3202835713172222134">"निर्यात गर्नुहोस्"</string>
<string name="print_image" msgid="1942989216591621413">"प्रिन्ट गर्नुहोस्"</string>
<string name="export_flattened" msgid="9046192331465915411">"सिधा गरिएको चित्र निर्यात गर्नुहोस्"</string>
<string name="export_flattened" msgid="9046192331465915411">"सधा गरिएको चित्र निर्यात गर्नुहोस्"</string>
<string name="select_output_settings" msgid="1268532018080310748">"निर्यात गरिएको चित्र इतिहास बिना प्रतिलिपि हुने छ।"</string>
<string name="quality" msgid="179292110309050529">"गुण"</string>
<string name="size" msgid="4639404642236356037">"आकार"</string>
<string name="x" msgid="6810256999024563662">"x"</string>
<string name="menu_settings" msgid="6428291655769260831">"सेटिङहरू"</string>
<string name="unsaved" msgid="8704442449002374375">"यो तस्बिरमा बचत नगरिएका परिवर्तनहरू छन्।"</string>
<string name="save_before_exit" msgid="2680660633675916712">"के तपाई निस्कनुभन्दा पहिले बचत गर्न चाहनु हुन्छ?"</string>
<string name="save_before_exit" msgid="2680660633675916712">"के तपाई निस्कनुभन्दा पहिले बचत गर्न चाहनु हुन्छ?"</string>
<string name="save_and_exit" msgid="3628425023766687419">"बचत गरेर निस्कनुहोस्"</string>
<string name="save_and_processing" msgid="6371565035837463194">"पूर्ण रिजोलुसन चित्र प्रसोधन गर्दै"</string>
<string name="exit" msgid="242642957038770113">"निकास"</string>
......@@ -126,7 +126,7 @@
<string name="color_pick_select" msgid="734312818059057394">"कस्टम रङ्ग छान्नुहोस्"</string>
<string name="color_pick_title" msgid="6195567431995308876">"रङ्ग छान्नुहोस्"</string>
<string name="draw_size_title" msgid="3121649039610273977">"साइज चयन गर्नुहोस्"</string>
<string name="draw_size_accept" msgid="6781529716526190028">"ठिक छ"</string>
<string name="draw_size_accept" msgid="6781529716526190028">"ठक छ"</string>
<string name="state_panel_original" msgid="9069584409934164419">"मूल"</string>
<string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
<string name="filtershow_notification_label" msgid="1653168445525855247">"चित्र सुरक्षित गर्दै"</string>
......
......@@ -16,17 +16,17 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="title_activity_filter_show" msgid="2036539130684382763">"ਫੋਟੋ ਸੰਪਾਦਕ"</string>
<string name="title_activity_filter_show" msgid="2036539130684382763">"ਫੋਟੋ ਸੰਪਾਦਕ"</string>
<string name="cannot_load_image" msgid="5023634941212959976">"ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ!"</string>
<string name="cannot_edit_original" msgid="5890293845882609388">"ਮੂਲ ਨੂੰ ਸੰਪਾਦਿਤ ਨਹੀਂ ਕਰ ਸਕਦਾ"</string>
<!-- no translation found for original_picture_text (3076213290079909698) -->
<skip />
<string name="setting_wallpaper" msgid="4679087092300036632">"ਵਾਲਪੇਪਰ ਸੈਟ ਕਰ ਰਿਹਾ ਹੈ"</string>
<string name="download_failure" msgid="5923323939788582895">"ਫੋਟੋ ਡਾਊਨਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ। ਨੈਟਵਰਕ ਅਣਉਪਲਬਧ।"</string>
<string name="download_failure" msgid="5923323939788582895">"ਫ਼ੋਟੋ ਡਾਊਨਲੋਡ ਨਹੀਂ ਕਰ ਸਕਿਆ। ਨੈੱਟਵਰਕ ਅਣਉਪਲਬਧ।"</string>
<string name="original" msgid="3524493791230430897">"ਮੂਲ"</string>