Merge jb-mr1-dev into aosp/master - do not merge

Change-Id: I9d78e7dd4f410c331a920294d9375118cc43a007

diff --git a/res/values-it/filtershow_strings.xml b/res/values-it/filtershow_strings.xml
index 8914450..33f6012 100644 (file)
--- a/res/values-it/filtershow_strings.xml
+++ b/res/values-it/filtershow_strings.xml
@@ -56,7 +56,7 @@
     <string name="vibrance" msgid="3326744578577835915">"Vividezza"</string>
     <string name="saturation" msgid="7026791551032438585">"Saturazione"</string>
     <string name="bwfilter" msgid="8927492494576933793">"Filtro BN"</string>
-    <string name="wbalance" msgid="6346581563387083613">"Colore automatico"</string>
+    <string name="wbalance" msgid="6346581563387083613">"Colore autom."</string>
     <string name="hue" msgid="6231252147971086030">"Tonalità"</string>
     <string name="shadow_recovery" msgid="3928572915300287152">"Ombre"</string>
     <string name="curvesRGB" msgid="915010781090477550">"Curve"</string>

diff --git a/res/values-ru/filtershow_strings.xml b/res/values-ru/filtershow_strings.xml
index cdcc716..215dffb 100644 (file)
--- a/res/values-ru/filtershow_strings.xml
+++ b/res/values-ru/filtershow_strings.xml
@@ -70,5 +70,5 @@
     <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="curves_channel_blue" msgid="9129211507395079371">"Синий"</string>
 </resources>