Import translations. DO NOT MERGE am: c92d371104 -s ours
am: c2b38be10f -s ours
Change-Id: I259a242b5481025eb5eaaaffc56a9c22f5cdc424
diff --git a/jni/Android.mk b/jni/Android.mk
index 2d7a0c3..857fca2 100644
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -2,7 +2,7 @@
include $(CLEAR_VARS)
-LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
+LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -Wno-unused-parameter
LOCAL_SRC_FILES := jni_egl_fence.cpp
@@ -44,7 +44,7 @@
filters/tinyplanet.cc \
filters/kmeans.cc
-LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops -Wno-unused-parameter
LOCAL_LDLIBS := -llog -ljnigraphics
LOCAL_ARM_MODE := arm
diff --git a/jni/filters/filters.h b/jni/filters/filters.h
index 14b69cd..6856a26 100644
--- a/jni/filters/filters.h
+++ b/jni/filters/filters.h
@@ -24,27 +24,27 @@
typedef unsigned int Color;
-#define SetColor(a, r, g, b) ((a << 24) | (b << 16) | (g << 8) | (r << 0));
+#define SetColor(a, r, g, b) (((a) << 24) | ((b) << 16) | ((g) << 8) | ((r) << 0));
#define GetA(color) (((color) >> 24) & 0xFF)
#define GetB(color) (((color) >> 16) & 0xFF)
#define GetG(color) (((color) >> 8) & 0xFF)
#define GetR(color) (((color) >> 0) & 0xFF)
-#define MIN(a, b) (a < b ? a : b)
-#define MAX(a, b) (a > b ? a : b)
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
#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 RED i
-#define GREEN i+1
-#define BLUE i+2
-#define ALPHA i+3
+#define GREEN (i+1)
+#define BLUE (i+2)
+#define ALPHA (i+3)
#define CLAMP(c) (MAX(0, MIN(255, c)))
-__inline__ unsigned char clamp(int c);
-__inline__ int clampMax(int c,int max);
+extern unsigned char clamp(int c);
+extern int clampMax(int c,int max);
extern void rgb2hsv( unsigned char *rgb,int rgbOff,unsigned short *hsv,int hsvOff);
extern void hsv2rgb(unsigned short *hsv,int hsvOff,unsigned char *rgb,int rgbOff);
diff --git a/jni/filters/geometry.c b/jni/filters/geometry.c
index b308213..b01e5e0 100644
--- a/jni/filters/geometry.c
+++ b/jni/filters/geometry.c
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-#include "filters.h"
#include <stdio.h>
+#include <stdlib.h>
+
+#include "filters.h"
static __inline__ void flipVertical(char * source, int srcWidth, int srcHeight, char * destination, int dstWidth, int dstHeight){
//Vertical
@@ -75,10 +77,8 @@
int width = cpy_bytes * srcWidth;
int length = srcHeight;
int total = length * width;
- int i = 0;
- int j = 0;
- for (j = 0; j < length * cpy_bytes; j+= cpy_bytes){
- for (i = 0; i < width; i+=cpy_bytes){
+ 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;
int row_disp = j;
memcpy(destination + column_disp + row_disp , source + j * srcWidth + i, cpy_bytes);
diff --git a/jni/filters/highlight.c b/jni/filters/highlight.c
index fe9b88f..567a216 100644
--- a/jni/filters/highlight.c
+++ b/jni/filters/highlight.c
@@ -15,6 +15,8 @@
*/
#include <math.h>
+#include <stdlib.h>
+
#include "filters.h"
void JNIFUNCF(ImageFilterHighlights, nativeApplyFilter, jobject bitmap,
diff --git a/jni/filters/redEyeMath.c b/jni/filters/redEyeMath.c
index 26f3f76..9a16d60 100644
--- a/jni/filters/redEyeMath.c
+++ b/jni/filters/redEyeMath.c
@@ -15,6 +15,8 @@
*/
#include <math.h>
+#include <stdlib.h>
+
#include "filters.h"
int value(int r, int g, int b) {
diff --git a/jni/filters/shadows.c b/jni/filters/shadows.c
index 38d64c8..5f802dd 100644
--- a/jni/filters/shadows.c
+++ b/jni/filters/shadows.c
@@ -15,6 +15,8 @@
*/
#include <math.h>
+#include <stdlib.h>
+
#include "filters.h"
void JNIFUNCF(ImageFilterShadows, nativeApplyFilter, jobject bitmap, jint width, jint height, float scale){
diff --git a/jni/filters/wbalance.c b/jni/filters/wbalance.c
index 7592a42..99a7d2e 100644
--- a/jni/filters/wbalance.c
+++ b/jni/filters/wbalance.c
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+#include <stdlib.h>
+
#include "filters.h"
void estmateWhite(unsigned char *src, int len, int *wr, int *wb, int *wg){
diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index 97d57ee..027bf92 100644
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -9,16 +9,14 @@
LOCAL_NDK_STL_VARIANT := stlport_static
LOCAL_C_INCLUDES := $(LOCAL_PATH) \
- $(LOCAL_PATH)/src \
- external/jpeg
+ $(LOCAL_PATH)/src
-LOCAL_SHARED_LIBRARIES := libjpeg
+LOCAL_STATIC_LIBRARIES := libjpeg_static_ndk
LOCAL_SDK_VERSION := 9
LOCAL_ARM_MODE := arm
LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
-LOCAL_CPPFLAGS += $(JNI_CFLAGS)
LOCAL_LDLIBS := -llog
LOCAL_CPP_EXTENSION := .cpp
diff --git a/jni_jpegstream/src/error_codes.h b/jni_jpegstream/src/error_codes.h
index be55a00..f224b4a 100644
--- a/jni_jpegstream/src/error_codes.h
+++ b/jni_jpegstream/src/error_codes.h
@@ -17,10 +17,10 @@
#ifndef JPEG_ERROR_CODES_H_
#define JPEG_ERROR_CODES_H_
-#define J_DONE -4
-#define J_EXCEPTION -3
-#define J_ERROR_BAD_ARGS -2
-#define J_ERROR_FATAL -1
+#define J_DONE (-4)
+#define J_EXCEPTION (-3)
+#define J_ERROR_BAD_ARGS (-2)
+#define J_ERROR_FATAL (-1)
#define J_SUCCESS 0
#endif // JPEG_ERROR_CODES_H_
diff --git a/res/values-ar/filtershow_strings.xml b/res/values-ar/filtershow_strings.xml
index f865db3..416906f 100644
--- a/res/values-ar/filtershow_strings.xml
+++ b/res/values-ar/filtershow_strings.xml
@@ -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">"۵:۷"</string>
- <string name="aspect7to5_effect" msgid="5780001758108328143">"۷:۵"</string>
+ <string name="aspect5to7_effect" msgid="5122395569059384741">"5:7"</string>
+ <string name="aspect7to5_effect" msgid="5780001758108328143">"7:5"</string>
<string name="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
<string name="aspectNone_effect" msgid="6263330561046574134">"لا شيء"</string>
<!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
diff --git a/res/values-be-rBY/filtershow_strings.xml b/res/values-be-rBY/filtershow_strings.xml
deleted file mode 100644
index 182bce1..0000000
--- a/res/values-be-rBY/filtershow_strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?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.
- -->
-
-<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">"Не атрымлiваецца загрузіць малюнак"</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="original" msgid="3524493791230430897">"Арыгiнал"</string>
- <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="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="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_and_exit" msgid="3628425023766687419">"Захаваць і выйсці"</string>
- <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>
- <!-- 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="aspect" msgid="4025244950820813059">"Аспект"</string>
- <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
- <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="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
- <string name="aspectNone_effect" msgid="6263330561046574134">"Няма"</string>
- <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
- <skip />
- <string name="Fixed" msgid="8017376448916924565">"Выпраўленыя"</string>
- <string name="tinyplanet" msgid="2783694326474415761">"Маленькая планета"</string>
- <string name="exposure" msgid="6526397045949374905">"Экспазіцыя"</string>
- <string name="sharpness" msgid="6463103068318055412">"Выразнасць"</string>
- <string name="contrast" msgid="2310908487756769019">"Кантраст"</string>
- <string name="vibrance" msgid="3326744578577835915">"Вібрацыя"</string>
- <string name="saturation" msgid="7026791551032438585">"Насычанасць"</string>
- <string name="bwfilter" msgid="8927492494576933793">"Чорна-белы фiльтр"</string>
- <string name="wbalance" msgid="6346581563387083613">"Aўтаколер"</string>
- <string name="hue" msgid="6231252147971086030">"Тон"</string>
- <string name="shadow_recovery" msgid="3928572915300287152">"Цені"</string>
- <string name="highlight_recovery" msgid="8262208470735204243">"Блікі"</string>
- <string name="curvesRGB" msgid="915010781090477550">"Пэндзаль"</string>
- <string name="vignette" msgid="934721068851885390">"Віньетка"</string>
- <string name="vignette_main" msgid="6046495605390665423">"Віньетка"</string>
- <string name="vignette_exposure" msgid="6862058227309534094">"Экспазіцыя"</string>
- <string name="vignette_saturation" msgid="1617055207565719771">"Насычанасць"</string>
- <string name="vignette_contrast" msgid="955732121756799897">"Кантраст"</string>
- <string name="vignette_falloff" msgid="690918055030064199">"Віньетаванне"</string>
- <string name="redeye" msgid="4508883127049472069">"Чырвонае вока"</string>
- <string name="imageDraw" msgid="6918552177844486656">"Намаляваць"</string>
- <string name="straighten" msgid="26025591664983528">"Выраўнаваць"</string>
- <string name="crop" msgid="5781263790107850771">"Абрэзаць"</string>
- <string name="rotate" msgid="2796802553793795371">"Павярнуць"</string>
- <string name="mirror" msgid="5482518108154883096">"Люстра"</string>
- <string name="negative" msgid="6998313764388022201">"Негатыў"</string>
- <string name="none" msgid="6633966646410296520">"Няма"</string>
- <string name="edge" msgid="7036064886242147551">"Краi"</string>
- <string name="kmeans" msgid="2080952022674981541">"Плакат"</string>
- <string name="downsample" msgid="3552938534146980104">"Паменшыць"</string>
- <string name="grad" msgid="546774853424848655">"Градыентны"</string>
- <string name="editor_grad_brightness" msgid="5937316734380235741">"Яркасць"</string>
- <string name="editor_grad_contrast" msgid="3454456673401803360">"Кантраст"</string>
- <string name="editor_grad_saturation" msgid="3760247354109521726">"Насычанасць"</string>
- <string name="editor_chan_sat_main" msgid="4427652337797121940">"Галоўны"</string>
- <string name="editor_chan_sat_red" msgid="1699222266490540696">"Чырвоны"</string>
- <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Жоўты"</string>
- <string name="editor_chan_sat_green" msgid="1514055896212975167">"Зялёны"</string>
- <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Блакітны"</string>
- <string name="editor_chan_sat_blue" msgid="384409736863387895">"Сiнi"</string>
- <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Пурпурны"</string>
- <string name="editor_grad_style" msgid="2168414479007745179">"Стыль"</string>
- <string name="editor_grad_new" msgid="4857265951369377379">"новы"</string>
- <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
- <string name="curves_channel_red" msgid="4199710104162111357">"Чырвоны"</string>
- <string name="curves_channel_green" msgid="3733003466905031016">"Зялёны"</string>
- <string name="curves_channel_blue" msgid="9129211507395079371">"Сiнi"</string>
- <string name="draw_style" msgid="2036125061987325389">"Стыль"</string>
- <string name="draw_size" msgid="4360005386104151209">"Памер"</string>
- <string name="draw_hue" msgid="4975135843189267133">"Адценне"</string>
- <string name="draw_saturation" msgid="5394395648014454882">"Насычанасць"</string>
- <string name="draw_value" msgid="6571604055161538273">"Яркасць"</string>
- <string name="draw_color" msgid="2119030386987211193">"Колер"</string>
- <string name="draw_style_line" msgid="9216476853904429628">"Лiнii"</string>
- <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Маркёр"</string>
- <string name="draw_style_brush_marker" msgid="8468302322165644292">"Пырскi"</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_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">"OK"</string>
- <string name="state_panel_original" msgid="9069584409934164419">"Арыгiнал"</string>
- <string name="state_panel_result" msgid="318640531123298676">"Вынiк"</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_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_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>
- <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Загатоўка"</string>
- <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Версія"</string>
- <string name="filtershow_version_original" msgid="1413894292200912828">"Арыгiнальная"</string>
- <string name="filtershow_version_current" msgid="6609334422797468952">"Бягучая"</string>
- <string name="filtershow_exif_model" msgid="3543206476046267466">"Мадэль"</string>
- <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Апертура"</string>
- <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Фокусная адлегласць"</string>
- <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
- <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Адлегласць да аб\'екта"</string>
- <string name="filtershow_exif_date" msgid="8882402253732028544">"Дата здымка"</string>
- <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Лік дыяфрагмы"</string>
- <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Час экспазіцыі"</string>
- <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Аўтарскія правы"</string>
-</resources>
diff --git a/res/values-bn-rBD/filtershow_strings.xml b/res/values-bn-rBD/filtershow_strings.xml
index 3e80776..6c6f1dc 100644
--- a/res/values-bn-rBD/filtershow_strings.xml
+++ b/res/values-bn-rBD/filtershow_strings.xml
@@ -31,7 +31,7 @@
<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="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>
diff --git a/res/values-bs-rBA/filtershow_strings.xml b/res/values-bs-rBA/filtershow_strings.xml
deleted file mode 100644
index c515a79..0000000
--- a/res/values-bs-rBA/filtershow_strings.xml
+++ /dev/null
@@ -1,156 +0,0 @@
-<?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.
- -->
-
-<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">"Uređivač slika"</string>
- <string name="cannot_load_image" msgid="5023634941212959976">"Greška prilikom učitavanja slike!"</string>
- <string name="cannot_edit_original" msgid="5890293845882609388">"Originalna slika se ne može obrađivati"</string>
- <!-- no translation found for original_picture_text (3076213290079909698) -->
- <skip />
- <string name="setting_wallpaper" msgid="4679087092300036632">"Postavljanje pozadinske slike"</string>
- <string name="download_failure" msgid="5923323939788582895">"Greška prilikom preuzimanja slike. Mreža nije dostupna."</string>
- <string name="original" msgid="3524493791230430897">"Original"</string>
- <string name="borders" msgid="2067345080568684614">"Obrubi"</string>
- <string name="custom_border" msgid="8679893731790931871">"Prilagođeni obrub"</string>
- <string name="filtershow_undo" msgid="6781743189243585101">"Vratiti"</string>
- <string name="filtershow_redo" msgid="4219489910543059747">"Ponovo uradi"</string>
- <string name="show_imagestate_panel" msgid="281932769701043015">"Prikaži primijenjene efekte"</string>
- <string name="hide_imagestate_panel" msgid="7207643485811695257">"Sakriti primijenjene efekte"</string>
- <string name="export_image" msgid="3202835713172222134">"Snimanje slike"</string>
- <string name="print_image" msgid="1942989216591621413">"Štampanje"</string>
- <string name="export_flattened" msgid="9046192331465915411">"Snimi uravnjenu sliku"</string>
- <string name="select_output_settings" msgid="1268532018080310748">"Snimljena slika bit će kopija bez historije."</string>
- <string name="quality" msgid="179292110309050529">"Kvalitet"</string>
- <string name="size" msgid="4639404642236356037">"Veličina"</string>
- <string name="x" msgid="6810256999024563662">"x"</string>
- <string name="menu_settings" msgid="6428291655769260831">"Postavke"</string>
- <string name="unsaved" msgid="8704442449002374375">"U ovoj slici postoje izmjene koje nisu sačuvane."</string>
- <string name="save_before_exit" msgid="2680660633675916712">"Želite li sačuvati izmjene prije izlaska iz aplikacije?"</string>
- <string name="save_and_exit" msgid="3628425023766687419">"Sačuvaj i izađi"</string>
- <string name="save_and_processing" msgid="6371565035837463194">"Obrada slike u punoj rezoluciji..."</string>
- <string name="exit" msgid="242642957038770113">"Izlaz"</string>
- <string name="history" msgid="455767361472692409">"Historija"</string>
- <string name="reset" msgid="9013181350779592937">"Poništi"</string>
- <!-- no translation found for history_original (150973253194312841) -->
- <skip />
- <string name="imageState" msgid="8632586742752891968">"Primijenjeni efekti"</string>
- <string name="compare_original" msgid="8140838959007796977">"Uporedi"</string>
- <string name="apply_effect" msgid="1218288221200568947">"Primjeni efekt"</string>
- <string name="reset_effect" msgid="7712605581024929564">"Poništi efekte"</string>
- <string name="aspect" msgid="4025244950820813059">"Proporcije"</string>
- <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
- <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="aspect9to16_effect" msgid="7740468012919660728">"16:9"</string>
- <string name="aspectNone_effect" msgid="6263330561046574134">"Bez efekata"</string>
- <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
- <skip />
- <string name="Fixed" msgid="8017376448916924565">"Fiksni razmjer"</string>
- <string name="tinyplanet" msgid="2783694326474415761">"Mala planeta"</string>
- <string name="exposure" msgid="6526397045949374905">"Ekspozic."</string>
- <string name="sharpness" msgid="6463103068318055412">"Oštrina"</string>
- <string name="contrast" msgid="2310908487756769019">"Kontrast"</string>
- <string name="vibrance" msgid="3326744578577835915">"Žive boje"</string>
- <string name="saturation" msgid="7026791551032438585">"Zasićenje"</string>
- <string name="bwfilter" msgid="8927492494576933793">"CB filter"</string>
- <string name="wbalance" msgid="6346581563387083613">"Automatski"</string>
- <string name="hue" msgid="6231252147971086030">"Nijansa"</string>
- <string name="shadow_recovery" msgid="3928572915300287152">"Sjene"</string>
- <string name="highlight_recovery" msgid="8262208470735204243">"Isticanja"</string>
- <string name="curvesRGB" msgid="915010781090477550">"Krivulje"</string>
- <string name="vignette" msgid="934721068851885390">"Vinjeta"</string>
- <string name="vignette_main" msgid="6046495605390665423">"Vinjeta"</string>
- <string name="vignette_exposure" msgid="6862058227309534094">"Ekspozicija"</string>
- <string name="vignette_saturation" msgid="1617055207565719771">"Zasićenje"</string>
- <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
- <string name="vignette_falloff" msgid="690918055030064199">"Opadanje"</string>
- <string name="redeye" msgid="4508883127049472069">"Crvene oči"</string>
- <string name="imageDraw" msgid="6918552177844486656">"Crtanje"</string>
- <string name="straighten" msgid="26025591664983528">"Poravnanje"</string>
- <string name="crop" msgid="5781263790107850771">"Izrezati"</string>
- <string name="rotate" msgid="2796802553793795371">"Rotiranje"</string>
- <string name="mirror" msgid="5482518108154883096">"Ogledalo"</string>
- <string name="negative" msgid="6998313764388022201">"Negativ"</string>
- <string name="none" msgid="6633966646410296520">"Bez filt."</string>
- <string name="edge" msgid="7036064886242147551">"Uglovi"</string>
- <string name="kmeans" msgid="2080952022674981541">"Posteriziranje"</string>
- <string name="downsample" msgid="3552938534146980104">"Smanjenje slike"</string>
- <string name="grad" msgid="546774853424848655">"Stepenovanje"</string>
- <string name="editor_grad_brightness" msgid="5937316734380235741">"Osvjetljenje"</string>
- <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
- <string name="editor_grad_saturation" msgid="3760247354109521726">"Zasićenje"</string>
- <string name="editor_chan_sat_main" msgid="4427652337797121940">"Glavno"</string>
- <string name="editor_chan_sat_red" msgid="1699222266490540696">"Crvena"</string>
- <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Žuta"</string>
- <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zelena"</string>
- <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cijan"</string>
- <string name="editor_chan_sat_blue" msgid="384409736863387895">"Plava"</string>
- <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
- <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
- <string name="editor_grad_new" msgid="4857265951369377379">"novo"</string>
- <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
- <string name="curves_channel_red" msgid="4199710104162111357">"Crvena"</string>
- <string name="curves_channel_green" msgid="3733003466905031016">"Zelena"</string>
- <string name="curves_channel_blue" msgid="9129211507395079371">"Plava"</string>
- <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
- <string name="draw_size" msgid="4360005386104151209">"Veličina"</string>
- <string name="draw_hue" msgid="4975135843189267133">"Nijansa"</string>
- <string name="draw_saturation" msgid="5394395648014454882">"Zasićenje"</string>
- <string name="draw_value" msgid="6571604055161538273">"Osvjetljenje"</string>
- <string name="draw_color" msgid="2119030386987211193">"Boja"</string>
- <string name="draw_style_line" msgid="9216476853904429628">"Linije"</string>
- <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
- <string name="draw_style_brush_marker" msgid="8468302322165644292">"Prskanje"</string>
- <string name="draw_clear" msgid="6728155515454921052">"Obrisati"</string>
- <string name="color_border_size" msgid="1086895807615869290">"Debljina"</string>
- <string name="color_border_corner_size" msgid="7637235159438869979">"Velič. uglova"</string>
- <string name="color_border_color" msgid="8765458414425980711">"Boja"</string>
- <string name="color_border_clear" msgid="4418261191091091722">"Obrisati"</string>
- <string name="color_pick_select" msgid="734312818059057394">"Izabrati prilagođenu boju"</string>
- <string name="color_pick_title" msgid="6195567431995308876">"Izabrati boju"</string>
- <string name="draw_size_title" msgid="3121649039610273977">"Odabir veličine"</string>
- <string name="draw_size_accept" msgid="6781529716526190028">"UREDU"</string>
- <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
- <string name="state_panel_result" msgid="318640531123298676">"Rezultat"</string>
- <string name="filtershow_notification_label" msgid="1653168445525855247">"Spremanje slike"</string>
- <string name="filtershow_notification_message" msgid="2661871765484036286">"Obrada..."</string>
- <string name="filtershow_save_preset" msgid="3933550455577927439">"Sačuvati trenutnu raniju post."</string>
- <string name="filtershow_manage_preset" msgid="3872896753708921286">"Upravljanje ranijim postavkama korisnika"</string>
- <string name="filtershow_new_preset" msgid="8923930134923416617">"Nova ranija postavka"</string>
- <string name="filtershow_preset_name" msgid="7015939727047649866">"Ime ranije postavke"</string>
- <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informacije"</string>
- <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Ime slike"</string>
- <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Veličina slike"</string>
- <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
- <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF podaci"</string>
- <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Ranije postavke"</string>
- <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Verzija"</string>
- <string name="filtershow_version_original" msgid="1413894292200912828">"Originalna verzija"</string>
- <string name="filtershow_version_current" msgid="6609334422797468952">"Trenutna verzija"</string>
- <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
- <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Blenda"</string>
- <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Žarišna dužina"</string>
- <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
- <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Udaljenost od subjekta"</string>
- <string name="filtershow_exif_date" msgid="8882402253732028544">"Datum kada je slika snimljena"</string>
- <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F-stop broj"</string>
- <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Vrijeme ekspozicije"</string>
- <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autorska prava"</string>
-</resources>
diff --git a/res/values-ca/filtershow_strings.xml b/res/values-ca/filtershow_strings.xml
index e2fe5dc..dfedadc 100644
--- a/res/values-ca/filtershow_strings.xml
+++ b/res/values-ca/filtershow_strings.xml
@@ -131,16 +131,16 @@
<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 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_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_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">"Valors predefinits"</string>
+ <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Configuració predeterminada"</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>
diff --git a/res/values-gu-rIN/filtershow_strings.xml b/res/values-gu-rIN/filtershow_strings.xml
index 9570724..1348f59 100644
--- a/res/values-gu-rIN/filtershow_strings.xml
+++ b/res/values-gu-rIN/filtershow_strings.xml
@@ -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>
diff --git a/res/values-ml-rIN/filtershow_strings.xml b/res/values-ml-rIN/filtershow_strings.xml
index 10bbd3e..777519a 100644
--- a/res/values-ml-rIN/filtershow_strings.xml
+++ b/res/values-ml-rIN/filtershow_strings.xml
@@ -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>
diff --git a/res/values-mn-rMN/filtershow_strings.xml b/res/values-mn-rMN/filtershow_strings.xml
index aca5d44..310c63d 100644
--- a/res/values-mn-rMN/filtershow_strings.xml
+++ b/res/values-mn-rMN/filtershow_strings.xml
@@ -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">"OK"</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>
diff --git a/res/values-my-rMM/filtershow_strings.xml b/res/values-my-rMM/filtershow_strings.xml
index 14c8714..e2eb5b3 100644
--- a/res/values-my-rMM/filtershow_strings.xml
+++ b/res/values-my-rMM/filtershow_strings.xml
@@ -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>
diff --git a/res/values-ne-rNP/filtershow_strings.xml b/res/values-ne-rNP/filtershow_strings.xml
index 477971b..fc6ef13 100644
--- a/res/values-ne-rNP/filtershow_strings.xml
+++ b/res/values-ne-rNP/filtershow_strings.xml
@@ -16,13 +16,13 @@
<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>
@@ -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>
diff --git a/res/values-pa-rIN/filtershow_strings.xml b/res/values-pa-rIN/filtershow_strings.xml
index bfb205e..0c96041 100644
--- a/res/values-pa-rIN/filtershow_strings.xml
+++ b/res/values-pa-rIN/filtershow_strings.xml
@@ -22,11 +22,11 @@
<!-- 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="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>
@@ -40,17 +40,17 @@
<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>
- <string name="save_and_processing" msgid="6371565035837463194">"ਪੂਰੇ ਰੈਜ਼ੋਲਿਊਸ਼ਨ ਚਿੱਤਰ ਦੀ ਪ੍ਰਕਿਰਿਆ ਕਰ ਰਿਹਾ ਹੈ..."</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="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">"1:1"</string>
<string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
@@ -131,7 +131,7 @@
<string name="state_panel_result" msgid="318640531123298676">"ਨਤੀਜਾ"</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>
@@ -139,7 +139,7 @@
<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>
+ <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF ਡਾਟਾ"</string>
<string name="filtershow_add_button_looks" msgid="8630823661416925426">"ਪ੍ਰੀਸੈਟ"</string>
<string name="filtershow_add_button_versions" msgid="7620107266685809612">"ਵਰਜਨ"</string>
<string name="filtershow_version_original" msgid="1413894292200912828">"ਮੂਲ"</string>
diff --git a/res/values-ro/filtershow_strings.xml b/res/values-ro/filtershow_strings.xml
index 99c1ffa..10836f7 100644
--- a/res/values-ro/filtershow_strings.xml
+++ b/res/values-ro/filtershow_strings.xml
@@ -44,13 +44,13 @@
<string name="save_and_processing" msgid="6371565035837463194">"Se procesează imaginea la rezoluție maximă..."</string>
<string name="exit" msgid="242642957038770113">"Ieșiți"</string>
<string name="history" msgid="455767361472692409">"Istoric"</string>
- <string name="reset" msgid="9013181350779592937">"Resetați"</string>
+ <string name="reset" msgid="9013181350779592937">"Resetaţi"</string>
<!-- no translation found for history_original (150973253194312841) -->
<skip />
<string name="imageState" msgid="8632586742752891968">"Efecte aplicate"</string>
<string name="compare_original" msgid="8140838959007796977">"Comparați"</string>
- <string name="apply_effect" msgid="1218288221200568947">"Aplicați"</string>
- <string name="reset_effect" msgid="7712605581024929564">"Resetați"</string>
+ <string name="apply_effect" msgid="1218288221200568947">"Aplicaţi"</string>
+ <string name="reset_effect" msgid="7712605581024929564">"Resetaţi"</string>
<string name="aspect" msgid="4025244950820813059">"Aspect"</string>
<string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string>
<string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string>
diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java
index 9b955ef..b2118e0 100644
--- a/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java
+++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java
@@ -171,7 +171,7 @@
canvas.drawRect(mBorder, mBorder, mWidth - mBorder, mHeight - mBorder, mBarPaint1);
canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1);
canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2);
- if (mDotX != Float.NaN) {
+ if (!Float.isNaN(mDotX)) {
canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint);
}
}
diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java
index 498f5a4..61b3621 100644
--- a/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java
+++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java
@@ -179,7 +179,7 @@
canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1);
canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2);
- if (mDotX != Float.NaN) {
+ if (!Float.isNaN(mDotX)) {
canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint);
}
}
diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java
index ec15b5b..970a2ff 100644
--- a/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java
+++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java
@@ -171,7 +171,7 @@
canvas.drawRect(mBorder, 0, mWidth - mBorder, mHeight, mBarPaint1);
canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1);
canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2);
- if (mDotX != Float.NaN) {
+ if (!Float.isNaN(mDotX)) {
canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint);
}
}
diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java
index 07d7c71..92f4ad8 100644
--- a/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java
+++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java
@@ -170,8 +170,7 @@
canvas.drawRect(rect, mWheelPaint3);
canvas.drawRect(rect, mWheelPaint2);
- if (mDotX != Float.NaN) {
-
+ if (!Float.isNaN(mDotX)) {
canvas.drawCircle(mDotX, mDotY, mDotRadus, mDotPaint);
}
}
diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java
index fb8b4fc..6ebb48b 100644
--- a/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java
+++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java
@@ -126,8 +126,7 @@
mRect.right -= mBorder;
canvas.drawBitmap(mBitmap, null, mRect, mPaint1);
- if (mDotX != Float.NaN) {
-
+ if (!Float.isNaN(mDotX)) {
canvas.drawCircle(mDotX, mDotY, mDotRadus, mDotPaint);
}
}
diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java
index af4dfda..a29eee9 100644
--- a/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java
+++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java
@@ -170,7 +170,7 @@
canvas.drawRect(mBorder, mBorder, mWidth - mBorder, mHeight - mBorder, mBarPaint1);
canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1);
canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2);
- if (mDotX != Float.NaN) {
+ if (!Float.isNaN(mDotX)) {
canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint);
}
}
diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java
index bbfd829..0ace5d0 100644
--- a/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java
+++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java
@@ -148,7 +148,7 @@
canvas.drawRect(mBorder, mBorder, mWidth - mBorder, mHeight - mBorder, mBarPaint1);
canvas.drawLine(mDotX, mDotY, mDotX, mHeight - mBorder, mLinePaint2);
canvas.drawLine(mDotX, mBorder, mDotX, mDotY, mLinePaint1);
- if (mDotX != Float.NaN) {
+ if (!Float.isNaN(mDotX)) {
canvas.drawCircle(mDotX, mDotY, dotRadus, mDotPaint);
}
}
