Import translations. DO NOT MERGE

am: 661db9ffb1  -s ours

Change-Id: I7743a66a3d9672beda62c8d7d40d12c1c39a02d0

diff --git a/jni/Android.mk b/jni/Android.mk
index 32c7163..55bb205 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,9 +1,16 @@
 LOCAL_PATH:= $(call my-dir)
 
+Gallery2_jni_cflags := \
+    -Wall -Wextra -Werror \
+    -Wno-error=constant-conversion \
+    -Wno-unused-parameter \
+
+# to fix implicit conversion from 'int' to 'char', (255 to -1, 128 to -128)
+
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES -Wno-unused-parameter
-LOCAL_CFLAGS += -Wall -Wextra
+LOCAL_CFLAGS += -DEGL_EGLEXT_PROTOTYPES
+LOCAL_CFLAGS += $(Gallery2_jni_cflags)
 
 LOCAL_SRC_FILES := jni_egl_fence.cpp
 
@@ -45,8 +52,8 @@ LOCAL_SRC_FILES := filters/gradient.c \
                    filters/tinyplanet.cc \
                    filters/kmeans.cc
 
-LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops -Wno-unused-parameter
-LOCAL_CFLAGS += -Wall -Wextra
+LOCAL_CFLAGS += -ffast-math -O3 -funroll-loops
+LOCAL_CFLAGS += $(Gallery2_jni_cflags)
 LOCAL_LDLIBS := -llog -ljnigraphics
 LOCAL_ARM_MODE := arm
 

diff --git a/jni_jpegstream/Android.mk b/jni_jpegstream/Android.mk
index f3a631d..7b4d9a4 100644 (file)
--- a/jni_jpegstream/Android.mk
+++ b/jni_jpegstream/Android.mk
@@ -6,7 +6,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE        := libjni_jpegstream
 
-LOCAL_NDK_STL_VARIANT := stlport_static
+LOCAL_NDK_STL_VARIANT := c++_static
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH) \
                     $(LOCAL_PATH)/src
@@ -17,7 +17,7 @@ LOCAL_SDK_VERSION   := 17
 LOCAL_ARM_MODE := arm
 
 LOCAL_CFLAGS    += -ffast-math -O3 -funroll-loops
-LOCAL_CFLAGS += -Wall -Wextra
+LOCAL_CFLAGS += -Wall -Wextra -Werror
 LOCAL_LDLIBS := -llog
 
 LOCAL_CPP_EXTENSION := .cpp

diff --git a/res/values-bn/filtershow_strings.xml b/res/values-bn/filtershow_strings.xml
index 12156ba..f8eec8d 100644 (file)
--- a/res/values-bn/filtershow_strings.xml
+++ b/res/values-bn/filtershow_strings.xml
@@ -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">"à¦\9bবিটি লোড করা যাবে না!"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"à¦\9aিতà§\8dরটি লোড করা যাবে না!"</string>
     <string name="cannot_edit_original" msgid="5890293845882609388">"আসলটি সম্পাদনা করতে পারবেন না"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
@@ -32,8 +32,8 @@
     <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">"à¦\9aà§\8dযাপà§\8dà¦\9fা à¦\9bবি রপ্তানি করুন"</string>
-    <string name="select_output_settings" msgid="1268532018080310748">"রপà§\8dতানি à¦\95রা à¦\9bবিটি ইতিহাস ছাড়া, একটি অনুলিপি হবে।"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"à¦\9aà§\8dযাপà§\8dà¦\9fা à¦\9aিতà§\8dর রপ্তানি করুন"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"রপà§\8dতানি à¦\95রা à¦\9aিতà§\8dরটি ইতিহাস ছাড়া, একটি অনুলিপি হবে।"</string>
     <string name="quality" msgid="179292110309050529">"গুণমান"</string>
     <string name="size" msgid="4639404642236356037">"আকার"</string>
     <string name="x" msgid="6810256999024563662">"x"</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">"রà¦\99 বà§\87à¦\9bà§\87 নিন"</string>
-    <string name="draw_size_title" msgid="3121649039610273977">"à¦\86à¦\95ার বà§\87à¦\9bà§\87 নিন"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"রà¦\99 নিরà§\8dবাà¦\9aন à¦\95রà§\81ন"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"à¦\86à¦\95ার নিরà§\8dবাà¦\9aন à¦\95রà§\81ন"</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">"à¦\9bবি সংরক্ষণ করা হচ্ছে"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"à¦\9aিতà§\8dর সংরক্ষণ করা হচ্ছে"</string>
     <string name="filtershow_notification_message" msgid="2661871765484036286">"প্রক্রিয়া করা হচ্ছে..."</string>
-    <string name="filtershow_save_preset" msgid="3933550455577927439">"বরà§\8dতমান পà§\8dরিসà§\87à¦\9f সà§\87ভ করুন"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"বরà§\8dতমান পà§\8dরিসà§\87à¦\9f সà¦\82রà¦\95à§\8dষণ করুন"</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">"à¦\9bবি নাম"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"à¦\9aিতà§\8dর নাম"</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>

diff --git a/res/values-bs/filtershow_strings.xml b/res/values-bs/filtershow_strings.xml
index b260622..c515a79 100644 (file)
--- a/res/values-bs/filtershow_strings.xml
+++ b/res/values-bs/filtershow_strings.xml
@@ -118,11 +118,11 @@
     <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">"Obriši"</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">"Obriši"</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>

diff --git a/res/values-en-rCA/filtershow_strings.xml b/res/values-en-rCA/filtershow_strings.xml
deleted file mode 100644 (file)
index bd076f4..0000000
--- a/res/values-en-rCA/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">"Photo Editor"</string>
-    <string name="cannot_load_image" msgid="5023634941212959976">"Cannot load the image!"</string>
-    <string name="cannot_edit_original" msgid="5890293845882609388">"Cannot edit original"</string>
-    <!-- no translation found for original_picture_text (3076213290079909698) -->
-    <skip />
-    <string name="setting_wallpaper" msgid="4679087092300036632">"Setting wallpaper"</string>
-    <string name="download_failure" msgid="5923323939788582895">"Could not download photo. Network unavailable."</string>
-    <string name="original" msgid="3524493791230430897">"Original"</string>
-    <string name="borders" msgid="2067345080568684614">"Borders"</string>
-    <string name="custom_border" msgid="8679893731790931871">"Customise"</string>
-    <string name="filtershow_undo" msgid="6781743189243585101">"Undo"</string>
-    <string name="filtershow_redo" msgid="4219489910543059747">"Redo"</string>
-    <string name="show_imagestate_panel" msgid="281932769701043015">"Show Applied Effects"</string>
-    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Hide Applied Effects"</string>
-    <string name="export_image" msgid="3202835713172222134">"Export"</string>
-    <string name="print_image" msgid="1942989216591621413">"Print"</string>
-    <string name="export_flattened" msgid="9046192331465915411">"Export Flattened Image"</string>
-    <string name="select_output_settings" msgid="1268532018080310748">"The exported image will be a copy, without the history."</string>
-    <string name="quality" msgid="179292110309050529">"Quality"</string>
-    <string name="size" msgid="4639404642236356037">"Size"</string>
-    <string name="x" msgid="6810256999024563662">"x"</string>
-    <string name="menu_settings" msgid="6428291655769260831">"Settings"</string>
-    <string name="unsaved" msgid="8704442449002374375">"There are unsaved changes to this image."</string>
-    <string name="save_before_exit" msgid="2680660633675916712">"Do you want to save before exiting?"</string>
-    <string name="save_and_exit" msgid="3628425023766687419">"Save and Exit"</string>
-    <string name="save_and_processing" msgid="6371565035837463194">"Processing full resolution image..."</string>
-    <string name="exit" msgid="242642957038770113">"Exit"</string>
-    <string name="history" msgid="455767361472692409">"History"</string>
-    <string name="reset" msgid="9013181350779592937">"Reset"</string>
-    <!-- no translation found for history_original (150973253194312841) -->
-    <skip />
-    <string name="imageState" msgid="8632586742752891968">"Applied Effects"</string>
-    <string name="compare_original" msgid="8140838959007796977">"Compare"</string>
-    <string name="apply_effect" msgid="1218288221200568947">"Apply"</string>
-    <string name="reset_effect" msgid="7712605581024929564">"Reset"</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>
-    <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">"None"</string>
-    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
-    <skip />
-    <string name="Fixed" msgid="8017376448916924565">"Fixed"</string>
-    <string name="tinyplanet" msgid="2783694326474415761">"Tiny Planet"</string>
-    <string name="exposure" msgid="6526397045949374905">"Exposure"</string>
-    <string name="sharpness" msgid="6463103068318055412">"Sharpness"</string>
-    <string name="contrast" msgid="2310908487756769019">"Contrast"</string>
-    <string name="vibrance" msgid="3326744578577835915">"Vibrancy"</string>
-    <string name="saturation" msgid="7026791551032438585">"Saturation"</string>
-    <string name="bwfilter" msgid="8927492494576933793">"BW Filter"</string>
-    <string name="wbalance" msgid="6346581563387083613">"Autocolour"</string>
-    <string name="hue" msgid="6231252147971086030">"Hue"</string>
-    <string name="shadow_recovery" msgid="3928572915300287152">"Shadows"</string>
-    <string name="highlight_recovery" msgid="8262208470735204243">"Highlights"</string>
-    <string name="curvesRGB" msgid="915010781090477550">"Curves"</string>
-    <string name="vignette" msgid="934721068851885390">"Vignette"</string>
-    <string name="vignette_main" msgid="6046495605390665423">"Vignette"</string>
-    <string name="vignette_exposure" msgid="6862058227309534094">"Exposure"</string>
-    <string name="vignette_saturation" msgid="1617055207565719771">"Saturation"</string>
-    <string name="vignette_contrast" msgid="955732121756799897">"Contrast"</string>
-    <string name="vignette_falloff" msgid="690918055030064199">"Falloff"</string>
-    <string name="redeye" msgid="4508883127049472069">"Red Eye"</string>
-    <string name="imageDraw" msgid="6918552177844486656">"Draw"</string>
-    <string name="straighten" msgid="26025591664983528">"Straighten"</string>
-    <string name="crop" msgid="5781263790107850771">"Crop"</string>
-    <string name="rotate" msgid="2796802553793795371">"Rotate"</string>
-    <string name="mirror" msgid="5482518108154883096">"Mirror"</string>
-    <string name="negative" msgid="6998313764388022201">"Negative"</string>
-    <string name="none" msgid="6633966646410296520">"None"</string>
-    <string name="edge" msgid="7036064886242147551">"Edges"</string>
-    <string name="kmeans" msgid="2080952022674981541">"Posterise"</string>
-    <string name="downsample" msgid="3552938534146980104">"Downsample"</string>
-    <string name="grad" msgid="546774853424848655">"Graduated"</string>
-    <string name="editor_grad_brightness" msgid="5937316734380235741">"Brightness"</string>
-    <string name="editor_grad_contrast" msgid="3454456673401803360">"Contrast"</string>
-    <string name="editor_grad_saturation" msgid="3760247354109521726">"Saturation"</string>
-    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Main"</string>
-    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Red"</string>
-    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Yellow"</string>
-    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Green"</string>
-    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cyan"</string>
-    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Blue"</string>
-    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
-    <string name="editor_grad_style" msgid="2168414479007745179">"Style"</string>
-    <string name="editor_grad_new" msgid="4857265951369377379">"new"</string>
-    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
-    <string name="curves_channel_red" msgid="4199710104162111357">"Red"</string>
-    <string name="curves_channel_green" msgid="3733003466905031016">"Green"</string>
-    <string name="curves_channel_blue" msgid="9129211507395079371">"Blue"</string>
-    <string name="draw_style" msgid="2036125061987325389">"Style"</string>
-    <string name="draw_size" msgid="4360005386104151209">"Size"</string>
-    <string name="draw_hue" msgid="4975135843189267133">"Hue"</string>
-    <string name="draw_saturation" msgid="5394395648014454882">"Saturation"</string>
-    <string name="draw_value" msgid="6571604055161538273">"Brightness"</string>
-    <string name="draw_color" msgid="2119030386987211193">"Colour"</string>
-    <string name="draw_style_line" msgid="9216476853904429628">"Lines"</string>
-    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string>
-    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spatter"</string>
-    <string name="draw_clear" msgid="6728155515454921052">"Clear"</string>
-    <string name="color_border_size" msgid="1086895807615869290">"Thickness"</string>
-    <string name="color_border_corner_size" msgid="7637235159438869979">"Corner Size"</string>
-    <string name="color_border_color" msgid="8765458414425980711">"Colour"</string>
-    <string name="color_border_clear" msgid="4418261191091091722">"Clear"</string>
-    <string name="color_pick_select" msgid="734312818059057394">"Choose custom colour"</string>
-    <string name="color_pick_title" msgid="6195567431995308876">"Select Colour"</string>
-    <string name="draw_size_title" msgid="3121649039610273977">"Select Size"</string>
-    <string name="draw_size_accept" msgid="6781529716526190028">"OK"</string>
-    <string name="state_panel_original" msgid="9069584409934164419">"Original"</string>
-    <string name="state_panel_result" msgid="318640531123298676">"Result"</string>
-    <string name="filtershow_notification_label" msgid="1653168445525855247">"Saving Image"</string>
-    <string name="filtershow_notification_message" msgid="2661871765484036286">"Processing..."</string>
-    <string name="filtershow_save_preset" msgid="3933550455577927439">"Save current preset"</string>
-    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Manage user presets"</string>
-    <string name="filtershow_new_preset" msgid="8923930134923416617">"New Preset"</string>
-    <string name="filtershow_preset_name" msgid="7015939727047649866">"Preset Name"</string>
-    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Information"</string>
-    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Image Name"</string>
-    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Image Size"</string>
-    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
-    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF Data"</string>
-    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Preset"</string>
-    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Version"</string>
-    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
-    <string name="filtershow_version_current" msgid="6609334422797468952">"Current"</string>
-    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
-    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Aperture"</string>
-    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Focal Length"</string>
-    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
-    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Subject Distance"</string>
-    <string name="filtershow_exif_date" msgid="8882402253732028544">"Date taken"</string>
-    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string>
-    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Exposure Time"</string>
-    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Copyright"</string>
-</resources>

diff --git a/res/values-en-rXC/filtershow_strings.xml b/res/values-en-rXC/filtershow_strings.xml
deleted file mode 100644 (file)
index 6178981..0000000
--- a/res/values-en-rXC/filtershow_strings.xml
+++ /dev/null
@@ -1,291 +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">
-    <!-- no translation found for title_activity_filter_show (2036539130684382763) -->
-    <skip />
-    <!-- no translation found for cannot_load_image (5023634941212959976) -->
-    <skip />
-    <!-- no translation found for cannot_edit_original (5890293845882609388) -->
-    <skip />
-    <!-- no translation found for original_picture_text (3076213290079909698) -->
-    <skip />
-    <!-- no translation found for setting_wallpaper (4679087092300036632) -->
-    <skip />
-    <!-- no translation found for download_failure (5923323939788582895) -->
-    <skip />
-    <!-- no translation found for original (3524493791230430897) -->
-    <skip />
-    <!-- no translation found for borders (2067345080568684614) -->
-    <!-- no translation found for borders (4461692156695893616) -->
-    <skip />
-    <!-- no translation found for custom_border (8679893731790931871) -->
-    <skip />
-    <!-- no translation found for filtershow_undo (6781743189243585101) -->
-    <skip />
-    <!-- no translation found for filtershow_redo (4219489910543059747) -->
-    <skip />
-    <!-- no translation found for show_imagestate_panel (281932769701043015) -->
-    <skip />
-    <!-- no translation found for hide_imagestate_panel (7207643485811695257) -->
-    <skip />
-    <!-- no translation found for export_image (3202835713172222134) -->
-    <skip />
-    <!-- no translation found for print_image (1942989216591621413) -->
-    <skip />
-    <!-- no translation found for export_flattened (9046192331465915411) -->
-    <skip />
-    <!-- no translation found for select_output_settings (1268532018080310748) -->
-    <skip />
-    <!-- no translation found for quality (179292110309050529) -->
-    <skip />
-    <!-- no translation found for size (4639404642236356037) -->
-    <skip />
-    <!-- no translation found for x (6810256999024563662) -->
-    <skip />
-    <!-- no translation found for menu_settings (6428291655769260831) -->
-    <skip />
-    <!-- no translation found for unsaved (8704442449002374375) -->
-    <skip />
-    <!-- no translation found for save_before_exit (2680660633675916712) -->
-    <skip />
-    <!-- no translation found for save_and_exit (3628425023766687419) -->
-    <skip />
-    <!-- no translation found for save_and_processing (6371565035837463194) -->
-    <skip />
-    <!-- no translation found for exit (242642957038770113) -->
-    <skip />
-    <!-- no translation found for history (455767361472692409) -->
-    <skip />
-    <!-- no translation found for reset (9013181350779592937) -->
-    <skip />
-    <!-- no translation found for history_original (150973253194312841) -->
-    <skip />
-    <!-- no translation found for imageState (8632586742752891968) -->
-    <skip />
-    <!-- no translation found for compare_original (8140838959007796977) -->
-    <skip />
-    <!-- no translation found for apply_effect (1218288221200568947) -->
-    <skip />
-    <!-- no translation found for reset_effect (7712605581024929564) -->
-    <skip />
-    <!-- no translation found for aspect (4025244950820813059) -->
-    <skip />
-    <!-- no translation found for aspect1to1_effect (1159104543795779123) -->
-    <skip />
-    <!-- no translation found for aspect4to3_effect (7968067847241223578) -->
-    <skip />
-    <!-- no translation found for aspect3to4_effect (7078163990979248864) -->
-    <skip />
-    <!-- no translation found for aspect4to6_effect (1410129351686165654) -->
-    <skip />
-    <!-- no translation found for aspect5to7_effect (5122395569059384741) -->
-    <skip />
-    <!-- no translation found for aspect7to5_effect (5780001758108328143) -->
-    <skip />
-    <!-- no translation found for aspect9to16_effect (7740468012919660728) -->
-    <skip />
-    <!-- no translation found for aspectNone_effect (6263330561046574134) -->
-    <skip />
-    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
-    <skip />
-    <!-- no translation found for Fixed (8017376448916924565) -->
-    <skip />
-    <!-- no translation found for tinyplanet (2783694326474415761) -->
-    <skip />
-    <string name="exposure" msgid="6526397045949374905">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‏‏‏‏‎‏‏‎‎‎‏‎‎‎‎‏‏‏‎‏‎‎‏‏‏‎‏‏‎‏‎‎‎‎‏‏‏‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‎‎‏‎‏‏‎‎‎‎‏‏‎‏‏‎Exposure‎‏‎‎‏‎"</string>
-    <!-- no translation found for sharpness (6463103068318055412) -->
-    <skip />
-    <!-- no translation found for contrast (2310908487756769019) -->
-    <skip />
-    <!-- no translation found for vibrance (3326744578577835915) -->
-    <skip />
-    <!-- no translation found for saturation (7026791551032438585) -->
-    <skip />
-    <!-- no translation found for bwfilter (8927492494576933793) -->
-    <skip />
-    <!-- no translation found for wbalance (6346581563387083613) -->
-    <skip />
-    <!-- no translation found for hue (6231252147971086030) -->
-    <skip />
-    <!-- no translation found for shadow_recovery (3928572915300287152) -->
-    <skip />
-    <!-- no translation found for highlight_recovery (8262208470735204243) -->
-    <skip />
-    <!-- no translation found for curvesRGB (915010781090477550) -->
-    <skip />
-    <!-- no translation found for vignette (934721068851885390) -->
-    <skip />
-    <!-- no translation found for vignette_main (6046495605390665423) -->
-    <skip />
-    <!-- no translation found for vignette_exposure (6862058227309534094) -->
-    <skip />
-    <!-- no translation found for vignette_saturation (1617055207565719771) -->
-    <skip />
-    <!-- no translation found for vignette_contrast (955732121756799897) -->
-    <skip />
-    <!-- no translation found for vignette_falloff (690918055030064199) -->
-    <skip />
-    <!-- no translation found for redeye (4508883127049472069) -->
-    <skip />
-    <!-- no translation found for imageDraw (6918552177844486656) -->
-    <skip />
-    <!-- no translation found for straighten (26025591664983528) -->
-    <!-- no translation found for straighten (5217801513491493491) -->
-    <skip />
-    <!-- no translation found for crop (5781263790107850771) -->
-    <!-- no translation found for crop (5584000454518174632) -->
-    <skip />
-    <!-- no translation found for rotate (2796802553793795371) -->
-    <!-- no translation found for rotate (460017689320955494) -->
-    <skip />
-    <!-- no translation found for mirror (5482518108154883096) -->
-    <skip />
-    <!-- no translation found for negative (6998313764388022201) -->
-    <skip />
-    <!-- no translation found for none (6633966646410296520) -->
-    <!-- no translation found for none (3601545724573307541) -->
-    <skip />
-    <!-- no translation found for edge (7036064886242147551) -->
-    <skip />
-    <!-- no translation found for kmeans (2080952022674981541) -->
-    <skip />
-    <!-- no translation found for downsample (3552938534146980104) -->
-    <skip />
-    <!-- no translation found for grad (546774853424848655) -->
-    <skip />
-    <!-- no translation found for editor_grad_brightness (5937316734380235741) -->
-    <skip />
-    <!-- no translation found for editor_grad_contrast (3454456673401803360) -->
-    <skip />
-    <!-- no translation found for editor_grad_saturation (3760247354109521726) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_main (4427652337797121940) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_red (1699222266490540696) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_yellow (1488997071882154179) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_green (1514055896212975167) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_cyan (1367634650172508288) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_blue (384409736863387895) -->
-    <skip />
-    <!-- no translation found for editor_chan_sat_magenta (6689215719351415546) -->
-    <skip />
-    <!-- no translation found for editor_grad_style (2168414479007745179) -->
-    <skip />
-    <!-- no translation found for editor_grad_new (4857265951369377379) -->
-    <skip />
-    <!-- no translation found for curves_channel_rgb (7909209509638333690) -->
-    <skip />
-    <!-- no translation found for curves_channel_red (4199710104162111357) -->
-    <skip />
-    <!-- no translation found for curves_channel_green (3733003466905031016) -->
-    <skip />
-    <!-- no translation found for curves_channel_blue (9129211507395079371) -->
-    <skip />
-    <!-- no translation found for draw_style (2036125061987325389) -->
-    <skip />
-    <!-- no translation found for draw_size (4360005386104151209) -->
-    <skip />
-    <!-- no translation found for draw_hue (4975135843189267133) -->
-    <skip />
-    <!-- no translation found for draw_saturation (5394395648014454882) -->
-    <skip />
-    <!-- no translation found for draw_value (6571604055161538273) -->
-    <skip />
-    <!-- no translation found for draw_color (2119030386987211193) -->
-    <skip />
-    <!-- no translation found for draw_style_line (9216476853904429628) -->
-    <skip />
-    <!-- no translation found for draw_style_brush_spatter (7612691122932981554) -->
-    <skip />
-    <!-- no translation found for draw_style_brush_marker (8468302322165644292) -->
-    <skip />
-    <!-- no translation found for draw_clear (6728155515454921052) -->
-    <skip />
-    <!-- no translation found for color_border_size (1086895807615869290) -->
-    <skip />
-    <!-- no translation found for color_border_corner_size (7637235159438869979) -->
-    <skip />
-    <!-- no translation found for color_border_color (8765458414425980711) -->
-    <skip />
-    <!-- no translation found for color_border_clear (4418261191091091722) -->
-    <skip />
-    <!-- no translation found for color_pick_select (734312818059057394) -->
-    <skip />
-    <!-- no translation found for color_pick_title (6195567431995308876) -->
-    <skip />
-    <!-- no translation found for draw_size_title (3121649039610273977) -->
-    <skip />
-    <!-- no translation found for draw_size_accept (6781529716526190028) -->
-    <skip />
-    <!-- no translation found for state_panel_original (9069584409934164419) -->
-    <skip />
-    <!-- no translation found for state_panel_result (318640531123298676) -->
-    <skip />
-    <!-- no translation found for filtershow_notification_label (1653168445525855247) -->
-    <skip />
-    <!-- no translation found for filtershow_notification_message (2661871765484036286) -->
-    <skip />
-    <!-- no translation found for filtershow_save_preset (3933550455577927439) -->
-    <skip />
-    <!-- no translation found for filtershow_manage_preset (3872896753708921286) -->
-    <skip />
-    <!-- no translation found for filtershow_new_preset (8923930134923416617) -->
-    <skip />
-    <!-- no translation found for filtershow_preset_name (7015939727047649866) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel (5773036746043711115) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_name (5908258517140549439) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_size (1714666849204493017) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_histogram (2669188469897955809) -->
-    <skip />
-    <!-- no translation found for filtershow_show_info_panel_exif (4965486882625125154) -->
-    <skip />
-    <!-- no translation found for filtershow_add_button_looks (8630823661416925426) -->
-    <skip />
-    <!-- no translation found for filtershow_add_button_versions (7620107266685809612) -->
-    <skip />
-    <!-- no translation found for filtershow_version_original (1413894292200912828) -->
-    <skip />
-    <!-- no translation found for filtershow_version_current (6609334422797468952) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_model (3543206476046267466) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_aperture (5076571522763604380) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_focal_length (5925151469731623706) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_iso (5822494416955625317) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_subject_distance (4920632253433906646) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_date (8882402253732028544) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_f_stop (6081797865604483139) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_exposure_time (4099067062781294115) -->
-    <skip />
-    <!-- no translation found for filtershow_exif_copyright (8801875918803737581) -->
-    <skip />
-</resources>

diff --git a/res/values-hi/filtershow_strings.xml b/res/values-hi/filtershow_strings.xml
index b4023c3..8ee3a90 100644 (file)
--- a/res/values-hi/filtershow_strings.xml
+++ b/res/values-hi/filtershow_strings.xml
@@ -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">"निरà¥\8dयात à¤\95िया à¤\97या à¤\9aितà¥\8dर, à¤\87तिहास à¤\95à¥\87 बिना à¤\8fà¤\95 à¤\95à¥\89पà¥\80 होगा."</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"निरà¥\8dयात à¤\95िया à¤\97या à¤\9aितà¥\8dर, à¤\87तिहास à¤\95à¥\87 बिना à¤\8fà¤\95 पà¥\8dरतिलिपि होगा."</string>
     <string name="quality" msgid="179292110309050529">"गुणवत्ता"</string>
     <string name="size" msgid="4639404642236356037">"आकार"</string>
     <string name="x" msgid="6810256999024563662">"x"</string>

diff --git a/res/values-in/filtershow_strings.xml b/res/values-in/filtershow_strings.xml
index 370858c..3cc8b33 100644 (file)
--- a/res/values-in/filtershow_strings.xml
+++ b/res/values-in/filtershow_strings.xml
@@ -33,7 +33,7 @@
     <string name="export_image" msgid="3202835713172222134">"Ekspor"</string>
     <string name="print_image" msgid="1942989216591621413">"Cetak"</string>
     <string name="export_flattened" msgid="9046192331465915411">"Ekspor Gambar yang Dipipihkan"</string>
-    <string name="select_output_settings" msgid="1268532018080310748">"Gambar yang diekspor akan berupa salinan, tanpa histori."</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Gambar yang diekspor akan berupa salinan, tanpa riwayat."</string>
     <string name="quality" msgid="179292110309050529">"Kualitas"</string>
     <string name="size" msgid="4639404642236356037">"Ukuran"</string>
     <string name="x" msgid="6810256999024563662">"x"</string>
@@ -43,7 +43,7 @@
     <string name="save_and_exit" msgid="3628425023766687419">"Simpan dan Keluar"</string>
     <string name="save_and_processing" msgid="6371565035837463194">"Memproses gambar resolusi penuh..."</string>
     <string name="exit" msgid="242642957038770113">"Keluar"</string>
-    <string name="history" msgid="455767361472692409">"Histori"</string>
+    <string name="history" msgid="455767361472692409">"Riwayat"</string>
     <string name="reset" msgid="9013181350779592937">"Setel Ulang"</string>
     <!-- no translation found for history_original (150973253194312841) -->
     <skip />

diff --git a/res/values-mr/filtershow_strings.xml b/res/values-mr/filtershow_strings.xml
index 09b5991..498b656 100644 (file)
--- a/res/values-mr/filtershow_strings.xml
+++ b/res/values-mr/filtershow_strings.xml
@@ -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">"à¤\87मà¥\87à¤\9c लोड करु शकत नाही!"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"पà¥\8dरतिमा लोड करु शकत नाही!"</string>
     <string name="cannot_edit_original" msgid="5890293845882609388">"मूळ संपादित करू शकत नाही"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
@@ -31,17 +31,17 @@
     <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">"पà¥\8dरिà¤\82à¤\9f करा"</string>
-    <string name="export_flattened" msgid="9046192331465915411">"सपाà¤\9f à¤\95à¥\87लà¥\87लà¥\80 à¤\87मà¥\87à¤\9c निर्यात करा"</string>
-    <string name="select_output_settings" msgid="1268532018080310748">"निरà¥\8dयात à¤\95à¥\87लà¥\87लà¥\80 à¤\87मà¥\87à¤\9c इतिहासाशिवाय एक प्रतिलिपी असेल."</string>
+    <string name="print_image" msgid="1942989216591621413">"मà¥\81दà¥\8dरण करा"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"सपाà¤\9f à¤\95à¥\87लà¥\87लà¥\80 पà¥\8dरतिमा निर्यात करा"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"निरà¥\8dयात à¤\95à¥\87लà¥\87लà¥\80 पà¥\8dरतिमा इतिहासाशिवाय एक प्रतिलिपी असेल."</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">"सà¥\87वà¥\8dह करा आणि बाहेर पडा"</string>
-    <string name="save_and_processing" msgid="6371565035837463194">"संपूर्ण रिजोल्यूशन प्रतिमेवर प्रक्रिया करत आहे..."</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"à¤\9cतन करा आणि बाहेर पडा"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"सà¤\82पà¥\82रà¥\8dण रिà¤\9cà¥\8bलà¥\8dयà¥\82शन पà¥\8dरतिमà¥\87वर पà¥\8dरà¤\95à¥\8dरिया à¤\95रà¥\80त à¤\86हà¥\87..."</string>
     <string name="exit" msgid="242642957038770113">"निर्गमन करा"</string>
     <string name="history" msgid="455767361472692409">"इतिहास"</string>
     <string name="reset" msgid="9013181350779592937">"रीसेट करा"</string>
@@ -129,14 +129,14 @@
     <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">"à¤\87मà¥\87à¤\9c à¤\9cतन à¤\95रत आहे"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"पà¥\8dरतिमा à¤\9cतन à¤\95रà¥\80त आहे"</string>
     <string name="filtershow_notification_message" msgid="2661871765484036286">"प्रक्रिया करत आहे..."</string>
-    <string name="filtershow_save_preset" msgid="3933550455577927439">"वरà¥\8dतमान पà¥\8dरà¥\80सà¥\87à¤\9f सà¥\87वà¥\8dह करा"</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"वरà¥\8dतमान पà¥\8dरà¥\80सà¥\87à¤\9f à¤\9cतन करा"</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">"à¤\87मà¥\87à¤\9c नाव"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"पà¥\8dरतिमा नाव"</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>

diff --git a/res/values-my/filtershow_strings.xml b/res/values-my/filtershow_strings.xml
index 71b5053..14c8714 100644 (file)
--- a/res/values-my/filtershow_strings.xml
+++ b/res/values-my/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-pa/filtershow_strings.xml b/res/values-pa/filtershow_strings.xml
index ab64b8b..04f4996 100644 (file)
--- a/res/values-pa/filtershow_strings.xml
+++ b/res/values-pa/filtershow_strings.xml
@@ -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-pt-rPT/filtershow_strings.xml b/res/values-pt-rPT/filtershow_strings.xml
index 1a61250..05fff73 100644 (file)
--- a/res/values-pt-rPT/filtershow_strings.xml
+++ b/res/values-pt-rPT/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">"Editor de Fotos"</string>
+    <string name="title_activity_filter_show" msgid="2036539130684382763">"Editor de Fotografias"</string>
     <string name="cannot_load_image" msgid="5023634941212959976">"Não é possível carregar a imagem!"</string>
     <string name="cannot_edit_original" msgid="5890293845882609388">"Não é possível editar o original"</string>
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="setting_wallpaper" msgid="4679087092300036632">"A definir imagem de fundo"</string>
-    <string name="download_failure" msgid="5923323939788582895">"Não foi possível transferir a foto. Rede não disponível."</string>
+    <string name="download_failure" msgid="5923323939788582895">"Não foi possível transferir a fotografia. Rede não disponível."</string>
     <string name="original" msgid="3524493791230430897">"Original"</string>
     <string name="borders" msgid="2067345080568684614">"Limites"</string>
     <string name="custom_border" msgid="8679893731790931871">"Personalizado"</string>

diff --git a/res/values-pt/filtershow_strings.xml b/res/values-pt/filtershow_strings.xml
index f6bdbd9..bca61b9 100644 (file)
--- a/res/values-pt/filtershow_strings.xml
+++ b/res/values-pt/filtershow_strings.xml
@@ -39,7 +39,7 @@
     <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Configurações"</string>
     <string name="unsaved" msgid="8704442449002374375">"Existem alterações não salvas nesta imagem."</string>
-    <string name="save_before_exit" msgid="2680660633675916712">"Quer salvar antes de sair?"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Deseja salvar antes de sair?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Salvar e sair"</string>
     <string name="save_and_processing" msgid="6371565035837463194">"Processando imagem em resolução máxima…"</string>
     <string name="exit" msgid="242642957038770113">"Sair"</string>

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
index a3a7e95..928c3ea 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterGradRepresentation.java
@@ -104,7 +104,7 @@ public class FilterGradRepresentation extends FilterRepresentation
                 count++;
             }
         }
-        return "c=" + mBands.indexOf(mBands) + "[" + mBands.size() + "]" + count;
+        return "c=" + mBands.indexOf(mCurrentBand) + "[" + mBands.size() + "]" + count;
     }
 
     private void creatExample() {

diff --git a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
index d316ade..512594f 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
+++ b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
@@ -151,7 +151,7 @@ public class FilterVignetteRepresentation extends FilterRepresentation implement
     }
 
     public boolean isCenterSet() {
-        return mCenterX != Float.NaN;
+        return !Float.isNaN(mCenterX);
     }
 
     @Override

diff --git a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
index b94e52e..06fc1dc 100644 (file)
--- a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java
@@ -189,7 +189,7 @@ public class EclipseControl {
     }
 
     public void paintGrayPoint(Canvas canvas, float x, float y) {
-        if (x == Float.NaN) {
+        if (Float.isNaN(x)) {
             return;
         }
 
@@ -206,7 +206,7 @@ public class EclipseControl {
     }
 
     public void paintPoint(Canvas canvas, float x, float y) {
-        if (x == Float.NaN) {
+        if (Float.isNaN(x)) {
             return;
         }
 
@@ -223,7 +223,7 @@ public class EclipseControl {
     }
 
     void paintRadius(Canvas canvas, float cx, float cy, float rx, float ry) {
-        if (cx == Float.NaN) {
+        if (Float.isNaN(cx)) {
             return;
         }
         int mSliderColor = 0xFF33B5E5;