Merge remote-tracking branch 'origin/master'

app/src/main/res/layout/activity_recaptcha.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <WebView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/reCaptchaWebView" />
+</LinearLayout>

app/src/main/res/layout/video_item.xml

@@ -48,7 +48,7 @@
                     android:paddingLeft="@dimen/video_item_search_duration_horizontal_padding"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textSize="@dimen/video_item_search_duration_text_size"
-                    android:background="@color/duration_dackground_color"
+                    android:background="@color/duration_background_color"
                     android:textColor="@color/duration_text_color"/>
 
             </RelativeLayout>

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

@@ -13,7 +13,7 @@
     <color name="dark_youtube_accent_color">#FFFFFF</color>
 
     <!-- Miscellaneous -->
-    <color name="duration_dackground_color">#AA000000</color>
+    <color name="duration_background_color">#AA000000</color>
     <color name="duration_text_color">#EEFFFFFF</color>
     <color name="video_overlay_color">#66000000</color>
     <color name="background_notification_color">#323232</color>
@@ -34,4 +34,4 @@
     <color name="gray">#616161</color>
 
 
-</resources>
+</resources>

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

@@ -269,6 +269,8 @@
         "when a user tries to pick up one of cards.\n\n"
     </string>
     <string name="action_settings">Settings</string>
+    <string name="reCaptchaActivity">reCaptcha</string>
+    <string name="reCaptcha_title">reCaptcha Challenge</string>
 
     <!-- End of GigaGet's Strings -->