diff --git a/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/.gradle/2.2.1/taskArtifacts/cache.properties.lock
index cfb80747..b823e0f8 100644
Binary files a/.gradle/2.2.1/taskArtifacts/cache.properties.lock and b/.gradle/2.2.1/taskArtifacts/cache.properties.lock differ
diff --git a/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/.gradle/2.2.1/taskArtifacts/fileHashes.bin
index ed91856a..120f7877 100644
Binary files a/.gradle/2.2.1/taskArtifacts/fileHashes.bin and b/.gradle/2.2.1/taskArtifacts/fileHashes.bin differ
diff --git a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin
index e2d707b7..b2725247 100644
Binary files a/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin and b/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin differ
diff --git a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin
index e04bc215..cf21b408 100644
Binary files a/.gradle/2.2.1/taskArtifacts/outputFileStates.bin and b/.gradle/2.2.1/taskArtifacts/outputFileStates.bin differ
diff --git a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin
index 2bd56319..0a8565c7 100644
Binary files a/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin and b/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin differ
diff --git a/ultrasonic/src/main/res/values-es/strings.xml b/ultrasonic/src/main/res/values-es/strings.xml
index 82bbe49b..8a405cf7 100644
--- a/ultrasonic/src/main/res/values-es/strings.xml
+++ b/ultrasonic/src/main/res/values-es/strings.xml
@@ -349,8 +349,8 @@
     <string name="select_share.empty">No hay compartidos disponibles en el servidor</string>
     <string name="menu_deleted_share">Eliminar compartido %s</string>
     <string name="menu_deleted_share_error">Fallo al eliminar compartido %s</string>
-    <string name="settings.share_millisegundos">Millisegundos</string>
-    <string name="settings.share_segundos">segundos</string>
+    <string name="settings.share_milliseconds">Milisegundos</string>
+    <string name="settings.share_seconds">segundos</string>
     <string name="settings.share_minutes">Minutos</string>
     <string name="settings.share_hours">Horas</string>
     <string name="settings.share_days">Días</string>
diff --git a/ultrasonic/src/main/res/values/arrays.xml b/ultrasonic/src/main/res/values/arrays.xml
index 56d6ecb8..af24917f 100644
--- a/ultrasonic/src/main/res/values/arrays.xml
+++ b/ultrasonic/src/main/res/values/arrays.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string-array name="themeValues">
+    <string-array name="themeValues" translatable="false">
         <item>light</item>
         <item>dark</item>
     </string-array>
-    <string-array name="themeNames">
+    <string-array name="themeNames" translatable="false">
         <item>@string/settings.theme_light</item>
         <item>@string/settings.theme_dark</item>
     </string-array>
-    <string-array name="preloadCountValues">
+    <string-array name="preloadCountValues" translatable="false">
         <item>1</item>
         <item>2</item>
         <item>3</item>
@@ -17,7 +17,7 @@
         <item>10</item>
         <item>-1</item>
     </string-array>
-    <string-array name="preloadCountNames">
+    <string-array name="preloadCountNames" translatable="false">
         <item>@string/settings.preload_1</item>
         <item>@string/settings.preload_2</item>
         <item>@string/settings.preload_3</item>
@@ -25,7 +25,7 @@
         <item>@string/settings.preload_10</item>
         <item>@string/settings.preload_unlimited</item>
     </string-array>
-    <string-array name="cacheSizeValues">
+    <string-array name="cacheSizeValues" translatable="false">
         <item>100</item>
         <item>200</item>
         <item>500</item>
@@ -45,7 +45,7 @@
         <item>30000</item>
         <item>-1</item>
     </string-array>
-    <string-array name="cacheSizeNames">
+    <string-array name="cacheSizeNames" translatable="false">
         <item>@string/settings.cache_size_100</item>
         <item>@string/settings.cache_size_200</item>
         <item>@string/settings.cache_size_500</item>
@@ -65,7 +65,7 @@
         <item>@string/settings.cache_size_30000</item>
         <item>@string/settings.cache_size_unlimited</item>
     </string-array>
-    <string-array name="maxBitrateValues">
+    <string-array name="maxBitrateValues" translatable="false">
         <item>32</item>
         <item>64</item>
         <item>80</item>
@@ -78,7 +78,7 @@
         <item>320</item>
         <item>0</item>
     </string-array>
-    <string-array name="maxBitrateNames">
+    <string-array name="maxBitrateNames" translatable="false">
         <item>@string/settings.max_bitrate_32</item>
         <item>@string/settings.max_bitrate_64</item>
         <item>@string/settings.max_bitrate_80</item>
@@ -91,7 +91,7 @@
         <item>@string/settings.max_bitrate_320</item>
         <item>@string/settings.max_bitrate_unlimited</item>
     </string-array>
-    <string-array name="bufferLengthValues">
+    <string-array name="bufferLengthValues" translatable="false">
         <item>1</item>
         <item>2</item>
         <item>5</item>
@@ -102,7 +102,7 @@
         <item>20</item>
         <item>30</item>
     </string-array>
-    <string-array name="incrementTimeValues">
+    <string-array name="incrementTimeValues" translatable="false">
         <item>1000</item>
         <item>2000</item>
         <item>5000</item>
@@ -113,7 +113,7 @@
         <item>20000</item>
         <item>30000</item>
     </string-array>
-    <string-array name="chatRefreshValues">
+    <string-array name="chatRefreshValues" translatable="false">
         <item>0</item>
         <item>1000</item>
         <item>2000</item>
@@ -127,7 +127,7 @@
         <item>60000</item>
         <item>120000</item>
     </string-array>
-    <string-array name="chatRefreshNames">
+    <string-array name="chatRefreshNames" translatable="false">
         <item>@string/settings.buffer_length_0</item>
         <item>@string/settings.buffer_length_1</item>
         <item>@string/settings.buffer_length_2</item>
@@ -141,7 +141,7 @@
         <item>@string/settings.buffer_length_60</item>
         <item>@string/settings.buffer_length_120</item>
     </string-array>
-    <string-array name="directoryCacheTimeValues">
+    <string-array name="directoryCacheTimeValues" translatable="false">
         <item>0</item>
         <item>60</item>
         <item>120</item>
@@ -150,7 +150,7 @@
         <item>1800</item>
         <item>3600</item>
     </string-array>
-    <string-array name="directoryCacheTimeNames">
+    <string-array name="directoryCacheTimeNames" translatable="false">
         <item>@string/settings.directory_cache_time_0</item>
         <item>@string/settings.directory_cache_time_1</item>
         <item>@string/settings.directory_cache_time_2</item>
@@ -159,7 +159,7 @@
         <item>@string/settings.directory_cache_time_30</item>
         <item>@string/settings.directory_cache_time_60</item>
     </string-array>
-    <string-array name="bufferLengthNames">
+    <string-array name="bufferLengthNames" translatable="false">
         <item>@string/settings.buffer_length_1</item>
         <item>@string/settings.buffer_length_2</item>
         <item>@string/settings.buffer_length_5</item>
@@ -170,7 +170,7 @@
         <item>@string/settings.buffer_length_20</item>
         <item>@string/settings.buffer_length_30</item>
     </string-array>
-    <string-array name="networkTimeoutValues">
+    <string-array name="networkTimeoutValues" translatable="false">
         <item>15000</item>
         <item>30000</item>
         <item>45000</item>
@@ -180,7 +180,7 @@
         <item>105000</item>
         <item>120000</item>
     </string-array>
-    <string-array name="networkTimeoutNames">
+    <string-array name="networkTimeoutNames" translatable="false">
         <item>@string/settings.network_timeout_15000</item>
         <item>@string/settings.network_timeout_30000</item>
         <item>@string/settings.network_timeout_45000</item>
@@ -190,7 +190,7 @@
         <item>@string/settings.network_timeout_105000</item>
         <item>@string/settings.network_timeout_120000</item>
     </string-array>
-    <string-array name="searchValues">
+    <string-array name="searchValues" translatable="false">
         <item>1</item>
         <item>3</item>
         <item>5</item>
@@ -206,7 +206,7 @@
         <item>250</item>
         <item>500</item>
     </string-array>
-    <string-array name="searchNames">
+    <string-array name="searchNames" translatable="false">
         <item>@string/settings.search_1</item>
         <item>@string/settings.search_3</item>
         <item>@string/settings.search_5</item>
@@ -222,17 +222,17 @@
         <item>@string/settings.search_250</item>
         <item>@string/settings.search_500</item>
     </string-array>
-    <string-array name="videoPlayerValues">
+    <string-array name="videoPlayerValues" translatable="false">
         <item>mx</item>
         <item>default</item>
         <item>flash</item>
     </string-array>
-    <string-array name="videoPlayerNames">
+    <string-array name="videoPlayerNames" translatable="false">
         <item>@string/settings.video_mx_player</item>
         <item>@string/settings.video_default</item>
         <item>@string/settings.video_flash</item>
     </string-array>
-    <string-array name="viewRefreshNames">
+    <string-array name="viewRefreshNames" translatable="false">
         <item>@string/settings.view_refresh_500</item>
         <item>@string/settings.view_refresh_1000</item>
         <item>@string/settings.view_refresh_1500</item>
@@ -244,7 +244,7 @@
         <item>@string/settings.view_refresh_4500</item>
         <item>@string/settings.view_refresh_5000</item>
     </string-array>
-    <string-array name="viewRefreshValues">
+    <string-array name="viewRefreshValues" translatable="false">
         <item>500</item>
         <item>1000</item>
         <item>1500</item>
@@ -256,14 +256,14 @@
         <item>4500</item>
         <item>5000</item>
     </string-array>
-    <string-array name="shareExpirationNames">
+    <string-array name="shareExpirationNames" translatable="false">
         <item>@string/settings.share_milliseconds</item>
         <item>@string/settings.share_seconds</item>
         <item>@string/settings.share_minutes</item>
         <item>@string/settings.share_hours</item>
         <item>@string/settings.share_days</item>
     </string-array>
-    <string-array name="imageConcurrencyNames">
+    <string-array name="imageConcurrencyNames" translatable="false">
         <item>@string/settings.image_loader_concurrency_1</item>
         <item>@string/settings.image_loader_concurrency_2</item>
         <item>@string/settings.image_loader_concurrency_3</item>
@@ -277,7 +277,7 @@
         <item>@string/settings.image_loader_concurrency_11</item>
         <item>@string/settings.image_loader_concurrency_12</item>
     </string-array>
-    <string-array name="imageConcurrencyValues">
+    <string-array name="imageConcurrencyValues" translatable="false">
         <item>1</item>
         <item>2</item>
         <item>3</item>