Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/setting/code/SettingCodePresenter.java

@@ -174,7 +174,7 @@ public class SettingCodePresenter extends Presenter<SettingCodeModel, ISettingCo
       view.setSpecialCodeLabelVisible(true);
       String label = model.getLoadedSpecialCodeType();
       if (StringUtil.isEmpty(label)) {
-        label = ResourceUtil.getString(R.string.special_code);
+        label = ResourceUtil.getString(R.string.special_code_en);
       }
       view.setSpecialCodeLabel(label);
     }

app/src/main/res/values/strings.xml

@@ -314,6 +314,7 @@
   <string name="special_code_register_title">회원님만을 위한 특별한 혜택</string>
   <string name="special_code_register_detail">제공받은 스페셜 /추천인 코드를 입력해주세요.\n회원님을 위한 특별한 혜택을 드립니다.</string>
   <string name="special_code">스페셜 코드</string>
+  <string name="special_code_en"><b>special</b></string>
   <string name="special_code_characters">4자리</string>
   <string name="special_code_input">지급받은 코드가 있는 경우 입력해주세요.</string>
   <string name="special_code_error">"&lt;font color='#F13F15'>지급받은 코드가 유효하지 않습니다.&lt;/font>"</string>