diff --git a/cyclestreets.app/src/main/res/values-it/strings.xml b/cyclestreets.app/src/main/res/values-it/strings.xml
index 6a5680a11..514ba5a26 100644
--- a/cyclestreets.app/src/main/res/values-it/strings.xml
+++ b/cyclestreets.app/src/main/res/values-it/strings.xml
@@ -7,6 +7,6 @@
   <string name="crash_dialog_title">CycleStreets ha smesso di funzionare</string>
   <string name="crash_dialog_text">Un error imprevisto ha costretto\n    l\'app a smettere di funzionare.Aiutaci a risolvere questo problema inviandoci i dati dell\'errore,\n    basta cliccare su \'OK\'.</string>
   <string name="crash_dialog_comment_prompt">Puoi aggiugnere commenti sul problema qui sotto:</string>
-  <string name="crash_dialog_ok_toast">Grazie !</string>
+  <string name="crash_dialog_ok_toast">Grazie!</string>
 
 </resources>
diff --git a/cyclestreets.app/src/main/res/values-ru/strings.xml b/cyclestreets.app/src/main/res/values-ru/strings.xml
index 3f4b59bfe..047025624 100644
--- a/cyclestreets.app/src/main/res/values-ru/strings.xml
+++ b/cyclestreets.app/src/main/res/values-ru/strings.xml
@@ -7,8 +7,8 @@
   <string name="crash_dialog_title">CycleStreets аварийно завершилось</string>
   <string name="crash_dialog_text">Произошла неожиданная ошибка заставляя
     Приложение остановиться. Пожалуйста, помогите нам исправить это, отправив нам данные об ошибках,
-    все, что вам нужно сделать, это нажать \ "OK \".</string>
+    все, что вам нужно сделать, это нажать «OK».</string>
   <string name="crash_dialog_comment_prompt">Вы можете добавить свои комментарии о следующей проблеме:</string>
-  <string name="crash_dialog_ok_toast">Спасибо !</string>
+  <string name="crash_dialog_ok_toast">Спасибо!</string>
 
 </resources>
diff --git a/cyclestreets.app/src/main/res/values-tr/strings.xml b/cyclestreets.app/src/main/res/values-tr/strings.xml
index dd0c5991d..e65b493b2 100644
--- a/cyclestreets.app/src/main/res/values-tr/strings.xml
+++ b/cyclestreets.app/src/main/res/values-tr/strings.xml
@@ -7,6 +7,6 @@
   <string name="crash_dialog_title">CycleStreets çöktü</string>
   <string name="crash_dialog_text">Uygulamayı zorlayarak durdurmak için beklenmedik bir hata oluştu. Hata verisini bize göndererek lütfen düzeltmemize yardım edin, tüm yapmanız gereken \'Tamam\' butonuna tıklamak.</string>
   <string name="crash_dialog_comment_prompt">Aşağıdaki sorun hakkında yorumlarınızı ekleyebilirsiniz:</string>
-  <string name="crash_dialog_ok_toast">Teşekkürler !</string>
+  <string name="crash_dialog_ok_toast">Teşekkürler!</string>
 
 </resources>
diff --git a/cyclestreets.app/src/main/res/values/strings.xml b/cyclestreets.app/src/main/res/values/strings.xml
index b6c77bb95..2c8aea9df 100644
--- a/cyclestreets.app/src/main/res/values/strings.xml
+++ b/cyclestreets.app/src/main/res/values/strings.xml
@@ -9,6 +9,6 @@
     application to stop. Please help us fix this by sending us error data,
     all you have to do is click \'OK\'.</string>
   <string name="crash_dialog_comment_prompt">You might add your comments about the problem below:</string>
-  <string name="crash_dialog_ok_toast">Thank you !</string>
+  <string name="crash_dialog_ok_toast">Thank you!</string>
 
 </resources>
diff --git a/gradle/lint.xml b/gradle/lint.xml
index 98b41a6bd..e49a5d66a 100644
--- a/gradle/lint.xml
+++ b/gradle/lint.xml
@@ -14,4 +14,6 @@
         <ignore path="**/RecordingService.java" />
         <ignore path="**/LiveRideService.java" />
     </issue>
+
+    <issue id="MissingTranslation" severity="warning" />
 </lint>
diff --git a/libraries/cyclestreets-core/src/main/res/values-es/strings.xml b/libraries/cyclestreets-core/src/main/res/values-es/strings.xml
index 3bbd9b4d1..bb9f11899 100644
--- a/libraries/cyclestreets-core/src/main/res/values-es/strings.xml
+++ b/libraries/cyclestreets-core/src/main/res/values-es/strings.xml
@@ -10,7 +10,7 @@
   <string name="registration_ok">Tu cuenta se ha registrado.\n\n Un email se ha enviado a tu cuenta. \n\n Cuando el email llegue, siguie las instrucciones que contiene y contiene para completar el registro.\n\n</string>
 
   <string name="signin_ok">Te has registrado con éxito en CycleStreets.</string>
-  <string name="signin_error_prefix">Error : </string>
+  <string name="signin_error_prefix">Error: </string>
   <string name="signin_default_error">No se puede acceder a CycleStreets. Por favor comprueba tu nombre de usuario y contraseña.</string>
 
   <string name="upload_ok">Tu foto se ha actualizado con éxito.</string>
diff --git a/libraries/cyclestreets-core/src/main/res/values-it/strings.xml b/libraries/cyclestreets-core/src/main/res/values-it/strings.xml
index d6375e178..3724a70f1 100644
--- a/libraries/cyclestreets-core/src/main/res/values-it/strings.xml
+++ b/libraries/cyclestreets-core/src/main/res/values-it/strings.xml
@@ -10,7 +10,7 @@
   <string name="registration_error_prefix">Il tuo account non è stato creato.\n\n</string>
 
   <string name="signin_ok">Connessione con CycleStreets riuscita.</string>
-  <string name="signin_error_prefix">"Errore : "</string>
+  <string name="signin_error_prefix">Errore: </string>
   <string name="signin_default_error">Login in CycleStreets non riuscito.  Controlla l\'username e la password.</string>
 
   <string name="upload_ok">Upload della foto completato con successo.</string>
diff --git a/libraries/cyclestreets-core/src/main/res/values-pt/strings.xml b/libraries/cyclestreets-core/src/main/res/values-pt/strings.xml
index e7e988bfb..e46ce8570 100644
--- a/libraries/cyclestreets-core/src/main/res/values-pt/strings.xml
+++ b/libraries/cyclestreets-core/src/main/res/values-pt/strings.xml
@@ -9,7 +9,7 @@
   <string name="registration_error_prefix">Sua conta não pode ser cadastrada.\n\n</string>
 
   <string name="signin_ok">Você entrou com sucesso em CycleStreets.</string>
-  <string name="signin_error_prefix">Erro : </string>
+  <string name="signin_error_prefix">Erro: </string>
   <string name="signin_default_error">Não foi possível entrar em CycleStreets.  Favor checar seu usuário e senha.</string>
 
   <string name="upload_ok">Sua foto foi enviada com sucesso.</string>
diff --git a/libraries/cyclestreets-core/src/main/res/values-ru/strings.xml b/libraries/cyclestreets-core/src/main/res/values-ru/strings.xml
index 9ecb43d88..a4afc7023 100644
--- a/libraries/cyclestreets-core/src/main/res/values-ru/strings.xml
+++ b/libraries/cyclestreets-core/src/main/res/values-ru/strings.xml
@@ -10,7 +10,7 @@
   <string name="registration_error_prefix">Ваша учетная запись не может быть зарегистрировано.\n\n</string>
 
   <string name="signin_ok">Вы успешно вошли в CycleStreets.</string>
-  <string name="signin_error_prefix">Ошибка : </string>
+  <string name="signin_error_prefix">Ошибка: </string>
   <string name="signin_default_error">Не удалось войти в CycleStreets. Пожалуйста, проверьте имя пользователя и пароль.</string>
 
   <string name="upload_ok">Ваше фото загружено успешно.</string>
diff --git a/libraries/cyclestreets-core/src/main/res/values-tr/strings.xml b/libraries/cyclestreets-core/src/main/res/values-tr/strings.xml
index 9678572cb..749ae207d 100644
--- a/libraries/cyclestreets-core/src/main/res/values-tr/strings.xml
+++ b/libraries/cyclestreets-core/src/main/res/values-tr/strings.xml
@@ -11,7 +11,7 @@
   <string name="registration_error_prefix">Hesabınız kaydedilemedi.\n\n</string>
 
   <string name="signin_ok">CycleStreets uygulamasına başarıyla giriş yapıldı.</string>
-  <string name="signin_error_prefix">Hata : </string>
+  <string name="signin_error_prefix">Hata: </string>
   <string name="signin_default_error">CycleStreets uygulamasına giriş yapılamadı. Lütfen kullanıcı adı ve parolanızı kontrol ediniz.</string>
 
   <string name="upload_ok">Fotoğrafınız başarıyla yüklendi.</string>
diff --git a/libraries/cyclestreets-core/src/main/res/values/strings.xml b/libraries/cyclestreets-core/src/main/res/values/strings.xml
index e9a2d9767..4c1ff42c2 100644
--- a/libraries/cyclestreets-core/src/main/res/values/strings.xml
+++ b/libraries/cyclestreets-core/src/main/res/values/strings.xml
@@ -10,7 +10,7 @@
   <string name="registration_error_prefix">Your account could not be registered.\n\n</string>
 
   <string name="signin_ok">You have successfully signed into CycleStreets.</string>
-  <string name="signin_error_prefix">Error : </string>
+  <string name="signin_error_prefix">Error: </string>
   <string name="signin_default_error">Could not sign into CycleStreets.  Please check your username and password.</string>
 
   <string name="upload_ok">Your photo was uploaded successfully.</string>
diff --git a/libraries/cyclestreets-view/src/main/res/values/strings.xml b/libraries/cyclestreets-view/src/main/res/values/strings.xml
index 8a3cf4f32..d8ec8f48d 100644
--- a/libraries/cyclestreets-view/src/main/res/values/strings.xml
+++ b/libraries/cyclestreets-view/src/main/res/values/strings.xml
@@ -116,6 +116,7 @@
   <string name="account_registration_is_free_long">Registration is free and registered users can add photos. To start the registration process please enter your details in the form below.</string>
 
   <!-- LiveRide -->
+  <string name="liveride">LiveRide</string>
   <string name="liveride_keep_screen_on_enabled" translatable="false">Screen will remain on while LiveRide is running</string>
   <string name="liveride_keep_screen_on_disabled" translatable="false">Screen will timeout as normal</string>
 
@@ -138,4 +139,20 @@
     <li>&nbsp; allow you to find the addresses of your contacts on the map, and create routes to these locations</li>
   ]]></string>
 
+  <!-- Preferences -->
+  <string name="map_style">Map style</string>
+  <string name="vector_mapfile">Vector mapfile</string>
+  <string name="routing_preferences">Routing preferences</string>
+  <string name="route_type_default">Route type default</string>
+  <string name="cycling_speed">Cycling speed</string>
+  <string name="units">Units</string>
+  <string name="kilometres">Kilometres</string>
+
+  <string name="distance_nearing_turn">Turn warning distance</string>
+  <string name="distance_offtrack">Going off course distance</string>
+  <string name="distance_replanning">Route replanning distance</string>
+  <string name="account_settings">CycleStreets account</string>
+  <string name="account_details">Account details</string>
+  <string name="photo_uploadsize">Photo upload</string>
+
 </resources>
diff --git a/libraries/cyclestreets-view/src/main/res/xml/prefs.xml b/libraries/cyclestreets-view/src/main/res/xml/prefs.xml
index f83a485a3..7cc5936c5 100644
--- a/libraries/cyclestreets-view/src/main/res/xml/prefs.xml
+++ b/libraries/cyclestreets-view/src/main/res/xml/prefs.xml
@@ -6,12 +6,12 @@
       android:persistent="false">
     <ListPreference
         android:key="mapstyle"
-        android:title="Map style"
+        android:title="@string/map_style"
         android:summary="OpenStreetMap"
         android:defaultValue="CycleStreets-OSM" />
     <ListPreference
         android:key="mapfile"
-        android:title="Vector mapfile" />
+        android:title="@string/vector_mapfile" />
     <CheckBoxPreference
         android:key="confirm-new-route"
         android:title="Confirm start new route"
@@ -20,26 +20,26 @@
 
   <PreferenceScreen
       android:key="screen-routing-preferences"
-      android:title="Routing preferences"
+      android:title="@string/routing_preferences"
       android:persistent="false">
     <ListPreference
         android:key="routetype"
-        android:title="Route type default"
+        android:title="@string/route_type_default"
         android:summary="Balanced"
         android:defaultValue="balanced"
         android:entries="@array/routetype"
         android:entryValues="@array/routetype_values" />
     <ListPreference
         android:key="speed"
-        android:title="Cycling speed"
+        android:title="@string/cycling_speed"
         android:summary="20 km/h"
         android:defaultValue="20"
         android:entries="@array/speed"
         android:entryValues="@array/speed_values" />
     <ListPreference
         android:key="units"
-        android:title="Units"
-        android:summary="Kilometres"
+        android:title="@string/units"
+        android:summary="@string/kilometres"
         android:defaultValue="km"
         android:entries="@array/units"
         android:entryValues="@array/unit_values" />
@@ -47,25 +47,25 @@
 
   <PreferenceScreen
       android:key="screen-liveride"
-      android:title="LiveRide"
+      android:title="@string/liveride"
       android:persistent="false">
     <ListPreference
         android:key="nearing-turn-distance"
-        android:title="Turn warning distance"
+        android:title="@string/distance_nearing_turn"
         android:summary="100 m"
         android:defaultValue="100"
         android:entries="@array/distance"
         android:entryValues="@array/distance_values" />
     <ListPreference
         android:key="offtrack-distance"
-        android:title="Going off course distance"
+        android:title="@string/distance_offtrack"
         android:summary="30 m"
         android:defaultValue="30"
         android:entries="@array/distance"
         android:entryValues="@array/distance_values" />
     <ListPreference
         android:key="replan-distance"
-        android:title="Route replanning distance"
+        android:title="@string/distance_replanning"
         android:summary="50 m"
         android:defaultValue="50"
         android:entries="@array/distance"
@@ -80,25 +80,25 @@
 
   <PreferenceScreen
       android:key="screen-account"
-      android:title="CycleStreets account"
+      android:title="@string/account_settings"
       android:persistent="false">
 
     <PreferenceScreen
-        android:title="Account details"
+        android:title="@string/account_details"
         android:key="cyclestreets-account">
       <intent android:action="net.cyclestreets.AccountDetailsActivity" />
       <EditTextPreference
           android:key="username"
-          android:title="Username" />
+          android:title="@string/account_username" />
       <EditTextPreference
           android:key="password"
-          android:title="Password"
+          android:title="@string/account_password"
           android:inputType="textPassword" />
     </PreferenceScreen>
 
     <ListPreference
         android:key="uploadsize"
-        android:title="Photo upload"
+        android:title="@string/photo_uploadsize"
         android:summary="medium"
         android:defaultValue="big"
         android:entries="@array/uploadsize"
@@ -107,7 +107,7 @@
 
   <PreferenceScreen
       android:key="screen-about"
-      android:title="About"
+      android:title="@string/about"
       android:persistent="false">
     <intent android:action="net.cyclestreets.AboutActivity" />
   </PreferenceScreen>