From 38478f2cfc651b58dd88274c9a3bb7526c91116b Mon Sep 17 00:00:00 2001
From: Zhang Zhenzhen <zhangzz6687@thundersoft.com>
Date: Tue, 10 Mar 2015 16:40:13 +0800
Subject: Modify:Gallery2 for branch Gallery2

Conflicts:
	res/values-zh-rCN/strings.xml
        res/values/strings.xml
Change-Id: I6b760469290ca154f223f94a3c284fca7a513121
---
 res/values/strings.xml | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'res/values/strings.xml')

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 82b286b32..c7ce4d517 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1152,4 +1152,9 @@ CHAR LIMIT = NONE] -->
     <string name="drm_license_info">Drm license info</string>
     <string name="mimetype_not_supported">This file can not be played</string>
     <string name="action_consumes_rights">Rights will be consumed for playing this media</string>
+    <string name="text_makeup_whiten">Whiten</string>
+    <string name="text_makeup_Soften">Soften</string>
+    <string name="text_makeup_trimface">Trimface</string>
+    <string name="text_makeup_bigeye">Bigeye</string>
+
 </resources>
-- 
cgit v1.2.3