Reconcile with jb-mr1-release - do not merge

Change-Id: I2e4981ca363238eaffef17b801ee9f48ce68d7a4

diff --git a/res/values-ko/filtershow_strings.xml b/res/values-ko/filtershow_strings.xml
index a8f36f4..4cb7e99 100644 (file)
--- a/res/values-ko/filtershow_strings.xml
+++ b/res/values-ko/filtershow_strings.xml
@@ -62,7 +62,7 @@
     <string name="curvesRGB" msgid="915010781090477550">"곡선"</string>
     <string name="vignette" msgid="934721068851885390">"비네트"</string>
     <string name="redeye" msgid="4508883127049472069">"적목현상 없애기"</string>
-    <string name="straighten" msgid="26025591664983528">"똑바르게"</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>

diff --git a/res/values-nb/filtershow_strings.xml b/res/values-nb/filtershow_strings.xml
index 9e299b5..faa77ce 100644 (file)
--- a/res/values-nb/filtershow_strings.xml
+++ b/res/values-nb/filtershow_strings.xml
@@ -21,7 +21,7 @@
     <!-- no translation found for original_picture_text (3076213290079909698) -->
     <skip />
     <string name="original" msgid="3524493791230430897">"Original"</string>
-    <string name="borders" msgid="2067345080568684614">"Grenser"</string>
+    <string name="borders" msgid="2067345080568684614">"Kantlinjer"</string>
     <string name="done" msgid="3112344807927554662">"Fullført"</string>
     <string name="filtershow_undo" msgid="6781743189243585101">"Angre"</string>
     <string name="filtershow_redo" msgid="4219489910543059747">"Gjør om"</string>

diff --git a/res/values-zh-rTW/filtershow_strings.xml b/res/values-zh-rTW/filtershow_strings.xml
index 18c4dc0..9c98b53 100644 (file)
--- a/res/values-zh-rTW/filtershow_strings.xml
+++ b/res/values-zh-rTW/filtershow_strings.xml
@@ -51,7 +51,7 @@
     <skip />
     <string name="tinyplanet" msgid="2783694326474415761">"小星球"</string>
     <string name="exposure" msgid="6526397045949374905">"曝光"</string>
-    <string name="sharpness" msgid="6463103068318055412">"銳度"</string>
+    <string name="sharpness" msgid="6463103068318055412">"é\8a³å\88©åº¦"</string>
     <string name="contrast" msgid="2310908487756769019">"對比"</string>
     <string name="vibrance" msgid="3326744578577835915">"鮮明化"</string>
     <string name="saturation" msgid="7026791551032438585">"飽和度"</string>