diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2017-04-17 17:18:00 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2017-04-17 17:18:00 -0700 |
| commit | 544d65124e3e3a85694238da4639749f7c9f34ef (patch) | |
| tree | fea981aad85da9ba9941c35f22f15eb13a863387 | |
| parent | 31bdaabe0da1bddb30983135cd47a8df312325bb (diff) | |
| parent | 87462b91ea451d2df04bdc54ed6a976767f05e8c (diff) | |
| download | dsub-544d65124e3e3a85694238da4639749f7c9f34ef.tar.gz dsub-544d65124e3e3a85694238da4639749f7c9f34ef.tar.bz2 dsub-544d65124e3e3a85694238da4639749f7c9f34ef.zip | |
Merge branch 'master' into edge
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | app/src/main/res/values-fr/strings.xml | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -1,4 +1,4 @@ -##Basic Instructions +## Basic Instructions Grab dependent libraries ``` git submodule init @@ -12,19 +12,19 @@ android update project --path ./ Add both projects and all .jar's in the libs folder -##SDK Project Dependencies +## SDK Project Dependencies Under sdk -> extras:<br> android -> support -> v7 -> appcompat<br> android -> support -> v7 -> mediarouter<br> google -> google_play_services -> libproject -> google-play-services_lib -##SDK Library Dependencies +## SDK Library Dependencies android -> support -> v4 -> android-support-v4.jar<br> android -> support -> v7 -> appcompat -> libs android-support-v7-appcompat.jar<br> android -> support -> v7 -> mediarouter -> libs -> android-support-v7-mediarouter.jar<br> google -> google_play_services -> libproject -> google-play-services_lib -> lib -> google-play-services.jar -##Updating Icons +## Updating Icons Media Icons are double standard size. On https://romannurik.github.io/AndroidAssetStudio/icons-actionbar.html you can manually change this via the following js commands: ``` PARAM_RESOURCES.iconSize = {w: 64, h: 64} diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4fd8694a..f384060a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -7,8 +7,8 @@ <string name="common.cancel">Annuler</string> <string name="common.play_now">Jouer</string> <string name="common.play_shuffled">Jouer au hasard</string> - <string name="common.play_next">Suivant</string> - <string name="common.play_last">Précédent</string> + <string name="common.play_next">Jouer juste après</string> + <string name="common.play_last">Jouer en fin de liste</string> <string name="common.download">Mettre en cache</string> <string name="common.pin">Mettre en cache permanent</string> <string name="common.delete">Supprimer</string> |