From a6a30e1e77e31bb9dbc41941c0369b8ffccd8bf4 Mon Sep 17 00:00:00 2001
From: tanvidadu <tanvidadu1998@gmail.com>
Date: Sun, 11 Mar 2018 19:34:46 +0530
Subject: [PATCH]  Fixed Merge conflict

---
 app/src/main/java/fr/free/nrw/commons/AboutActivity.java | 1 +
 app/src/main/res/values/strings.xml                      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
index 0f0d0f543..0ee445785 100644
--- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@@ -92,5 +92,6 @@ public class AboutActivity extends NavigationBaseActivity {
     public void launchFrequentlyAskedQuesions(View view) {
         Utils.handleWebUrl(this,Uri.parse("https://github.com/commons-app/apps-android-commons/wiki/Frequently-Asked-Questions\\"));
     }
+    
 
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 3d2507c80..e20c1542b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -245,5 +245,6 @@
   <string name="about_rate_us"><u>Rate Us</u></string>
   <string name="about_faq">Frequently Asked Questions</string>
   <string name="welcome_skip_button">Skip Tutorial</string>
+  <string name="about_translate"><u>Translate</u></string>
 
 </resources>