Import translations. DO NOT MERGE am: 39fa242356 -s ours am: 2415acb72f -s ours

am: 000b9050e7  -s ours

* commit '000b9050e7112f87794bae7fa5e4c18862d8afae':
  Import translations. DO NOT MERGE

diff --git a/Android.mk b/Android.mk
index 596b86e..670cc4c 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -8,11 +8,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v8-renderscript
-
-LOCAL_RENDERSCRIPT_TARGET_API := 18
-LOCAL_RENDERSCRIPT_COMPATIBILITY := 18
-LOCAL_RENDERSCRIPT_FLAGS := -rs-package-name=android.support.v8.renderscript
 
 LOCAL_SRC_FILES := \
     $(call all-java-files-under, src) \
@@ -29,7 +24,7 @@ LOCAL_OVERRIDES_PACKAGES := Gallery Gallery3D GalleryNew3D
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters librsjni libjni_jpegstream
+LOCAL_JNI_SHARED_LIBRARIES := libjni_eglfence libjni_filtershow_filters libjni_jpegstream
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2aea569..3bd8973 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -137,13 +137,7 @@
                 <data android:scheme="https" />
                 <data android:scheme="content" />
                 <data android:scheme="file" />
-                <data android:mimeType="image/bmp" />
-                <data android:mimeType="image/jpeg" />
-                <data android:mimeType="image/gif" />
-                <data android:mimeType="image/png" />
-                <data android:mimeType="image/webp" />
-                <data android:mimeType="image/x-ms-bmp" />
-                <data android:mimeType="image/vnd.wap.wbmp" />
+                <data android:mimeType="image/*" />
                 <data android:mimeType="application/vnd.google.panorama360+jpg" />
             </intent-filter>
             <intent-filter>

diff --git a/proguard.flags b/proguard.flags
index ae83baa..c8ba2ff 100644 (file)
--- a/proguard.flags
+++ b/proguard.flags
@@ -40,8 +40,6 @@
 # Disable the warnings of using dynamic method calls in EffectsRecorder
 -dontnote com.android.camera.EffectsRecorder
 
--keep class android.support.v8.renderscript.** { *; }
-
 # Required for ActionBarSherlock
 -keep class android.support.v4.app.** { *; }
 -keep interface android.support.v4.app.** { *; }

diff --git a/res/values-az-rAZ/filtershow_strings.xml b/res/values-az-rAZ/filtershow_strings.xml
index 3f8f22d..4da012c 100644 (file)
--- 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-b+sr+Latn/filtershow_strings.xml b/res/values-b+sr+Latn/filtershow_strings.xml
new file mode 100644 (file)
index 0000000..c6f84ea
--- /dev/null
+++ b/res/values-b+sr+Latn/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">"Uređivač slika"</string>
+    <string name="cannot_load_image" msgid="5023634941212959976">"Nije moguće učitati sliku!"</string>
+    <string name="cannot_edit_original" msgid="5890293845882609388">"Nije moguće izmeniti original"</string>
+    <!-- no translation found for original_picture_text (3076213290079909698) -->
+    <skip />
+    <string name="setting_wallpaper" msgid="4679087092300036632">"Podešavanje pozadine"</string>
+    <string name="download_failure" msgid="5923323939788582895">"Nije moguće preuzeti sliku. Mreža nije dostupna."</string>
+    <string name="original" msgid="3524493791230430897">"Originalna"</string>
+    <string name="borders" msgid="2067345080568684614">"Ivice"</string>
+    <string name="custom_border" msgid="8679893731790931871">"Prilagođeno"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Opozovi"</string>
+    <string name="filtershow_redo" msgid="4219489910543059747">"Ponovi"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"Prikaži primenjene efekte"</string>
+    <string name="hide_imagestate_panel" msgid="7207643485811695257">"Sakrij primenjene efekte"</string>
+    <string name="export_image" msgid="3202835713172222134">"Izvezi"</string>
+    <string name="print_image" msgid="1942989216591621413">"Štampaj"</string>
+    <string name="export_flattened" msgid="9046192331465915411">"Izvezi jednoslojnu sliku"</string>
+    <string name="select_output_settings" msgid="1268532018080310748">"Izvezena slika biće kopija bez istorije."</string>
+    <string name="quality" msgid="179292110309050529">"Kvalitet"</string>
+    <string name="size" msgid="4639404642236356037">"Veličina"</string>
+    <string name="x" msgid="6810256999024563662">"x"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Podešavanja"</string>
+    <string name="unsaved" msgid="8704442449002374375">"Postoje nesačuvane izmene ove slike."</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Želite li da sačuvate pre nego što izađete?"</string>
+    <string name="save_and_exit" msgid="3628425023766687419">"Sačuvaj i izađi"</string>
+    <string name="save_and_processing" msgid="6371565035837463194">"Obrađivanje slike u punoj rezoluciji..."</string>
+    <string name="exit" msgid="242642957038770113">"Izađi"</string>
+    <string name="history" msgid="455767361472692409">"Istorija"</string>
+    <string name="reset" msgid="9013181350779592937">"Ponovo postavi"</string>
+    <!-- no translation found for history_original (150973253194312841) -->
+    <skip />
+    <string name="imageState" msgid="8632586742752891968">"Primenjeni efekti"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Uporedi"</string>
+    <string name="apply_effect" msgid="1218288221200568947">"Primeni"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"Ponovo postavi"</string>
+    <string name="aspect" msgid="4025244950820813059">"Razmera"</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">"Nijedno"</string>
+    <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
+    <skip />
+    <string name="Fixed" msgid="8017376448916924565">"Fiksno"</string>
+    <string name="tinyplanet" msgid="2783694326474415761">"Mala planeta"</string>
+    <string name="exposure" msgid="6526397045949374905">"Ekspozicija"</string>
+    <string name="sharpness" msgid="6463103068318055412">"Oštrina"</string>
+    <string name="contrast" msgid="2310908487756769019">"Kontrast"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Živost boja"</string>
+    <string name="saturation" msgid="7026791551032438585">"Zasićenje"</string>
+    <string name="bwfilter" msgid="8927492494576933793">"Crno-beli filter"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Automatska boja"</string>
+    <string name="hue" msgid="6231252147971086030">"Nijansa"</string>
+    <string name="shadow_recovery" msgid="3928572915300287152">"Senke"</string>
+    <string name="highlight_recovery" msgid="8262208470735204243">"Isticanja"</string>
+    <string name="curvesRGB" msgid="915010781090477550">"Krive"</string>
+    <string name="vignette" msgid="934721068851885390">"Vinjeta"</string>
+    <string name="vignette_main" msgid="6046495605390665423">"Vinjeta"</string>
+    <string name="vignette_exposure" msgid="6862058227309534094">"Ekspozicija"</string>
+    <string name="vignette_saturation" msgid="1617055207565719771">"Zasićenost boja"</string>
+    <string name="vignette_contrast" msgid="955732121756799897">"Kontrast"</string>
+    <string name="vignette_falloff" msgid="690918055030064199">"Slab. svetlosti"</string>
+    <string name="redeye" msgid="4508883127049472069">"Crvene oči"</string>
+    <string name="imageDraw" msgid="6918552177844486656">"Crtanje"</string>
+    <string name="straighten" msgid="26025591664983528">"Ispravljanje"</string>
+    <string name="crop" msgid="5781263790107850771">"Opsecanje"</string>
+    <string name="rotate" msgid="2796802553793795371">"Rotiraj"</string>
+    <string name="mirror" msgid="5482518108154883096">"Ogledalo"</string>
+    <string name="negative" msgid="6998313764388022201">"Negativ"</string>
+    <string name="none" msgid="6633966646410296520">"Nijedno"</string>
+    <string name="edge" msgid="7036064886242147551">"Ivice"</string>
+    <string name="kmeans" msgid="2080952022674981541">"Posterizuj"</string>
+    <string name="downsample" msgid="3552938534146980104">"Smanji"</string>
+    <string name="grad" msgid="546774853424848655">"Gradacija"</string>
+    <string name="editor_grad_brightness" msgid="5937316734380235741">"Osvetljenost"</string>
+    <string name="editor_grad_contrast" msgid="3454456673401803360">"Kontrast"</string>
+    <string name="editor_grad_saturation" msgid="3760247354109521726">"Zasićenost boja"</string>
+    <string name="editor_chan_sat_main" msgid="4427652337797121940">"Glavno"</string>
+    <string name="editor_chan_sat_red" msgid="1699222266490540696">"Crvena"</string>
+    <string name="editor_chan_sat_yellow" msgid="1488997071882154179">"Žuta"</string>
+    <string name="editor_chan_sat_green" msgid="1514055896212975167">"Zelena"</string>
+    <string name="editor_chan_sat_cyan" msgid="1367634650172508288">"Cijan"</string>
+    <string name="editor_chan_sat_blue" msgid="384409736863387895">"Plava"</string>
+    <string name="editor_chan_sat_magenta" msgid="6689215719351415546">"Magenta"</string>
+    <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
+    <string name="editor_grad_new" msgid="4857265951369377379">"novo"</string>
+    <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Crvena"</string>
+    <string name="curves_channel_green" msgid="3733003466905031016">"Zelena"</string>
+    <string name="curves_channel_blue" msgid="9129211507395079371">"Plava"</string>
+    <string name="draw_style" msgid="2036125061987325389">"Stil"</string>
+    <string name="draw_size" msgid="4360005386104151209">"Veličina"</string>
+    <string name="draw_hue" msgid="4975135843189267133">"Nijansa"</string>
+    <string name="draw_saturation" msgid="5394395648014454882">"Zasićen. boja"</string>
+    <string name="draw_value" msgid="6571604055161538273">"Osvetljenost"</string>
+    <string name="draw_color" msgid="2119030386987211193">"Boja"</string>
+    <string name="draw_style_line" msgid="9216476853904429628">"Linije"</string>
+    <string name="draw_style_brush_spatter" msgid="7612691122932981554">"Označivač"</string>
+    <string name="draw_style_brush_marker" msgid="8468302322165644292">"Prskanje"</string>
+    <string name="draw_clear" msgid="6728155515454921052">"Obriši"</string>
+    <string name="color_border_size" msgid="1086895807615869290">"Debljina"</string>
+    <string name="color_border_corner_size" msgid="7637235159438869979">"Veličina ugla"</string>
+    <string name="color_border_color" msgid="8765458414425980711">"Boja"</string>
+    <string name="color_border_clear" msgid="4418261191091091722">"Obriši"</string>
+    <string name="color_pick_select" msgid="734312818059057394">"Izaberi prilagođenu boju"</string>
+    <string name="color_pick_title" msgid="6195567431995308876">"Izbor boje"</string>
+    <string name="draw_size_title" msgid="3121649039610273977">"Izbor veličine"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"Potvrdi"</string>
+    <string name="state_panel_original" msgid="9069584409934164419">"Originalna"</string>
+    <string name="state_panel_result" msgid="318640531123298676">"Rezultat"</string>
+    <string name="filtershow_notification_label" msgid="1653168445525855247">"Čuvanje slike"</string>
+    <string name="filtershow_notification_message" msgid="2661871765484036286">"Obrađuje se..."</string>
+    <string name="filtershow_save_preset" msgid="3933550455577927439">"Sačuvaj aktuelna podešavanja"</string>
+    <string name="filtershow_manage_preset" msgid="3872896753708921286">"Upravljaj korisničkim podeš."</string>
+    <string name="filtershow_new_preset" msgid="8923930134923416617">"Novo unapred određeno podešav."</string>
+    <string name="filtershow_preset_name" msgid="7015939727047649866">"Naziv unapred odr. podešavanja"</string>
+    <string name="filtershow_show_info_panel" msgid="5773036746043711115">"Informacije"</string>
+    <string name="filtershow_show_info_panel_name" msgid="5908258517140549439">"Naziv slike"</string>
+    <string name="filtershow_show_info_panel_size" msgid="1714666849204493017">"Veličina slike"</string>
+    <string name="filtershow_show_info_panel_histogram" msgid="2669188469897955809">"Histogram"</string>
+    <string name="filtershow_show_info_panel_exif" msgid="4965486882625125154">"EXIF podaci"</string>
+    <string name="filtershow_add_button_looks" msgid="8630823661416925426">"Unapred podešeno"</string>
+    <string name="filtershow_add_button_versions" msgid="7620107266685809612">"Verzija"</string>
+    <string name="filtershow_version_original" msgid="1413894292200912828">"Original"</string>
+    <string name="filtershow_version_current" msgid="6609334422797468952">"Aktuelno"</string>
+    <string name="filtershow_exif_model" msgid="3543206476046267466">"Model"</string>
+    <string name="filtershow_exif_aperture" msgid="5076571522763604380">"Otvor blende"</string>
+    <string name="filtershow_exif_focal_length" msgid="5925151469731623706">"Žižna daljina"</string>
+    <string name="filtershow_exif_iso" msgid="5822494416955625317">"ISO"</string>
+    <string name="filtershow_exif_subject_distance" msgid="4920632253433906646">"Udaljenost subjekta"</string>
+    <string name="filtershow_exif_date" msgid="8882402253732028544">"Datum snimanja"</string>
+    <string name="filtershow_exif_f_stop" msgid="6081797865604483139">"Žižni broj"</string>
+    <string name="filtershow_exif_exposure_time" msgid="4099067062781294115">"Vreme ekspozicije"</string>
+    <string name="filtershow_exif_copyright" msgid="8801875918803737581">"Autorska prava"</string>
+</resources>

diff --git a/res/values-de/filtershow_strings.xml b/res/values-de/filtershow_strings.xml
index 34fff75..4cc1888 100644 (file)
--- a/res/values-de/filtershow_strings.xml
+++ b/res/values-de/filtershow_strings.xml
@@ -39,7 +39,7 @@
     <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Einstellungen"</string>
     <string name="unsaved" msgid="8704442449002374375">"Das Bild weist nicht gespeicherte Änderungen auf."</string>
-    <string name="save_before_exit" msgid="2680660633675916712">"Möchten Sie vor dem Schließen speichern?"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Möchtest du vor dem Schließen speichern?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Speichern und schließen"</string>
     <string name="save_and_processing" msgid="6371565035837463194">"Bild mit hoher Auflösung wird verarbeitet..."</string>
     <string name="exit" msgid="242642957038770113">"Schließen"</string>

diff --git a/res/values-fa/filtershow_strings.xml b/res/values-fa/filtershow_strings.xml
index f730a38..7ed9bfa 100644 (file)
--- 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="download_failure" msgid="5923323939788582895">"داÙ\86Ù\84Ù\88د عکس انجام نشد. شبکه در دسترس نیست."</string>
+    <string name="setting_wallpaper" msgid="4679087092300036632">"تنظیم کاغذدیواری"</string>
+    <string name="download_failure" msgid="5923323939788582895">"بارگÛ\8cرÛ\8c عکس انجام نشد. شبکه در دسترس نیست."</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">"Ù\84غÙ\88 عÙ\85Ù\84"</string>
+    <string name="filtershow_undo" msgid="6781743189243585101">"Ù\88اگرد"</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-gu-rIN/filtershow_strings.xml b/res/values-gu-rIN/filtershow_strings.xml
index 951933d..1348f59 100644 (file)
--- a/res/values-gu-rIN/filtershow_strings.xml
+++ b/res/values-gu-rIN/filtershow_strings.xml
@@ -28,7 +28,7 @@
     <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">"લાàª\97à«\81 પà«\8dરભાવà«\8b દરà«\8dશાવો"</string>
+    <string name="show_imagestate_panel" msgid="281932769701043015">"લાàª\97à«\81 પà«\8dરભાવà«\8b બતાવો"</string>
     <string name="hide_imagestate_panel" msgid="7207643485811695257">"લાગુ પ્રભાવો છુપાવો"</string>
     <string name="export_image" msgid="3202835713172222134">"નિકાસ કરો"</string>
     <string name="print_image" msgid="1942989216591621413">"છાપો"</string>

diff --git a/res/values-iw/filtershow_strings.xml b/res/values-iw/filtershow_strings.xml
index 3c5ebcd..0279b9f 100644 (file)
--- 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">"×\94×\90×\9d ×\90ת×\94 ר×\95צ×\94 לשמור לפני היציאה?"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"×\94×\90×\9d ×\91רצ×\95× ×\9a לשמור לפני היציאה?"</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-mk-rMK/filtershow_strings.xml b/res/values-mk-rMK/filtershow_strings.xml
index c4a0426..44d6975 100644 (file)
--- a/res/values-mk-rMK/filtershow_strings.xml
+++ b/res/values-mk-rMK/filtershow_strings.xml
@@ -37,7 +37,7 @@
     <string name="quality" msgid="179292110309050529">"Квалитет"</string>
     <string name="size" msgid="4639404642236356037">"Големина"</string>
     <string name="x" msgid="6810256999024563662">"x"</string>
-    <string name="menu_settings" msgid="6428291655769260831">"Подесувања"</string>
+    <string name="menu_settings" msgid="6428291655769260831">"Поставки"</string>
     <string name="unsaved" msgid="8704442449002374375">"Постојат незачувани промени на оваа слика."</string>
     <string name="save_before_exit" msgid="2680660633675916712">"Дали сакате да зачувате пред да излезете?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Зачувај и излези"</string>

diff --git a/res/values-mr-rIN/filtershow_strings.xml b/res/values-mr-rIN/filtershow_strings.xml
index 6936fe1..498b656 100644 (file)
--- a/res/values-mr-rIN/filtershow_strings.xml
+++ b/res/values-mr-rIN/filtershow_strings.xml
@@ -126,7 +126,7 @@
     <string name="color_pick_select" msgid="734312818059057394">"सानुकूल रंग निवडा"</string>
     <string name="color_pick_title" msgid="6195567431995308876">"रंग निवडा"</string>
     <string name="draw_size_title" msgid="3121649039610273977">"आकार निवडा"</string>
-    <string name="draw_size_accept" msgid="6781529716526190028">"ठिक आहे"</string>
+    <string name="draw_size_accept" msgid="6781529716526190028">"ठà¥\80क आहे"</string>
     <string name="state_panel_original" msgid="9069584409934164419">"मूळ"</string>
     <string name="state_panel_result" msgid="318640531123298676">"परिणाम"</string>
     <string name="filtershow_notification_label" msgid="1653168445525855247">"प्रतिमा जतन करीत आहे"</string>

diff --git a/res/values-nl/filtershow_strings.xml b/res/values-nl/filtershow_strings.xml
index a5ef882..ea03fcc 100644 (file)
--- a/res/values-nl/filtershow_strings.xml
+++ b/res/values-nl/filtershow_strings.xml
@@ -39,18 +39,18 @@
     <string name="x" msgid="6810256999024563662">"x"</string>
     <string name="menu_settings" msgid="6428291655769260831">"Instellingen"</string>
     <string name="unsaved" msgid="8704442449002374375">"Er zijn niet-opgeslagen wijzigingen aangebracht in deze afbeelding."</string>
-    <string name="save_before_exit" msgid="2680660633675916712">"Wilt u opslaan voordat u afsluit?"</string>
+    <string name="save_before_exit" msgid="2680660633675916712">"Wil je opslaan voordat je afsluit?"</string>
     <string name="save_and_exit" msgid="3628425023766687419">"Opslaan en sluiten"</string>
     <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-ro/filtershow_strings.xml b/res/values-ro/filtershow_strings.xml
index c7cfb8d..10836f7 100644 (file)
--- a/res/values-ro/filtershow_strings.xml
+++ b/res/values-ro/filtershow_strings.xml
@@ -27,7 +27,7 @@
     <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_redo" msgid="4219489910543059747">"Repetaţ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>
     <string name="export_image" msgid="3202835713172222134">"Exportați"</string>
@@ -48,7 +48,7 @@
     <!-- no translation found for history_original (150973253194312841) -->
     <skip />
     <string name="imageState" msgid="8632586742752891968">"Efecte aplicate"</string>
-    <string name="compare_original" msgid="8140838959007796977">"Comparaţi"</string>
+    <string name="compare_original" msgid="8140838959007796977">"Comparați"</string>
     <string name="apply_effect" msgid="1218288221200568947">"Aplicaţi"</string>
     <string name="reset_effect" msgid="7712605581024929564">"Resetaţi"</string>
     <string name="aspect" msgid="4025244950820813059">"Aspect"</string>
@@ -67,8 +67,8 @@
     <string name="exposure" msgid="6526397045949374905">"Expunere"</string>
     <string name="sharpness" msgid="6463103068318055412">"Claritate"</string>
     <string name="contrast" msgid="2310908487756769019">"Contrast"</string>
-    <string name="vibrance" msgid="3326744578577835915">"Vibranţă"</string>
-    <string name="saturation" msgid="7026791551032438585">"Saturaţie"</string>
+    <string name="vibrance" msgid="3326744578577835915">"Vibranță"</string>
+    <string name="saturation" msgid="7026791551032438585">"Saturație"</string>
     <string name="bwfilter" msgid="8927492494576933793">"Filtru A/N"</string>
     <string name="wbalance" msgid="6346581563387083613">"Culoare auto."</string>
     <string name="hue" msgid="6231252147971086030">"Tonalitate"</string>
@@ -81,7 +81,7 @@
     <string name="vignette_saturation" msgid="1617055207565719771">"Saturație"</string>
     <string name="vignette_contrast" msgid="955732121756799897">"Contrast"</string>
     <string name="vignette_falloff" msgid="690918055030064199">"Atenuare"</string>
-    <string name="redeye" msgid="4508883127049472069">"Ochi roşii"</string>
+    <string name="redeye" msgid="4508883127049472069">"Ochi roșii"</string>
     <string name="imageDraw" msgid="6918552177844486656">"Desenați"</string>
     <string name="straighten" msgid="26025591664983528">"Îndreptare"</string>
     <string name="crop" msgid="5781263790107850771">"Decupare"</string>
@@ -106,7 +106,7 @@
     <string name="editor_grad_style" msgid="2168414479007745179">"Stil"</string>
     <string name="editor_grad_new" msgid="4857265951369377379">"nou"</string>
     <string name="curves_channel_rgb" msgid="7909209509638333690">"RGB"</string>
-    <string name="curves_channel_red" msgid="4199710104162111357">"Roşu"</string>
+    <string name="curves_channel_red" msgid="4199710104162111357">"Roșu"</string>
     <string name="curves_channel_green" msgid="3733003466905031016">"Verde"</string>
     <string name="curves_channel_blue" msgid="9129211507395079371">"Albastru"</string>
     <string name="draw_style" msgid="2036125061987325389">"Stil"</string>

diff --git a/res/values-uz-rUZ/filtershow_strings.xml b/res/values-uz-rUZ/filtershow_strings.xml
index 39f9461..b8c97b8 100644 (file)
--- 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-rCN/filtershow_strings.xml b/res/values-zh-rCN/filtershow_strings.xml
index 6eff897..f01dcc1 100644 (file)
--- a/res/values-zh-rCN/filtershow_strings.xml
+++ b/res/values-zh-rCN/filtershow_strings.xml
@@ -144,7 +144,7 @@
     <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_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">"感光度"</string>

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
index 4371374..1fcd300 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilter.java
@@ -19,7 +19,7 @@ package com.android.gallery3d.filtershow.filters;
 import android.app.Activity;
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.support.v8.renderscript.Allocation;
+import android.renderscript.Allocation;
 import android.widget.Toast;
 
 import com.android.gallery3d.filtershow.imageshow.GeometryMathUtils;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java
index 5d3856e..8482eac 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterChanSat.java
@@ -18,11 +18,11 @@ package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Bitmap;
 import android.graphics.Matrix;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.Element;
-import android.support.v8.renderscript.RenderScript;
-import android.support.v8.renderscript.Script.LaunchOptions;
-import android.support.v8.renderscript.Type;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.Script.LaunchOptions;
+import android.renderscript.Type;
 
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java
index 0a615af..4d5a79c 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterGrad.java
@@ -26,11 +26,11 @@ import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.Matrix;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.Element;
-import android.support.v8.renderscript.RenderScript;
-import android.support.v8.renderscript.Script.LaunchOptions;
-import android.support.v8.renderscript.Type;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.Script.LaunchOptions;
+import android.renderscript.Type;
 import android.util.Log;
 
 import com.android.gallery3d.R;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
index e94e2a6..3c54456 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java
@@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.filters;
 
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
-import android.support.v8.renderscript.*;
+import android.renderscript.*;
 import android.util.Log;
 import android.content.res.Resources;
 import com.android.gallery3d.R;

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
index e0b4cf6..0d0dd3b 100644 (file)
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVignette.java
@@ -24,11 +24,11 @@ import android.graphics.Rect;
 import com.android.gallery3d.R;
 import com.android.gallery3d.filtershow.imageshow.MasterImage;
 import com.android.gallery3d.filtershow.pipeline.FilterEnvironment;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.Element;
-import android.support.v8.renderscript.RenderScript;
-import android.support.v8.renderscript.Script.LaunchOptions;
-import android.support.v8.renderscript.Type;
+import android.renderscript.Allocation;
+import android.renderscript.Element;
+import android.renderscript.RenderScript;
+import android.renderscript.Script.LaunchOptions;
+import android.renderscript.Type;
 import android.util.Log;
 
 public class ImageFilterVignette extends ImageFilterRS {

diff --git a/src/com/android/gallery3d/filtershow/pipeline/Buffer.java b/src/com/android/gallery3d/filtershow/pipeline/Buffer.java
index c378eb9..a487a5d 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/Buffer.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/Buffer.java
@@ -18,8 +18,8 @@ package com.android.gallery3d.filtershow.pipeline;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.RenderScript;
+import android.renderscript.Allocation;
+import android.renderscript.RenderScript;
 import android.util.Log;
 import com.android.gallery3d.filtershow.cache.BitmapCache;
 import com.android.gallery3d.filtershow.imageshow.MasterImage;

diff --git a/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java b/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
index 8ae9a7c..2923e3b 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/CachingPipeline.java
@@ -24,8 +24,8 @@ import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Rect;
 import android.graphics.RectF;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.RenderScript;
+import android.renderscript.Allocation;
+import android.renderscript.RenderScript;
 import android.util.Log;
 
 import com.android.gallery3d.filtershow.cache.BitmapCache;

diff --git a/src/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java b/src/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
index ebf83b7..0b84f52 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/FilterEnvironment.java
@@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.pipeline;
 
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
-import android.support.v8.renderscript.Allocation;
+import android.renderscript.Allocation;
 
 import com.android.gallery3d.app.Log;
 import com.android.gallery3d.filtershow.cache.BitmapCache;

diff --git a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
index 4765a59..9166ee3 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/ImagePreset.java
@@ -18,7 +18,7 @@ package com.android.gallery3d.filtershow.pipeline;
 
 import android.graphics.Bitmap;
 import android.graphics.Rect;
-import android.support.v8.renderscript.Allocation;
+import android.renderscript.Allocation;
 import android.util.JsonReader;
 import android.util.JsonWriter;
 import android.util.Log;

diff --git a/src/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java b/src/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java
index d53768c..ad59e0c 100644 (file)
--- a/src/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java
+++ b/src/com/android/gallery3d/filtershow/pipeline/PipelineInterface.java
@@ -18,8 +18,8 @@ package com.android.gallery3d.filtershow.pipeline;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
-import android.support.v8.renderscript.Allocation;
-import android.support.v8.renderscript.RenderScript;
+import android.renderscript.Allocation;
+import android.renderscript.RenderScript;
 
 public interface PipelineInterface {
     public String getName();