Merge branch 'master' into patch-1

Author: brarcher

README.md

@@ -39,7 +39,3 @@ Windows:
 
 If you are interested in translating this application to another language, create a pull request with changes or find the project listing on  [Transifex](https://www.transifex.com/na-243/video-transcoder).
 
-# Thanks
-
-This application uses the following image:
-- [Film](https://thenounproject.com/term/film/395618/) by [Mint Shirt](https://thenounproject.com/mint10/)

app/src/main/java/protect/videotranscoder/activity/MainActivity.java

@@ -1437,25 +1437,13 @@ private void displayAboutDialog()
             .put("RecyclerView-FastScroll", "https://github.com/timusus/RecyclerView-FastScroll")
             .build();
 
-        final Map<String, String> USED_ASSETS = ImmutableMap.of
-        (
-            "Film by Mint Shirt", "https://thenounproject.com/term/film/395618/"
-        );
-
         StringBuilder libs = new StringBuilder().append("<ul>");
         for (Map.Entry<String, String> entry : USED_LIBRARIES.entrySet())
         {
             libs.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
         }
         libs.append("</ul>");
 
-        StringBuilder resources = new StringBuilder().append("<ul>");
-        for (Map.Entry<String, String> entry : USED_ASSETS.entrySet())
-        {
-            resources.append("<li><a href=\"").append(entry.getValue()).append("\">").append(entry.getKey()).append("</a></li>");
-        }
-        resources.append("</ul>");
-
         String appName = getString(R.string.app_name);
         int year = Calendar.getInstance().get(Calendar.YEAR);
 
@@ -1492,9 +1480,7 @@ private void displayAboutDialog()
             "</p><hr/><p>" +
             getString(R.string.app_license) +
             "</p><hr/><p>" +
-            String.format(getString(R.string.app_libraries), appName, libs.toString()) +
-            "</p><hr/><p>" +
-            String.format(getString(R.string.app_resources), appName, resources.toString());
+            String.format(getString(R.string.app_libraries), appName, libs.toString());
 
         wv.loadDataWithBaseURL("file:///android_res/drawable/", html, "text/html", "utf-8", null);
         new AlertDialog.Builder(this)