release-request-323db86e-b638-4d24-8eb1-d2e3bf4a9d1a-for-git_oc-mr1-release-4017779...

Change-Id: I1b6afa464a22252d4caeb7cf46a3f9203d466f9c

diff --git a/Android.mk b/Android.mk
index 47e9c86..d539141 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -4,8 +4,9 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4
-LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13
+LOCAL_STATIC_JAVA_LIBRARIES := \
+    android-support-v4 \
+    android-support-v13
 LOCAL_STATIC_JAVA_LIBRARIES += com.android.gallery3d.common2
 LOCAL_STATIC_JAVA_LIBRARIES += xmp_toolkit
 LOCAL_STATIC_JAVA_LIBRARIES += mp4parser

diff --git a/res/values-b+sr+Latn/filtershow_strings.xml b/res/values-b+sr+Latn/filtershow_strings.xml
index c6f84ea..da90f06 100644 (file)
--- a/res/values-b+sr+Latn/filtershow_strings.xml
+++ b/res/values-b+sr+Latn/filtershow_strings.xml
@@ -44,13 +44,13 @@
     <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>
+    <string name="reset" msgid="9013181350779592937">"Resetuj"</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="reset_effect" msgid="7712605581024929564">"Resetuj"</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>
@@ -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">"Nijedno"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Ništa"</string>
     <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
     <skip />
     <string name="Fixed" msgid="8017376448916924565">"Fiksno"</string>
@@ -88,7 +88,7 @@
     <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="none" msgid="6633966646410296520">"Ništa"</string>
     <string name="edge" msgid="7036064886242147551">"Ivice"</string>
     <string name="kmeans" msgid="2080952022674981541">"Posterizuj"</string>
     <string name="downsample" msgid="3552938534146980104">"Smanji"</string>

diff --git a/res/values-sr/filtershow_strings.xml b/res/values-sr/filtershow_strings.xml
index d06b7b8..922509c 100644 (file)
--- a/res/values-sr/filtershow_strings.xml
+++ b/res/values-sr/filtershow_strings.xml
@@ -44,13 +44,13 @@
     <string name="save_and_processing" msgid="6371565035837463194">"Обрађивање слике у пуној резолуцији..."</string>
     <string name="exit" msgid="242642957038770113">"Изађи"</string>
     <string name="history" msgid="455767361472692409">"Историја"</string>
-    <string name="reset" msgid="9013181350779592937">"Ð\9fоново поÑ\81Ñ\82ави"</string>
+    <string name="reset" msgid="9013181350779592937">"РеÑ\81еÑ\82Ñ\83Ñ\98"</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">"Ð\9fоново поÑ\81Ñ\82ави"</string>
+    <string name="reset_effect" msgid="7712605581024929564">"РеÑ\81еÑ\82Ñ\83Ñ\98"</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>
@@ -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">"Ð\9dиÑ\98едно"</string>
+    <string name="aspectNone_effect" msgid="6263330561046574134">"Ð\9dиÑ\88Ñ\82а"</string>
     <!-- no translation found for aspectOriginal_effect (5678516555493036594) -->
     <skip />
     <string name="Fixed" msgid="8017376448916924565">"Фиксно"</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">"Ð\9dиÑ\98едно"</string>
+    <string name="none" msgid="6633966646410296520">"Ð\9dиÑ\88Ñ\82а"</string>
     <string name="edge" msgid="7036064886242147551">"Ивице"</string>
     <string name="kmeans" msgid="2080952022674981541">"Постеризуј"</string>
     <string name="downsample" msgid="3552938534146980104">"Смањи"</string>