Merge branch 'dev' into messenger

4 files changed, 1 insertions, 7 deletions

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e66a5637..860895e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,7 +30,6 @@
     <string name="frost_notifications">Frost Notifications</string>
     <string name="requires_custom_theme">Requires custom theme</string>
 
-    <string name="subject">Subject</string>
     <string name="share">Share</string>
 
     <string name="web_overlay_swipe_hint">Swipe right to go back to the previous window.</string>
diff --git a/app/src/main/res/values/strings_errors.xml b/app/src/main/res/values/strings_errors.xml
index 72a30563..65aff536 100644
--- a/app/src/main/res/values/strings_errors.xml
+++ b/app/src/main/res/values/strings_errors.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="null_url_overlay">Empty URL given to overlay; exiting</string>
-    <string name="bad_image_overlay">The URL could not be loaded properly. Would you like to send it for debugging?</string>
     <string name="invalid_share_url">Invalid Share URL</string>
     <string name="invalid_share_url_desc">You have shared a block of text that is not a URL. The text has been copied to your clipboard, so you may share it manually  yourself.</string>
     <string name="no_download_manager">No Download Manager</string>
diff --git a/app/src/main/res/values/strings_no_translate.xml b/app/src/main/res/values/strings_no_translate.xml
index 897e79ff..04e49858 100644
--- a/app/src/main/res/values/strings_no_translate.xml
+++ b/app/src/main/res/values/strings_no_translate.xml
@@ -1,7 +1,7 @@
 <resources>
     <string name="dev_name" translatable="false">Pitched Apps</string>
-    <string name="dev_email" translatable="false">pitchedapps@gmail.com</string>
     <string name="translation_url" translatable="false">https://crwd.in/frost-for-facebook</string>
+    <string name="github" translatable="false">GitHub</string>
     <string name="github_url" translatable="false">https://github.com/AllanWang/Frost-for-Facebook</string>
     <string name="github_downloads_url" translatable="false">https://github.com/AllanWang/Frost-for-Facebook/releases</string>
     <string name="fdroid_url" translatable="false">https://f-droid.org/en/packages/com.pitchedapps.frost</string>
diff --git a/app/src/main/res/values/strings_web_context.xml b/app/src/main/res/values/strings_web_context.xml
index fe3972cb..37dfdd3b 100644
--- a/app/src/main/res/values/strings_web_context.xml
+++ b/app/src/main/res/values/strings_web_context.xml
@@ -2,11 +2,7 @@
 <resources>
 
     <string name="share_link">Share Link</string>
-    <string name="debug_link">Debug Link</string>
     <string name="local_service_name" translatable="false">Local Frost Service</string>
-    <string name="debug_link_subject" translatable="false">Frost for Facebook: Link Debug</string>
-    <string name="debug_link_content" translatable="false">Write here. Note that your link may contain private information, but I won\'t be able to see it as the post isn\'t public. The URL will still help with debugging though.</string>
-    <string name="debug_link_desc">If a link isn\'t loading properly, you can email me so I can help debug it. Clicking okay will open an email request</string>
     <string name="open_link">Open Link</string>
     <string name="copy_link">Copy Link</string>
     <string name="copy_text">Copy Text</string>