resolved conflcts from rebase from main

app/src/main/java/com/breadwallet/presenter/activities/settings/AboutActivity.java

@@ -44,13 +44,11 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
-        versionText = (TextView) findViewById(R.id.version_text);
+        versionText = (TextView) findViewById(R.id.info_text);
         policyText = (TextView) findViewById(R.id.policy_text);
         instagramShare = (ImageView) findViewById(R.id.instagram_share_button);
         twitterShare = (ImageView) findViewById(R.id.twitter_share_button);
         blogShare = (ImageView) findViewById(R.id.blog_share_button);
-        infoText.setText(BRConstants.APP_VERSION_NAME_CODE);
-
         versionText.setText(BRConstants.APP_VERSION_NAME_CODE);
 
         instagramShare.setOnClickListener(new View.OnClickListener() {

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

@@ -8,8 +8,7 @@
   <!-- Privay Policy button label -->
   <string name="About.privacy">Política de privacidad</string>
   <!-- About screen Instagram label -->
-  <string name="About.instagram">Instagram</string>
-  <!-- Terms of Use button label -->
+    <!-- Terms of Use button label -->
   <string name="About.terms">Términos de uso</string>
   <!-- About screen title -->
   <string name="About.title">Acerca de nosotros</string>

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

@@ -8,8 +8,7 @@
   <!-- Privay Policy button label -->
   <string name="About.privacy">Kebijakan pribadi</string>
   <!-- About screen Instagram label -->
-  <string name="About.instagram">Instagram</string>
-  <!-- Terms of Use button label -->
+    <!-- Terms of Use button label -->
   <string name="About.terms">Syarat Penggunaan</string>
   <!-- About screen title -->
   <string name="About.title">Tentang</string>

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

@@ -9,8 +9,7 @@
     <!-- Privay Policy button label -->
   <string name="About.privacy">Gizlilik Politikası</string>
   <!-- About screen Instagram label -->
-  <string name="About.instagram">Instagram</string>
-  <!-- Terms of Use button label -->
+    <!-- Terms of Use button label -->
   <string name="About.terms">Kullanım Şartları</string>
   <!-- About screen title -->
   <string name="About.title">hakkında</string>

app/src/main/res/values-zh-rCN/strings.xml

@@ -7,9 +7,8 @@
   <string name="About.footer">由萊特幣基金會的萊特錢包團隊製作\n%1$s</string>
   <!-- Privay Policy button label -->
   <string name="About.privacy">隐私政策</string>
-  <!-- About screen Instagram label --> 
-  <string name="About.instagram">Instagram</string>
-  <!-- Terms of Use button label -->
+  <!-- About screen Instagram label -->
+    <!-- Terms of Use button label -->
   <string name="About.terms">使用条款</string>
   <!-- About screen title -->
   <string name="About.title">关于</string>

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

@@ -1,43 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="lang">en</string>
-    <!-- Device authentication title -->
-    <string name="Auth.title.Android">Authentication required</string>
-    <!-- Instruction to touch the sensor for fingerprint authentication -->
-    <string name="Auth.touch.Android">Touch Sensor</string>
-    <!-- Device authentication body -->
-    <string name="Auth.body.Android">Please unlock your device to continue.</string>
-    <!-- Enable Fingerprint prompt body -->
-    <string name="Prompts.Fingerprint.body.Android">Tap here to enable Fingerprint</string>
-    <!-- Enable Fingerprint prompt title -->
-    <string name="Prompts.Fingerprint.title.Android">Enable Fingerprint</string>
-    <!-- Fingerprint -->
-    <string name="Fingerprint.Android">Fingerprint</string>
-    <!-- Enable fingerprint for this wallet called Loaf -->
-    <string name="Fingerprint.enable.Android">Enable Fingerprint for Loaf</string>
-    <!-- Fingerprint enabling description body -->
-    <string name="Fingerprint.body.Android">You can customize your Fingerprint Spending Limit from the Fingerprint Spending Limit screen</string>
-    <!-- Fingerprint limit -->
-    <string name="Fingerprint.limit.Android">Fingerprint Limit</string>
-    <!-- Fingerprint Is Not Setup -->
-    <string name="Fingerprint.warning.title.Android">Fingerprint Not Setup</string>
-    <!-- Instruction for the fingerprint setup -->
-    <string name="Fingerprint.warning.body.Android">You have not setup any fingerprints on this device. Go to Settings -> Security to setup a fingerprint.</string>
-    <!-- Instruction for how you can customize the spending limit -->
-    <string name="Fingerprint.customize.body.Android">You can customize your Fingerprint Spending Limit from the Fingerprint Spending Limit screen</string>
-    <!-- The fingerprint spending limit -->
-    <string name="Settings.fingerprintLimit.Android">Fingerprint Spending Limit</string>
-    <!-- Permission required -->
-    <string name="Permissions.title.Android">Permission Required</string>
-    <!-- Instructions how to allow the camera access for the app -->
-    <string name="Permissions.body.Android">Allow camera access in \"Settings\" > \"Apps\" > \"loafwallet\" > \"Permissions\"</string>
-    <!-- Switch button from fingerprint to PIN insert -->
-    <string name="Pin.title.Android">PIN</string>
-    <!-- Fingerprint was recognized by the scanner -->
-    <string name="Fingerprint.recognized.Android">Fingerprint recognized</string>
-    <!-- Fingerprint was not recognized by the scanner, please try scanning again -->
-    <string name="Fingerprint.not.recognized.Android">Fingerprint not recognized. Try again</string>
-    <!-- Instruction how to enable device encryption -->
-    <string name="Warning.encryption.body.Android">A device screen lock is needed to safeguard your wallet. Go to \"Settings\" > \"Security\" > \"Screen lock\"</string>
-
+    <string name="lang" translatable="false">en</string>
 </resources>