Merge remote-tracking branch 'origin/master'

2016-03-08 01:06:49 +01:00 · 2016-03-08 01:06:49 +01:00 · 67ce7e0979
parent 21a7e52f9a 38742fd5e8
commit 67ce7e0979
4 changed files with 1 additions and 13 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -29,4 +29,4 @@ before_script:
  - android-wait-for-emulator
  - adb shell input keyevent 82 &

-script: ./gradlew --stacktrace build connectedCheck
+script: ./gradlew build connectedCheck
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@ -1,10 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<resources><string name="view_count_text">%1$s צפיות</string>
-    <string name="upload_date_text">הועלה בתאריך %1$s</string>
-    <string name="share">שתף</string>
-    <string name="search">חפש</string>
-    <string name="next_video_title">הבא</string>
-    <string name="download">הורדה</string>
-    <string name="settings">הגדרות</string>
-    <string name="settings_activity_title">הגדרות</string>
-    </resources>
--- a/app/src/main/res/values-id
+++ b/app/src/main/res/values-id
@ -1 +0,0 @@
-values-in
--- a/app/src/main/res/values-iw
+++ b/app/src/main/res/values-iw
@ -1 +0,0 @@
-values-he