Merge with develop
authorMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Fri, 17 Oct 2014 09:06:30 +0000 (11:06 +0200)
committerMagnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Fri, 17 Oct 2014 09:06:30 +0000 (11:06 +0200)
commitb6c7719415ce87d905996a4def50066415786c3e
tree6ed0f6078e0dd79e745186115ddd5cf36e95d3e1
parent89627024b194f735e4f46f740cb064c778e2a2ec
parent95a02855eeb20c88acab1a8c19d09df7cadb2bb0
Merge with develop
res/values-it/strings.xml
res/values-sv/strings.xml
res/values/strings.xml
res/xml/preferences.xml
src/com/owncloud/android/ui/activity/Preferences.java
src/com/owncloud/android/ui/activity/Uploader.java