From c69a1b397cade1054d61b1e1ac09ac904a948f75 Mon Sep 17 00:00:00 2001
From: mebr1416 <bruke.mekuria@outlook.com>
Date: Fri, 28 Jul 2017 17:30:38 +0300
Subject: [PATCH] - Fixed conflicts

---
 app/src/main/res/values/strings.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b92bf480..3dff3c26f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -205,5 +205,10 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="error_while_cache">Error while caching pictures</string>
   <string name="title_info">A unique descriptive title for the file, which will serve as a filename. You may use plain language with spaces. Do not include the file extension</string>
   <string name="description_info">Please describe the media as much as possible: Where was it taken? What does it show? What is the context? Please describe the objects or persons. Reveal information that can not be easily guessed, for instance the time of day if it is a landscape. If the media shows something unusual, please explain what makes it unusual.</string>
-
+  <string name="feedback_popup_title">Feedback wanted</string>
+  <string name="feedback_popup_description">We are planning several new features and improvements for the app! Would you like to review them and provide feedback? \n\n(You can always access this by selecting "Developer plans" in the navigation drawer)</string>
+  <string name="feedback_popup_decline">No thanks</string>
+  <string name="feedback_popup_accept">Sure, take me there!</string>
+  <string name="feedback_page_url">https://meta.wikimedia.org/wiki/Grants:Project/Improve_\'Upload_to_Commons\'_Android_App/Renewal/User_feedback</string>
+  <string name="navigation_item_developer_plans">Developer plans</string>
 </resources>