diff options
40 files changed, 700 insertions, 88 deletions
diff --git a/Android.mk b/Android.mk index 9443cfba3..106299d31 100755 --- a/Android.mk +++ b/Android.mk @@ -24,6 +24,8 @@ LOCAL_CERTIFICATE := platform LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D +LOCAL_PROGUARD_ENABLED := disabled + #LOCAL_SDK_VERSION := current LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream @@ -40,7 +42,7 @@ endif LOCAL_PROGUARD_FLAG_FILES := proguard.flags -LOCAL_MULTILIB := 32 +LOCAL_JAVA_LIBRARIES += org.apache.http.legacy include $(BUILD_PACKAGE) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index e64fcf612..be35585e2 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -67,8 +67,10 @@ android:hardwareAccelerated="true" android:largeHeap="true" android:restoreAnyVersion="true" - android:supportsRtl="true"> + android:supportsRtl="true" + usesCleartextHttp="true"> <uses-library android:name="com.google.android.media.effects" android:required="false" /> + <uses-library android:name="org.apache.http.legacy" android:required="false" /> <activity android:name="com.android.gallery3d.app.MovieActivity" android:label="@string/movie_view_label" android:configChanges="orientation|keyboardHidden|screenSize"> diff --git a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java index a671ed2b9..99b125168 100644 --- a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java +++ b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java @@ -23,7 +23,6 @@ import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Paint; import android.os.Build; -import android.util.FloatMath; import android.util.Log; import java.io.ByteArrayOutputStream; @@ -72,7 +71,7 @@ public class BitmapUtils { && minSideLength == UNCONSTRAINED) return 1; int lowerBound = (maxNumOfPixels == UNCONSTRAINED) ? 1 : - (int) FloatMath.ceil(FloatMath.sqrt((float) (w * h) / maxNumOfPixels)); + (int) Math.ceil(Math.sqrt((double) (w * h) / maxNumOfPixels)); if (minSideLength == UNCONSTRAINED) { return lowerBound; @@ -96,7 +95,7 @@ public class BitmapUtils { // Find the min x that 1 / x >= scale public static int computeSampleSizeLarger(float scale) { - int initialSize = (int) FloatMath.floor(1f / scale); + int initialSize = (int) Math.floor(1d / scale); if (initialSize <= 1) return 1; return initialSize <= 8 @@ -107,7 +106,7 @@ public class BitmapUtils { // Find the max x that 1 / x <= scale. public static int computeSampleSize(float scale) { Utils.assertTrue(scale > 0); - int initialSize = Math.max(1, (int) FloatMath.ceil(1 / scale)); + int initialSize = Math.max(1, (int) Math.ceil(1 / scale)); return initialSize <= 8 ? Utils.nextPowerOf2(initialSize) : (initialSize + 7) / 8 * 8; diff --git a/gallerycommon/src/com/android/gallery3d/common/OverScroller.java b/gallerycommon/src/com/android/gallery3d/common/OverScroller.java index 1ab7953d2..a03c45196 100644 --- a/gallerycommon/src/com/android/gallery3d/common/OverScroller.java +++ b/gallerycommon/src/com/android/gallery3d/common/OverScroller.java @@ -18,7 +18,6 @@ package com.android.gallery3d.common; import android.content.Context; import android.hardware.SensorManager; -import android.util.FloatMath; import android.util.Log; import android.view.ViewConfiguration; import android.view.animation.AnimationUtils; @@ -175,9 +174,7 @@ public class OverScroller { * @return The original velocity less the deceleration, norm of the X and Y velocity vector. */ public float getCurrVelocity() { - float squaredNorm = mScrollerX.mCurrVelocity * mScrollerX.mCurrVelocity; - squaredNorm += mScrollerY.mCurrVelocity * mScrollerY.mCurrVelocity; - return FloatMath.sqrt(squaredNorm); + return (float) Math.hypot(mScrollerX.mCurrVelocity, mScrollerY.mCurrVelocity); } /** diff --git a/gallerycommon/src/com/android/gallery3d/common/Scroller.java b/gallerycommon/src/com/android/gallery3d/common/Scroller.java index 6cefd6fb0..cce0c9284 100644 --- a/gallerycommon/src/com/android/gallery3d/common/Scroller.java +++ b/gallerycommon/src/com/android/gallery3d/common/Scroller.java @@ -19,7 +19,6 @@ package com.android.gallery3d.common; import android.content.Context; import android.hardware.SensorManager; import android.os.Build; -import android.util.FloatMath; import android.view.ViewConfiguration; import android.view.animation.AnimationUtils; import android.view.animation.Interpolator; @@ -372,7 +371,7 @@ public class Scroller { float dx = mFinalX - mStartX; float dy = mFinalY - mStartY; - float hyp = FloatMath.sqrt(dx * dx + dy * dy); + float hyp = (float) Math.hypot(dx, dy); float ndx = dx / hyp; float ndy = dy / hyp; @@ -389,7 +388,7 @@ public class Scroller { mMode = FLING_MODE; mFinished = false; - float velocity = FloatMath.sqrt(velocityX * velocityX + velocityY * velocityY); + float velocity = (float) Math.hypot(velocityX, velocityY); mVelocity = velocity; final double l = Math.log(START_TENSION * velocity / ALPHA); diff --git a/res/values-am/filtershow_strings.xml b/res/values-am/filtershow_strings.xml index 196e99cc7..2334d0fea 100644 --- a/res/values-am/filtershow_strings.xml +++ b/res/values-am/filtershow_strings.xml @@ -73,7 +73,7 @@ <string name="wbalance" msgid="6346581563387083613">"ራስ-ቀለም መሙላት"</string> <string name="hue" msgid="6231252147971086030">"የቀለም ድባብ"</string> <string name="shadow_recovery" msgid="3928572915300287152">"ጥላዎች"</string> - <string name="highlight_recovery" msgid="8262208470735204243">"ድምቀቶች"</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> diff --git a/res/values-az-rAZ/filtershow_strings.xml b/res/values-az-rAZ/filtershow_strings.xml index 3f8f22dee..4da012ceb 100644 --- a/res/values-az-rAZ/filtershow_strings.xml +++ b/res/values-az-rAZ/filtershow_strings.xml @@ -24,8 +24,8 @@ <string name="setting_wallpaper" msgid="4679087092300036632">"Divar kağızı ayarlanır"</string> <string name="download_failure" msgid="5923323939788582895">"Şəkil endirilə bilmədi. Şəbəkə əlçatmazdır."</string> <string name="original" msgid="3524493791230430897">"Original"</string> - <string name="saved" msgid="6678827180814174711">"Yadda saxlanılmış"</string> <string name="borders" msgid="2067345080568684614">"Sərhədlər"</string> + <string name="custom_border" msgid="8679893731790931871">"Fərdi"</string> <string name="filtershow_undo" msgid="6781743189243585101">"Ləğv edin"</string> <string name="filtershow_redo" msgid="4219489910543059747">"Yenidən edin"</string> <string name="show_imagestate_panel" msgid="281932769701043015">"Tətbiq Olunmuş Effektləri Göstər"</string> @@ -119,7 +119,7 @@ <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Marker"</string> <string name="draw_style_brush_marker" msgid="8468302322165644292">"Sıçratma"</string> <string name="draw_clear" msgid="6728155515454921052">"Sil"</string> - <string name="color_border_size" msgid="8745307483517793073">"qalınlıq"</string> + <string name="color_border_size" msgid="1086895807615869290">"Qalınlıq"</string> <string name="color_border_corner_size" msgid="7637235159438869979">"Künc Ölçüsü"</string> <string name="color_border_color" msgid="8765458414425980711">"Rəng"</string> <string name="color_border_clear" msgid="4418261191091091722">"Təmizlə"</string> diff --git a/res/values-cs/filtershow_strings.xml b/res/values-cs/filtershow_strings.xml index e5d0070e1..dca7b870d 100644 --- a/res/values-cs/filtershow_strings.xml +++ b/res/values-cs/filtershow_strings.xml @@ -53,12 +53,12 @@ <string name="reset_effect" msgid="7712605581024929564">"Obnovit"</string> <string name="aspect" msgid="4025244950820813059">"Poměr stran"</string> <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string> - <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</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="aspect9to16_effect" msgid="7740468012919660728">"16 : 9"</string> <string name="aspectNone_effect" msgid="6263330561046574134">"Žádný"</string> <!-- no translation found for aspectOriginal_effect (5678516555493036594) --> <skip /> diff --git a/res/values-en-rAU/filtershow_strings.xml b/res/values-en-rAU/filtershow_strings.xml new file mode 100644 index 000000000..bd076f472 --- /dev/null +++ b/res/values-en-rAU/filtershow_strings.xml @@ -0,0 +1,156 @@ +<?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-fa/filtershow_strings.xml b/res/values-fa/filtershow_strings.xml index f730a38af..4d506a2d5 100644 --- a/res/values-fa/filtershow_strings.xml +++ b/res/values-fa/filtershow_strings.xml @@ -21,12 +21,12 @@ <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="setting_wallpaper" msgid="4679087092300036632">"تنظیم کاغذدیواری"</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> @@ -59,7 +59,7 @@ <string name="aspect5to7_effect" msgid="5122395569059384741">"۵:۷"</string> <string name="aspect7to5_effect" msgid="5780001758108328143">"۷:۵"</string> <string name="aspect9to16_effect" msgid="7740468012919660728">"۱۶:۹"</string> - <string name="aspectNone_effect" msgid="6263330561046574134">"هیچکدام"</string> + <string name="aspectNone_effect" msgid="6263330561046574134">"هیچکدام"</string> <!-- no translation found for aspectOriginal_effect (5678516555493036594) --> <skip /> <string name="Fixed" msgid="8017376448916924565">"ثابت"</string> @@ -75,7 +75,7 @@ <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" msgid="934721068851885390">"حاشیه تاریک"</string> <string name="vignette_main" msgid="6046495605390665423">"حاشیه تاریک"</string> <string name="vignette_exposure" msgid="6862058227309534094">"نوردهی"</string> <string name="vignette_saturation" msgid="1617055207565719771">"اشباع رنگ"</string> @@ -88,7 +88,7 @@ <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="none" msgid="6633966646410296520">"هیچکدام"</string> <string name="edge" msgid="7036064886242147551">"لبهها"</string> <string name="kmeans" msgid="2080952022674981541">"چندرنگی"</string> <string name="downsample" msgid="3552938534146980104">"کاهش وضوح"</string> diff --git a/res/values-fr/filtershow_strings.xml b/res/values-fr/filtershow_strings.xml index a0f58b8fb..f504f7a9a 100644 --- a/res/values-fr/filtershow_strings.xml +++ b/res/values-fr/filtershow_strings.xml @@ -84,7 +84,7 @@ <string name="redeye" msgid="4508883127049472069">"Yeux rouges"</string> <string name="imageDraw" msgid="6918552177844486656">"Dessiner"</string> <string name="straighten" msgid="26025591664983528">"Redresser"</string> - <string name="crop" msgid="5781263790107850771">"Rogner"</string> + <string name="crop" msgid="5781263790107850771">"Recadrer"</string> <string name="rotate" msgid="2796802553793795371">"Rotation"</string> <string name="mirror" msgid="5482518108154883096">"Miroir"</string> <string name="negative" msgid="6998313764388022201">"Négatif"</string> diff --git a/res/values-gu-rIN/filtershow_strings.xml b/res/values-gu-rIN/filtershow_strings.xml new file mode 100644 index 000000000..1348f59cc --- /dev/null +++ b/res/values-gu-rIN/filtershow_strings.xml @@ -0,0 +1,156 @@ +<?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">"છબી લોડ કરી શકાતી નથી!"</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">"મૂળભૂત"</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">"BW ફિલ્ટર"</string> + <string name="wbalance" msgid="6346581563387083613">"સ્વત:રંગ"</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">"એજેસ"</string> + <string name="kmeans" msgid="2080952022674981541">"પોસ્ટરાઇઝ"</string> + <string name="downsample" msgid="3552938534146980104">"Downsample"</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">"વાદળી"</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">"વાદળી"</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">"રેખાઓ"</string> + <string name="draw_style_brush_spatter" msgid="7612691122932981554">"માર્કર"</string> + <string name="draw_style_brush_marker" msgid="8468302322165644292">"સ્પેટર"</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">"ઑકે"</string> + <string name="state_panel_original" msgid="9069584409934164419">"મૂળભૂત"</string> + <string name="state_panel_result" msgid="318640531123298676">"પરિણામ"</string> + <string name="filtershow_notification_label" msgid="1653168445525855247">"ચિત્ર સાચવી રહ્યું છે"</string> + <string name="filtershow_notification_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">"મૂળભૂત"</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">"F બંધ"</string> + <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"પ્રદર્શન સમય"</string> + <string name="filtershow_exif_copyright" msgid="8801875918803737581">"કોપિરાઇટ"</string> +</resources> diff --git a/res/values-hi/filtershow_strings.xml b/res/values-hi/filtershow_strings.xml index 07b794bc3..8ee3a9011 100644 --- a/res/values-hi/filtershow_strings.xml +++ b/res/values-hi/filtershow_strings.xml @@ -26,7 +26,7 @@ <string name="original" msgid="3524493791230430897">"मूल"</string> <string name="borders" msgid="2067345080568684614">"बॉर्डर"</string> <string name="custom_border" msgid="8679893731790931871">"कस्टम"</string> - <string name="filtershow_undo" msgid="6781743189243585101">"पूर्ववत करें"</string> + <string name="filtershow_undo" msgid="6781743189243585101">"वापस लाएं"</string> <string name="filtershow_redo" msgid="4219489910543059747">"फिर से करें"</string> <string name="show_imagestate_panel" msgid="281932769701043015">"लागू प्रभाव दिखाएं"</string> <string name="hide_imagestate_panel" msgid="7207643485811695257">"लागू प्रभाव छिपाएं"</string> @@ -40,7 +40,7 @@ <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_exit" msgid="3628425023766687419">"जोड़ें और बाहर निकलें"</string> <string name="save_and_processing" msgid="6371565035837463194">"पूर्ण रिज़ॉल्यूशन चित्र प्रोसेस हो रहा है..."</string> <string name="exit" msgid="242642957038770113">"बाहर निकलें"</string> <string name="history" msgid="455767361472692409">"इतिहास"</string> @@ -93,7 +93,7 @@ <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_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> @@ -113,7 +113,7 @@ <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_value" msgid="6571604055161538273">"स्क्रीन की रोशनी"</string> <string name="draw_color" msgid="2119030386987211193">"रंग"</string> <string name="draw_style_line" msgid="9216476853904429628">"रेखाएं"</string> <string name="draw_style_brush_spatter" msgid="7612691122932981554">"मार्कर"</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> @@ -141,7 +141,7 @@ <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_add_button_versions" msgid="7620107266685809612">"वर्शन"</string> <string name="filtershow_version_original" msgid="1413894292200912828">"मूल"</string> <string name="filtershow_version_current" msgid="6609334422797468952">"वर्तमान"</string> <string name="filtershow_exif_model" msgid="3543206476046267466">"मॉडल"</string> diff --git a/res/values-iw/filtershow_strings.xml b/res/values-iw/filtershow_strings.xml index 3c5ebcdb5..0279b9f43 100644 --- a/res/values-iw/filtershow_strings.xml +++ b/res/values-iw/filtershow_strings.xml @@ -39,7 +39,7 @@ <string name="x" msgid="6810256999024563662">"x"</string> <string name="menu_settings" msgid="6428291655769260831">"הגדרות"</string> <string name="unsaved" msgid="8704442449002374375">"יש בתמונה הזו שינויים שלא נשמרו."</string> - <string name="save_before_exit" msgid="2680660633675916712">"האם אתה רוצה לשמור לפני היציאה?"</string> + <string name="save_before_exit" msgid="2680660633675916712">"האם ברצונך לשמור לפני היציאה?"</string> <string name="save_and_exit" msgid="3628425023766687419">"שמור וצא"</string> <string name="save_and_processing" msgid="6371565035837463194">"מעבד תמונה ברזולוציה מלאה..."</string> <string name="exit" msgid="242642957038770113">"צא"</string> diff --git a/res/values-km-rKH/filtershow_strings.xml b/res/values-km-rKH/filtershow_strings.xml index 4150e7567..e613c8d10 100644 --- a/res/values-km-rKH/filtershow_strings.xml +++ b/res/values-km-rKH/filtershow_strings.xml @@ -41,7 +41,7 @@ <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_processing" msgid="6371565035837463194">"កំពុងដំណើរការរូបភាពមានគុណភាពបង្ហាញពេញលេញ..."</string> <string name="exit" msgid="242642957038770113">"ចេញ"</string> <string name="history" msgid="455767361472692409">"ប្រវត្តិ"</string> <string name="reset" msgid="9013181350779592937">"កំណត់ឡើងវិញ"</string> diff --git a/res/values-kn-rIN/filtershow_strings.xml b/res/values-kn-rIN/filtershow_strings.xml index 171d99514..c37ef5f84 100644 --- a/res/values-kn-rIN/filtershow_strings.xml +++ b/res/values-kn-rIN/filtershow_strings.xml @@ -124,7 +124,7 @@ <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="color_pick_title" msgid="6195567431995308876">"ಬಣ್ಣ ಆಯ್ಕೆಮಾಡಿ"</string> <string name="draw_size_title" msgid="3121649039610273977">"ಗಾತ್ರವನ್ನು ಆಯ್ಕೆಮಾಡಿ"</string> <string name="draw_size_accept" msgid="6781529716526190028">"ಸರಿ"</string> <string name="state_panel_original" msgid="9069584409934164419">"ಮೂಲ ಚಿತ್ರ"</string> diff --git a/res/values-ml-rIN/filtershow_strings.xml b/res/values-ml-rIN/filtershow_strings.xml index 68a4111e9..777519afd 100644 --- a/res/values-ml-rIN/filtershow_strings.xml +++ b/res/values-ml-rIN/filtershow_strings.xml @@ -103,13 +103,13 @@ <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"സിയാൻ"</string> <string name="editor_chan_sat_blue" msgid="384409736863387895">"നീല"</string> <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"മജന്ത"</string> - <string name="editor_grad_style" msgid="2168414479007745179">"ശൈലി"</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">"നീല"</string> - <string name="draw_style" msgid="2036125061987325389">"ശൈലി"</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> diff --git a/res/values-mr-rIN/filtershow_strings.xml b/res/values-mr-rIN/filtershow_strings.xml index a71cbf070..6936fe1fc 100644 --- a/res/values-mr-rIN/filtershow_strings.xml +++ b/res/values-mr-rIN/filtershow_strings.xml @@ -75,8 +75,8 @@ <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" 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> diff --git a/res/values-nl/filtershow_strings.xml b/res/values-nl/filtershow_strings.xml index a5ef88252..f104e04ca 100644 --- a/res/values-nl/filtershow_strings.xml +++ b/res/values-nl/filtershow_strings.xml @@ -44,13 +44,13 @@ <string name="save_and_processing" msgid="6371565035837463194">"Afbeelding met volledige resolutie verwerken..."</string> <string name="exit" msgid="242642957038770113">"Sluiten"</string> <string name="history" msgid="455767361472692409">"Geschiedenis"</string> - <string name="reset" msgid="9013181350779592937">"Opnieuw instellen"</string> + <string name="reset" msgid="9013181350779592937">"Resetten"</string> <!-- no translation found for history_original (150973253194312841) --> <skip /> <string name="imageState" msgid="8632586742752891968">"Toegepaste effecten"</string> <string name="compare_original" msgid="8140838959007796977">"Vergelijken"</string> <string name="apply_effect" msgid="1218288221200568947">"Toepassen"</string> - <string name="reset_effect" msgid="7712605581024929564">"Opnieuw instellen"</string> + <string name="reset_effect" msgid="7712605581024929564">"Resetten"</string> <string name="aspect" msgid="4025244950820813059">"Beeldverhouding"</string> <string name="aspect1to1_effect" msgid="1159104543795779123">"1:1"</string> <string name="aspect4to3_effect" msgid="7968067847241223578">"4:3"</string> diff --git a/res/values-pa-rIN/filtershow_strings.xml b/res/values-pa-rIN/filtershow_strings.xml new file mode 100644 index 000000000..0c9604196 --- /dev/null +++ b/res/values-pa-rIN/filtershow_strings.xml @@ -0,0 +1,156 @@ +<?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">"ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਕਰ ਸਕਦਾ!"</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">"ਮੂਲ"</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">"BW ਫਿਲਟਰ"</string> + <string name="wbalance" msgid="6346581563387083613">"ਆਟੋਕਲਰ"</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">"ਕਿਨਾਰੇ"</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">"ਨੀਲਾ"</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">"ਨੀਲਾ"</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">"ਲਾਈਨਾਂ"</string> + <string name="draw_style_brush_spatter" msgid="7612691122932981554">"ਅੰਕਕ"</string> + <string name="draw_style_brush_marker" msgid="8468302322165644292">"ਸਪੈਟਰ"</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">"ਠੀਕ"</string> + <string name="state_panel_original" msgid="9069584409934164419">"ਮੂਲ"</string> + <string name="state_panel_result" msgid="318640531123298676">"ਨਤੀਜਾ"</string> + <string name="filtershow_notification_label" msgid="1653168445525855247">"ਚਿੱਤਰ ਸੁਰੱਖਿਅਤ ਕਰ ਰਿਹਾ ਹੈ"</string> + <string name="filtershow_notification_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">"ਮੂਲ"</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">"F ਸਟੌਪ"</string> + <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"ਐਕਸਪੋਜ਼ਰ ਸਮਾਂ"</string> + <string name="filtershow_exif_copyright" msgid="8801875918803737581">"ਕਾਪੀਰਾਈਟ"</string> +</resources> diff --git a/res/values-ro/filtershow_strings.xml b/res/values-ro/filtershow_strings.xml index 6fbdb38fc..c7cfb8d8b 100644 --- a/res/values-ro/filtershow_strings.xml +++ b/res/values-ro/filtershow_strings.xml @@ -26,7 +26,7 @@ <string name="original" msgid="3524493791230430897">"Originală"</string> <string name="borders" msgid="2067345080568684614">"Chenar"</string> <string name="custom_border" msgid="8679893731790931871">"Personalizat"</string> - <string name="filtershow_undo" msgid="6781743189243585101">"Anulaţi"</string> + <string name="filtershow_undo" msgid="6781743189243585101">"Anulați"</string> <string name="filtershow_redo" msgid="4219489910543059747">"Repetaţi"</string> <string name="show_imagestate_panel" msgid="281932769701043015">"Afișați efectele aplicate"</string> <string name="hide_imagestate_panel" msgid="7207643485811695257">"Ascundeți efectele aplicate"</string> diff --git a/res/values-sq-rAL/filtershow_strings.xml b/res/values-sq-rAL/filtershow_strings.xml new file mode 100644 index 000000000..ac92f8c47 --- /dev/null +++ b/res/values-sq-rAL/filtershow_strings.xml @@ -0,0 +1,156 @@ +<?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">"Redaktori i fotografisë"</string> + <string name="cannot_load_image" msgid="5023634941212959976">"Imazhi nuk mund të ngarkohet!"</string> + <string name="cannot_edit_original" msgid="5890293845882609388">"Origjinali nuk mund të redaktohet"</string> + <!-- no translation found for original_picture_text (3076213290079909698) --> + <skip /> + <string name="setting_wallpaper" msgid="4679087092300036632">"Po cakton imazhin e sfondit"</string> + <string name="download_failure" msgid="5923323939788582895">"Fotografia nuk mund të shkarkohej. Rrjeti nuk mund të përdoret."</string> + <string name="original" msgid="3524493791230430897">"Origjinali"</string> + <string name="borders" msgid="2067345080568684614">"Bordurat"</string> + <string name="custom_border" msgid="8679893731790931871">"I personalizuar"</string> + <string name="filtershow_undo" msgid="6781743189243585101">"Zhbëj"</string> + <string name="filtershow_redo" msgid="4219489910543059747">"Ribëj"</string> + <string name="show_imagestate_panel" msgid="281932769701043015">"Shfaq efektet e zbatuara"</string> + <string name="hide_imagestate_panel" msgid="7207643485811695257">"Fshih efektet e zbatuara"</string> + <string name="export_image" msgid="3202835713172222134">"Eksporto"</string> + <string name="print_image" msgid="1942989216591621413">"Printo"</string> + <string name="export_flattened" msgid="9046192331465915411">"Eksporto imazhin e thjeshtëzuar"</string> + <string name="select_output_settings" msgid="1268532018080310748">"Imazhi i eksportuar do të jetë kopje, pa historikun."</string> + <string name="quality" msgid="179292110309050529">"Cilësia"</string> + <string name="size" msgid="4639404642236356037">"Madhësia"</string> + <string name="x" msgid="6810256999024563662">"x"</string> + <string name="menu_settings" msgid="6428291655769260831">"Cilësimet"</string> + <string name="unsaved" msgid="8704442449002374375">"Ka ndryshime të paruajtura në këtë imazh."</string> + <string name="save_before_exit" msgid="2680660633675916712">"Dëshiron që ta ruash para se të dalësh?"</string> + <string name="save_and_exit" msgid="3628425023766687419">"Ruaj dhe dil"</string> + <string name="save_and_processing" msgid="6371565035837463194">"Po përpunon imazhin me rezolucion të plotë..."</string> + <string name="exit" msgid="242642957038770113">"Dil"</string> + <string name="history" msgid="455767361472692409">"Historiku"</string> + <string name="reset" msgid="9013181350779592937">"Rivendos"</string> + <!-- no translation found for history_original (150973253194312841) --> + <skip /> + <string name="imageState" msgid="8632586742752891968">"Efektet e zbatuara"</string> + <string name="compare_original" msgid="8140838959007796977">"Krahaso"</string> + <string name="apply_effect" msgid="1218288221200568947">"Zbato"</string> + <string name="reset_effect" msgid="7712605581024929564">"Rivendos"</string> + <string name="aspect" msgid="4025244950820813059">"Aspekti"</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">"Asnjë"</string> + <!-- no translation found for aspectOriginal_effect (5678516555493036594) --> + <skip /> + <string name="Fixed" msgid="8017376448916924565">"I fiksuar"</string> + <string name="tinyplanet" msgid="2783694326474415761">"Planeti i vogël"</string> + <string name="exposure" msgid="6526397045949374905">"Ekspozimi"</string> + <string name="sharpness" msgid="6463103068318055412">"Qartësia"</string> + <string name="contrast" msgid="2310908487756769019">"Kontrasti"</string> + <string name="vibrance" msgid="3326744578577835915">"Gjallëria"</string> + <string name="saturation" msgid="7026791551032438585">"Ngopja"</string> + <string name="bwfilter" msgid="8927492494576933793">"Filtri bardhezi"</string> + <string name="wbalance" msgid="6346581563387083613">"Ngjyra automatike"</string> + <string name="hue" msgid="6231252147971086030">"Nuanca"</string> + <string name="shadow_recovery" msgid="3928572915300287152">"Hijet"</string> + <string name="highlight_recovery" msgid="8262208470735204243">"Theksimet"</string> + <string name="curvesRGB" msgid="915010781090477550">"Kurbat"</string> + <string name="vignette" msgid="934721068851885390">"Sfumatura"</string> + <string name="vignette_main" msgid="6046495605390665423">"Sfumatura"</string> + <string name="vignette_exposure" msgid="6862058227309534094">"Ekspozimi"</string> + <string name="vignette_saturation" msgid="1617055207565719771">"Ngopja"</string> + <string name="vignette_contrast" msgid="955732121756799897">"Kontrasti"</string> + <string name="vignette_falloff" msgid="690918055030064199">"Rënia e ndriçimit"</string> + <string name="redeye" msgid="4508883127049472069">"Syri i kuq"</string> + <string name="imageDraw" msgid="6918552177844486656">"Vizato"</string> + <string name="straighten" msgid="26025591664983528">"Drejtimi"</string> + <string name="crop" msgid="5781263790107850771">"Prit anët"</string> + <string name="rotate" msgid="2796802553793795371">"Rrotullo"</string> + <string name="mirror" msgid="5482518108154883096">"Pasqyra"</string> + <string name="negative" msgid="6998313764388022201">"Negativ"</string> + <string name="none" msgid="6633966646410296520">"Asnjë"</string> + <string name="edge" msgid="7036064886242147551">"Anët"</string> + <string name="kmeans" msgid="2080952022674981541">"Bëje afishe"</string> + <string name="downsample" msgid="3552938534146980104">"E zvogëluar"</string> + <string name="grad" msgid="546774853424848655">"I shkallëzuar"</string> + <string name="editor_grad_brightness" msgid="5937316734380235741">"Ndriçimi"</string> + <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrasti"</string> + <string name="editor_grad_saturation" msgid="3760247354109521726">"Ngopja"</string> + <string name="editor_chan_sat_main" msgid="4427652337797121940">"Kryesore"</string> + <string name="editor_chan_sat_red" msgid="1699222266490540696">"E kuqe"</string> + <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"E verdhë"</string> + <string name="editor_chan_sat_green" msgid="1514055896212975167">"E gjelbër"</string> + <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"E bruztë"</string> + <string name="editor_chan_sat_blue" msgid="384409736863387895">"E kaltër"</string> + <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"E purpurt"</string> + <string name="editor_grad_style" msgid="2168414479007745179">"Stili"</string> + <string name="editor_grad_new" msgid="4857265951369377379">"i ri"</string> + <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string> + <string name="curves_channel_red" msgid="4199710104162111357">"E kuqe"</string> + <string name="curves_channel_green" msgid="3733003466905031016">"E gjelbër"</string> + <string name="curves_channel_blue" msgid="9129211507395079371">"E kaltër"</string> + <string name="draw_style" msgid="2036125061987325389">"Stili"</string> + <string name="draw_size" msgid="4360005386104151209">"Madhësia"</string> + <string name="draw_hue" msgid="4975135843189267133">"Nuanca"</string> + <string name="draw_saturation" msgid="5394395648014454882">"Ngopja"</string> + <string name="draw_value" msgid="6571604055161538273">"Ndriçimi"</string> + <string name="draw_color" msgid="2119030386987211193">"Ngjyra"</string> + <string name="draw_style_line" msgid="9216476853904429628">"Vijat"</string> + <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Shënuesi"</string> + <string name="draw_style_brush_marker" msgid="8468302322165644292">"Spërkatësi"</string> + <string name="draw_clear" msgid="6728155515454921052">"Pastro"</string> + <string name="color_border_size" msgid="1086895807615869290">"Trashësia"</string> + <string name="color_border_corner_size" msgid="7637235159438869979">"Këndi"</string> + <string name="color_border_color" msgid="8765458414425980711">"Ngjyra"</string> + <string name="color_border_clear" msgid="4418261191091091722">"Pastro"</string> + <string name="color_pick_select" msgid="734312818059057394">"Zgjidh ngjyrën e personalizuar"</string> + <string name="color_pick_title" msgid="6195567431995308876">"Zgjidh ngjyrën"</string> + <string name="draw_size_title" msgid="3121649039610273977">"Zgjidh madhësinë"</string> + <string name="draw_size_accept" msgid="6781529716526190028">"Në rregull!"</string> + <string name="state_panel_original" msgid="9069584409934164419">"Origjinali"</string> + <string name="state_panel_result" msgid="318640531123298676">"Rezultati"</string> + <string name="filtershow_notification_label" msgid="1653168445525855247">"Po ruan imazhin"</string> + <string name="filtershow_notification_message" msgid="2661871765484036286">"Po përpunohet..."</string> + <string name="filtershow_save_preset" msgid="3933550455577927439">"Ruaj paracaktimin aktual"</string> + <string name="filtershow_manage_preset" msgid="3872896753708921286">"Menaxho paracaktimet e përdoruesit"</string> + <string name="filtershow_new_preset" msgid="8923930134923416617">"Paracaktimi i ri"</string> + <string name="filtershow_preset_name" msgid="7015939727047649866">"Emri i paracaktimit"</string> + <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informacione"</string> + <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Emri i imazhit"</string> + <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Madhësia e imazhit"</string> + <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogrami"</string> + <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"Të dhënat EXIF"</string> + <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Paracaktimi"</string> + <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versioni"</string> + <string name="filtershow_version_original" msgid="1413894292200912828">"Origjinali"</string> + <string name="filtershow_version_current" msgid="6609334422797468952">"Aktuali"</string> + <string name="filtershow_exif_model" msgid="3543206476046267466">"Modeli"</string> + <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Hapja e diafragmës"</string> + <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Largësia e fokusimit"</string> + <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string> + <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Largësia e subjektit"</string> + <string name="filtershow_exif_date" msgid="8882402253732028544">"Data e realizimit:"</string> + <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Ndalesa F"</string> + <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Ora e ekspozimit"</string> + <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Të drejtat e autorit"</string> +</resources> diff --git a/res/values-sv/filtershow_strings.xml b/res/values-sv/filtershow_strings.xml index 030a8c195..cd2dabe94 100644 --- a/res/values-sv/filtershow_strings.xml +++ b/res/values-sv/filtershow_strings.xml @@ -22,7 +22,7 @@ <!-- no translation found for original_picture_text (3076213290079909698) --> <skip /> <string name="setting_wallpaper" msgid="4679087092300036632">"Bakgrund anges"</string> - <string name="download_failure" msgid="5923323939788582895">"Det gick inte att hämta fotot. Nätverket är inte tillgängligt."</string> + <string name="download_failure" msgid="5923323939788582895">"Det gick inte att ladda ned fotot. Nätverket är inte tillgängligt."</string> <string name="original" msgid="3524493791230430897">"Original"</string> <string name="borders" msgid="2067345080568684614">"Ramar"</string> <string name="custom_border" msgid="8679893731790931871">"Anpassat"</string> diff --git a/res/values-sw/filtershow_strings.xml b/res/values-sw/filtershow_strings.xml index f0c6bf5bc..7b56f927f 100644 --- a/res/values-sw/filtershow_strings.xml +++ b/res/values-sw/filtershow_strings.xml @@ -152,5 +152,5 @@ <string name="filtershow_exif_date" msgid="8882402253732028544">"Tarehe iliyochukuliwa"</string> <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"F Stop"</string> <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Muda ambao Kilango cha kamera kinakaa wazi"</string> - <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Hakimilki"</string> + <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Hakimiliki"</string> </resources> diff --git a/res/values-uz-rUZ/filtershow_strings.xml b/res/values-uz-rUZ/filtershow_strings.xml index 39f946158..b8c97b8b5 100644 --- a/res/values-uz-rUZ/filtershow_strings.xml +++ b/res/values-uz-rUZ/filtershow_strings.xml @@ -25,8 +25,8 @@ <string name="download_failure" msgid="5923323939788582895">"Rasmni ko‘chirib olishda xatolik yuz berdi. Tarmoq uzilib qoldi."</string> <string name="original" msgid="3524493791230430897">"Asl"</string> <string name="borders" msgid="2067345080568684614">"Chegaralar"</string> - <string name="custom_border" msgid="8679893731790931871">"Boshqa"</string> - <string name="filtershow_undo" msgid="6781743189243585101">"Qaytarish"</string> + <string name="custom_border" msgid="8679893731790931871">"Maxsus"</string> + <string name="filtershow_undo" msgid="6781743189243585101">"Bekor qilish"</string> <string name="filtershow_redo" msgid="4219489910543059747">"Oldinga o‘tkazish"</string> <string name="show_imagestate_panel" msgid="281932769701043015">"Foydalanilgan effektlarni ko‘rsatish"</string> <string name="hide_imagestate_panel" msgid="7207643485811695257">"Bajarilgan effeklarni yashirish"</string> @@ -59,7 +59,7 @@ <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">"Hech qaysi"</string> + <string name="aspectNone_effect" msgid="6263330561046574134">"Qo‘lda"</string> <!-- no translation found for aspectOriginal_effect (5678516555493036594) --> <skip /> <string name="Fixed" msgid="8017376448916924565">"Tuzatilgan"</string> @@ -88,7 +88,7 @@ <string name="rotate" msgid="2796802553793795371">"Burish"</string> <string name="mirror" msgid="5482518108154883096">"Oyna"</string> <string name="negative" msgid="6998313764388022201">"Negativ"</string> - <string name="none" msgid="6633966646410296520">"Hech qaysi"</string> + <string name="none" msgid="6633966646410296520">"Asl"</string> <string name="edge" msgid="7036064886242147551">"Qirralari"</string> <string name="kmeans" msgid="2080952022674981541">"Posterlash"</string> <string name="downsample" msgid="3552938534146980104">"Maydalashtirish"</string> @@ -141,7 +141,7 @@ <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Gistogramma"</string> <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF ma’lumotlar"</string> <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Tayyor namuna"</string> - <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Versiyasi"</string> + <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Qo‘shish"</string> <string name="filtershow_version_original" msgid="1413894292200912828">"Asl nuxsasi"</string> <string name="filtershow_version_current" msgid="6609334422797468952">"Joriy"</string> <string name="filtershow_exif_model" msgid="3543206476046267466">"Modeli"</string> diff --git a/res/values-zh-rHK/filtershow_strings.xml b/res/values-zh-rHK/filtershow_strings.xml index 0fb849a59..aa07bc5e0 100644 --- a/res/values-zh-rHK/filtershow_strings.xml +++ b/res/values-zh-rHK/filtershow_strings.xml @@ -76,7 +76,7 @@ <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_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> diff --git a/src/com/android/gallery3d/app/EyePosition.java b/src/com/android/gallery3d/app/EyePosition.java index d99d97b0e..4248f49b8 100644 --- a/src/com/android/gallery3d/app/EyePosition.java +++ b/src/com/android/gallery3d/app/EyePosition.java @@ -22,7 +22,6 @@ import android.hardware.SensorEvent; import android.hardware.SensorEventListener; import android.hardware.SensorManager; import android.os.SystemClock; -import android.util.FloatMath; import android.view.Display; import android.view.Surface; import android.view.WindowManager; @@ -44,9 +43,9 @@ public class EyePosition { private static final float GYROSCOPE_RESTORE_FACTOR = 0.995f; private static final float USER_ANGEL = (float) Math.toRadians(10); - private static final float USER_ANGEL_COS = FloatMath.cos(USER_ANGEL); - private static final float USER_ANGEL_SIN = FloatMath.sin(USER_ANGEL); - private static final float MAX_VIEW_RANGE = (float) 0.5; + private static final float USER_ANGEL_COS = (float) Math.cos(USER_ANGEL); + private static final float USER_ANGEL_SIN = (float) Math.sin(USER_ANGEL); + private static final float MAX_VIEW_RANGE = 0.5f; private static final int NOT_STARTED = -1; private static final float USER_DISTANCE_METER = 0.3f; @@ -128,8 +127,8 @@ public class EyePosition { float ty = -1 + t * y; float tz = t * z; - float length = FloatMath.sqrt(tx * tx + ty * ty + tz * tz); - float glength = FloatMath.sqrt(temp); + float length = (float) Math.sqrt(tx * tx + ty * ty + tz * tz); + float glength = (float) Math.sqrt(temp); mX = Utils.clamp((x * USER_ANGEL_COS / glength + tx * USER_ANGEL_SIN / length) * mUserDistance, @@ -137,7 +136,7 @@ public class EyePosition { mY = -Utils.clamp((y * USER_ANGEL_COS / glength + ty * USER_ANGEL_SIN / length) * mUserDistance, -mLimit, mLimit); - mZ = -FloatMath.sqrt( + mZ = (float) -Math.sqrt( mUserDistance * mUserDistance - mX * mX - mY * mY); mListener.onEyePositionChanged(mX, mY, mZ); } @@ -175,7 +174,7 @@ public class EyePosition { mY = Utils.clamp((float) (mY + y * t / Math.hypot(mZ, mY)), -mLimit, mLimit) * GYROSCOPE_RESTORE_FACTOR; - mZ = -FloatMath.sqrt( + mZ = (float) -Math.sqrt( mUserDistance * mUserDistance - mX * mX - mY * mY); mListener.onEyePositionChanged(mX, mY, mZ); } diff --git a/src/com/android/gallery3d/data/DecodeUtils.java b/src/com/android/gallery3d/data/DecodeUtils.java index 825c4bbea..7e10191b7 100644 --- a/src/com/android/gallery3d/data/DecodeUtils.java +++ b/src/com/android/gallery3d/data/DecodeUtils.java @@ -24,7 +24,6 @@ import android.graphics.BitmapFactory; import android.graphics.BitmapFactory.Options; import android.graphics.BitmapRegionDecoder; import android.os.Build; -import android.util.FloatMath; import com.android.gallery3d.common.ApiHelper; import com.android.gallery3d.common.BitmapUtils; @@ -137,7 +136,7 @@ public class DecodeUtils { final int MAX_PIXEL_COUNT = 640000; // 400 x 1600 if ((w / options.inSampleSize) * (h / options.inSampleSize) > MAX_PIXEL_COUNT) { options.inSampleSize = BitmapUtils.computeSampleSize( - FloatMath.sqrt((float) MAX_PIXEL_COUNT / (w * h))); + (float) Math.sqrt((double) MAX_PIXEL_COUNT / (w * h))); } } else { // For screen nail, we only want to keep the longer side >= targetSize. diff --git a/src/com/android/gallery3d/data/LocationClustering.java b/src/com/android/gallery3d/data/LocationClustering.java index 540322a33..90ac41c65 100644 --- a/src/com/android/gallery3d/data/LocationClustering.java +++ b/src/com/android/gallery3d/data/LocationClustering.java @@ -19,7 +19,6 @@ package com.android.gallery3d.data; import android.content.Context; import android.os.Handler; import android.os.Looper; -import android.util.FloatMath; import android.widget.Toast; import com.android.gallery3d.R; @@ -298,7 +297,7 @@ class LocationClustering extends Clustering { } // step 5: calculate the final score - float score = totalDistance * FloatMath.sqrt(realK); + float score = totalDistance * (float) Math.sqrt(realK); if (score < bestScore) { bestScore = score; diff --git a/src/com/android/gallery3d/filtershow/filters/saturation.rs b/src/com/android/gallery3d/filtershow/filters/saturation.rs index 5210e34a3..5b216406d 100644 --- a/src/com/android/gallery3d/filtershow/filters/saturation.rs +++ b/src/com/android/gallery3d/filtershow/filters/saturation.rs @@ -149,7 +149,6 @@ uchar4 __attribute__((kernel)) selectiveAdjust(const uchar4 in, uint32_t x, uint32_t y) { float4 pixel = rsUnpackColor8888(in); - float4 wsum = pixel; int hue = rgb2hue(in); float t = satLut[hue]; @@ -158,4 +157,4 @@ uchar4 __attribute__((kernel)) selectiveAdjust(const uchar4 in, uint32_t x, pixel.a = 1.0f; return rsPackColorTo8888(clamp(pixel, 0.f, 1.0f)); -}
\ No newline at end of file +} diff --git a/src/com/android/gallery3d/filtershow/filters/vignette.rs b/src/com/android/gallery3d/filtershow/filters/vignette.rs index 709b220e4..7ab466348 100644 --- a/src/com/android/gallery3d/filtershow/filters/vignette.rs +++ b/src/com/android/gallery3d/filtershow/filters/vignette.rs @@ -38,8 +38,6 @@ static const float Bf = 0.114f; void setupVignetteParams() { - int k = 0; - scalex = 1.f / radiusx; scaley = 1.f / radiusy; @@ -75,4 +73,4 @@ uchar4 __attribute__((kernel)) vignette(const uchar4 in, uint32_t x, uint32_t y wsum.a = 1.0f; uchar4 out = rsPackColorTo8888(clamp(wsum, 0.f, 1.0f)); return out; -}
\ No newline at end of file +} diff --git a/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java b/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java index dada7dcb2..614b6485d 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java +++ b/src/com/android/gallery3d/filtershow/imageshow/GeometryMathUtils.java @@ -151,7 +151,7 @@ public final class GeometryMathUtils { } public static float[] normalize(float[] a) { - float length = (float) Math.sqrt(a[0] * a[0] + a[1] * a[1]); + float length = (float) Math.hypot(a[0], a[1]); float[] b = { a[0] / length, a[1] / length }; @@ -160,7 +160,7 @@ public final class GeometryMathUtils { // A onto B public static float scalarProjection(float[] a, float[] b) { - float length = (float) Math.sqrt(b[0] * b[0] + b[1] * b[1]); + float length = (float) Math.hypot(b[0], b[1]); return dotProduct(a, b) / length; } @@ -175,7 +175,7 @@ public final class GeometryMathUtils { float[] p = { point2[0] - point1[0], point2[1] - point1[1] }; - float length = (float) Math.sqrt(p[0] * p[0] + p[1] * p[1]); + float length = (float) Math.hypot(p[0], p[1]); p[0] = p[0] / length; p[1] = p[1] / length; return p; @@ -198,7 +198,7 @@ public final class GeometryMathUtils { } public static float vectorLength(float[] a) { - return (float) Math.sqrt(a[0] * a[0] + a[1] * a[1]); + return (float) Math.hypot(a[0], a[1]); } public static float scale(float oldWidth, float oldHeight, float newWidth, float newHeight) { diff --git a/src/com/android/gallery3d/filtershow/imageshow/GradControl.java b/src/com/android/gallery3d/filtershow/imageshow/GradControl.java index 964da99e9..29870154b 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/GradControl.java +++ b/src/com/android/gallery3d/filtershow/imageshow/GradControl.java @@ -110,7 +110,7 @@ public class GradControl { for (int i = 0; i < handlex.length; i++) { float dx = handlex[i] - x; float dy = handley[i] - y; - float dist = (float) Math.sqrt(dx * dx + dy * dy); + float dist = (float) Math.hypot(dx, dy); } return -1; @@ -236,7 +236,7 @@ public class GradControl { float cy = (p1y + p2y) / 2; float dx = p1x - p2x; float dy = p1y - p2y; - float len = (float) Math.sqrt(dx * dx + dy * dy); + float len = (float) Math.hypot(dx, dy); dx *= 2048 / len; dy *= 2048 / len; diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java index 0d20322d6..3fb75c6df 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java +++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCurves.java @@ -223,12 +223,11 @@ public class ImageCurves extends ImageShow { Spline spline = getSpline(mCurrentCurveIndex); float px = spline.getPoint(0).x; float py = spline.getPoint(0).y; - double delta = Math.sqrt((px - x) * (px - x) + (py - y) * (py - y)); + double delta = Math.hypot(px - x, py - y); for (int i = 1; i < spline.getNbPoints(); i++) { px = spline.getPoint(i).x; py = spline.getPoint(i).y; - double currentDelta = Math.sqrt((px - x) * (px - x) + (py - y) - * (py - y)); + double currentDelta = Math.hypot(px - x, py - y); if (currentDelta < delta) { delta = currentDelta; pick = i; diff --git a/src/com/android/gallery3d/filtershow/tools/SaveImage.java b/src/com/android/gallery3d/filtershow/tools/SaveImage.java index 8997ef540..e07dd2ce8 100644 --- a/src/com/android/gallery3d/filtershow/tools/SaveImage.java +++ b/src/com/android/gallery3d/filtershow/tools/SaveImage.java @@ -49,8 +49,8 @@ import java.io.FilenameFilter; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.sql.Date; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.TimeZone; /** diff --git a/src/com/android/gallery3d/glrenderer/StringTexture.java b/src/com/android/gallery3d/glrenderer/StringTexture.java index 56ca29753..c18d91b47 100644 --- a/src/com/android/gallery3d/glrenderer/StringTexture.java +++ b/src/com/android/gallery3d/glrenderer/StringTexture.java @@ -23,7 +23,6 @@ import android.graphics.Paint.FontMetricsInt; import android.graphics.Typeface; import android.text.TextPaint; import android.text.TextUtils; -import android.util.FloatMath; // StringTexture is a texture shows the content of a specified String. // @@ -72,7 +71,7 @@ public class StringTexture extends CanvasTexture { private static StringTexture newInstance(String text, TextPaint paint) { FontMetricsInt metrics = paint.getFontMetricsInt(); - int width = (int) FloatMath.ceil(paint.measureText(text)); + int width = (int) Math.ceil(paint.measureText(text)); int height = metrics.bottom - metrics.top; // The texture size needs to be at least 1x1. if (width <= 0) width = 1; diff --git a/src/com/android/gallery3d/ui/PhotoView.java b/src/com/android/gallery3d/ui/PhotoView.java index 1fff4ea3e..265a53fc7 100755 --- a/src/com/android/gallery3d/ui/PhotoView.java +++ b/src/com/android/gallery3d/ui/PhotoView.java @@ -24,7 +24,6 @@ import android.graphics.Matrix; import android.graphics.Rect; import android.os.Build; import android.os.Message; -import android.util.FloatMath; import android.view.MotionEvent; import android.view.View.MeasureSpec; import android.view.animation.AccelerateInterpolator; @@ -1103,7 +1102,7 @@ public class PhotoView extends GLView { delta = delta > 0 ? maxScrollDistance : -maxScrollDistance; } else { delta = maxScrollDistance * - FloatMath.sin((delta / size) * (float) (Math.PI / 2)); + (float) Math.sin((delta / size) * (Math.PI / 2)); } return (int) (delta + 0.5f); } diff --git a/src/com/android/gallery3d/ui/TileImageView.java b/src/com/android/gallery3d/ui/TileImageView.java index 3185c7598..1103ed80a 100644 --- a/src/com/android/gallery3d/ui/TileImageView.java +++ b/src/com/android/gallery3d/ui/TileImageView.java @@ -23,7 +23,6 @@ import android.graphics.Rect; import android.graphics.RectF; import android.support.v4.util.LongSparseArray; import android.util.DisplayMetrics; -import android.util.FloatMath; import android.view.WindowManager; import com.android.gallery3d.app.GalleryContext; @@ -313,10 +312,10 @@ public class TileImageView extends GLView { int height = (int) Math.ceil(Math.max( Math.abs(sin * w + cos * h), Math.abs(sin * w - cos * h))); - int left = (int) FloatMath.floor(cX - width / (2f * scale)); - int top = (int) FloatMath.floor(cY - height / (2f * scale)); - int right = (int) FloatMath.ceil(left + width / scale); - int bottom = (int) FloatMath.ceil(top + height / scale); + int left = (int) Math.floor(cX - width / (2f * scale)); + int top = (int) Math.floor(cY - height / (2f * scale)); + int right = (int) Math.ceil(left + width / scale); + int bottom = (int) Math.ceil(top + height / scale); // align the rectangle to tile boundary int size = sTileSize << level; diff --git a/src/com/android/gallery3d/util/MotionEventHelper.java b/src/com/android/gallery3d/util/MotionEventHelper.java index 715f7fa69..dc01cd98c 100644 --- a/src/com/android/gallery3d/util/MotionEventHelper.java +++ b/src/com/android/gallery3d/util/MotionEventHelper.java @@ -17,7 +17,6 @@ package com.android.gallery3d.util; import android.annotation.TargetApi; import android.graphics.Matrix; -import android.util.FloatMath; import android.view.MotionEvent; import android.view.MotionEvent.PointerCoords; @@ -104,8 +103,8 @@ public final class MotionEventHelper { // angle from vertical. Coordinate system: down is increasing Y, right is // increasing X. float[] v = new float[2]; - v[0] = FloatMath.sin(angleRadians); - v[1] = -FloatMath.cos(angleRadians); + v[0] = (float) Math.sin(angleRadians); + v[1] = (float) -Math.cos(angleRadians); m.mapVectors(v); // Derive the transformed vector's clockwise angle from vertical. diff --git a/src/com/android/gallery3d/util/SaveVideoFileUtils.java b/src/com/android/gallery3d/util/SaveVideoFileUtils.java index 10c41de90..bef75bac4 100644 --- a/src/com/android/gallery3d/util/SaveVideoFileUtils.java +++ b/src/com/android/gallery3d/util/SaveVideoFileUtils.java @@ -28,8 +28,8 @@ import android.provider.MediaStore.Video.VideoColumns; import com.android.gallery3d.filtershow.tools.SaveImage.ContentResolverQueryCallback; import java.io.File; -import java.sql.Date; import java.text.SimpleDateFormat; +import java.util.Date; public class SaveVideoFileUtils { // This function can decide which folder to save the video file, and generate |