diff --git a/app/src/main/java/hpsaturn/pollutionreporter/BaseActivity.java b/app/src/main/java/hpsaturn/pollutionreporter/BaseActivity.java
index f8b1e1f..5a36146 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/BaseActivity.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/BaseActivity.java
@@ -1,5 +1,6 @@
 package hpsaturn.pollutionreporter;
 
+import android.app.Activity;
 import android.bluetooth.BluetoothAdapter;
 import android.bluetooth.BluetoothManager;
 import android.content.Context;
@@ -9,6 +10,8 @@
 import android.view.MenuItem;
 import android.widget.Toast;
 
+import androidx.activity.result.ActivityResultLauncher;
+import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -24,20 +27,39 @@
 public abstract class BaseActivity extends RxAppCompatActivity {
 
     public static String TAG = BaseActivity.class.getSimpleName();
+    
+    private void enableBLE() {
+        Logger.i(TAG,"[BLE] enableBLE: starting...");
+
+        ActivityResultLauncher<Intent> someActivityResultLauncher = registerForActivityResult(
+                new ActivityResultContracts.StartActivityForResult(),
+                result -> {
+
+                    if (result.getResultCode() == Activity.RESULT_OK) {
+                        //Intent data = result.getData();
+                        Logger.i(TAG,"[BLE] enableBLE: enabled!");
+                    } else {
+                        Logger.i(TAG,"[BLE] enableBLE: not enabled!");
+                    }
+                });
+        
+        Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
+        someActivityResultLauncher.launch(enableBtIntent);
+    }
 
-    public void checkBluetoohtBle() {
+    public void checkBLE() {
         // Use this check to determine whether BLE is supported on the device.
         BluetoothManager bluetoothManager = (BluetoothManager) getSystemService(Context.BLUETOOTH_SERVICE);
         BluetoothAdapter mBluetoothAdapter = bluetoothManager.getAdapter();
         if (!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH_LE)) {
             Toast.makeText(this, R.string.msg_ble_not_supported, Toast.LENGTH_SHORT).show();
         } else if (mBluetoothAdapter == null || !mBluetoothAdapter.isEnabled()) {
-            Intent enableBtIntent = new Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE);
-            startActivityForResult(enableBtIntent, 0);
+            this.enableBLE();
         }
-        else Logger.i(TAG,"[BLE] checkBluetoohtBle: ready!");
+        else Logger.i(TAG,"[BLE] checkBLE: ready!");
     }
 
+
     public void showFragment(Fragment fragment){
         if(fragment!=null) {
             try {
@@ -187,8 +209,7 @@ public boolean isFragmentInStack(String tag) {
             if (getSupportFragmentManager().getBackStackEntryCount() == 0) return false;
             FragmentManager fm = getSupportFragmentManager();
             Fragment match = fm.findFragmentByTag(tag);
-            if (match != null) return true;
-            else return false;
+            return match != null;
         } catch (Exception e) {
             e.printStackTrace();
             return false;
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/MainActivity.java b/app/src/main/java/hpsaturn/pollutionreporter/MainActivity.java
index 47aceef..27b889d 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/MainActivity.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/MainActivity.java
@@ -110,7 +110,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         startDataBase();
         setSupportActionBar(toolbar);
-        checkBluetoohtBle();
+        checkBLE();
         setupUI();
         recordTrackManager = new RecordTrackManager(this, recordTrackListener);
 
@@ -433,7 +433,8 @@ private void startDataBase(){
     }
 
     private View.OnClickListener onFabClickListener = view -> {
-        if(!isGPSGranted() || !isBLEGranted()) showDisclosureFragment(R.string.msg_gps_title,R.string.msg_gps_desc,R.drawable.ic_bicycle);
+        if(!isGPSGranted() || !isBLEGranted())
+            showDisclosureFragment(R.string.msg_gps_title,R.string.msg_gps_desc,R.drawable.ic_bicycle);
         else startPermissionsGPSFlow();
     };
 
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/common/Storage.java b/app/src/main/java/hpsaturn/pollutionreporter/common/Storage.java
index f5e6235..9a35404 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/common/Storage.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/common/Storage.java
@@ -31,6 +31,9 @@ public static void setSensorData(Context ctx, ArrayList<SensorData> items) {
     }
 
     public static ArrayList<SensorData> getSensorData(Context ctx) {
+        if (ctx == null)
+            return new ArrayList<>();
+
         SharedPreferences preferences = ctx.getSharedPreferences(KEYS_TRACKS_PREFERENCES,0);
         String ringJson = preferences.getString(Keys.SENSOR_DATA, "");
         if (ringJson.equals("")) return new ArrayList<>();
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/models/SensorTrack.java b/app/src/main/java/hpsaturn/pollutionreporter/models/SensorTrack.java
index c2acc30..e7517fa 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/models/SensorTrack.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/models/SensorTrack.java
@@ -33,8 +33,8 @@ public String getDate() {
         return date;
     }
 
-    public void setDate(String email) {
-        this.date = email;
+    public void setDate(String date) {
+        this.date = date;
     }
 
     public String getName() {
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/ChartFragment.java b/app/src/main/java/hpsaturn/pollutionreporter/view/ChartFragment.java
index 392e79a..03c5fdb 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/ChartFragment.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/ChartFragment.java
@@ -39,6 +39,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import butterknife.BindView;
@@ -257,7 +258,7 @@ private void calculateReferenceTime(){
      */
     private void addData(ArrayList<SensorData> data){
         if(data==null){
-            chart.setNoDataText("No data.");
+            chart.setNoDataText(getString(R.string.msg_chart_no_data));
             loadingData = false;
             return;
         }
@@ -349,19 +350,19 @@ private void updateMap() {
 
     private void setTrackDescription(SensorTrack track, boolean isPublishedData){
         chart_name.setText("ID:"+track.getName());
-        chart_name.setClickable(false);  // we need fix it (heroku issue)
+        chart_name.setClickable(true);  // we need fix it (heroku issue)
         if(!isPublishedData) {
             chart_name.setTextColor(getResources().getColor(R.color.black));
         }
         chart_date.setText(track.getDate());
-        chart_desc.setText("Points: "+track.size);
+        chart_desc.setText(getString(R.string.msg_chart_points)+": "+track.size);
         if (track.kms != 0 || track.hours !=0 || track.mins !=0) {
             String time = String.format("%02d:%02d:%02d",track.hours,track.mins,track.secs);
-            chart_loc.setText("Track: "+track.kms+" Kms ("+time+")");
+            chart_loc.setText(getString(R.string.msg_chart_track)+": "+track.kms+" Kms ("+time+")");
         }
         else
             chart_loc.setVisibility(View.GONE);
-        chart_meta.setText("Metadata: "+ track.metadata);
+        chart_meta.setText(getString(R.string.msg_chart_metadata)+": "+ track.metadata);
 
         rl_separator.setVisibility(View.VISIBLE);
     }
@@ -370,9 +371,10 @@ private void setTrackDescription(SensorTrack track, boolean isPublishedData){
     private View.OnClickListener onChartIdClickListener = new View.OnClickListener() {
         @Override
         public void onClick(View v) {
+            Logger.w(TAG, "[CHART] onChartIdClick");
             if(recordId!=null) UITools.viewLink(
-                    getActivity(),
-                    getString(R.string.url_chart_get_data)+recordId+"?output=json"
+                    requireContext(),
+                    getString(R.string.url_chart_get_data)+recordId
             );
         }
     };
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/MapFragment.java b/app/src/main/java/hpsaturn/pollutionreporter/view/MapFragment.java
index ac328d2..8362ee6 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/MapFragment.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/MapFragment.java
@@ -42,7 +42,7 @@
 public class MapFragment extends Fragment {
 
     public static final String TAG = MapFragment.class.getSimpleName();
-    private MapView mapView;
+    private static MapView mapView;
 
     public static MapFragment newInstance() {
         return new MapFragment();
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/PostsFragment.java b/app/src/main/java/hpsaturn/pollutionreporter/view/PostsFragment.java
index 39e0bd8..0ab3a39 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/PostsFragment.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/PostsFragment.java
@@ -1,6 +1,7 @@
 package hpsaturn.pollutionreporter.view;
 
 
+import android.content.Context;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.LayoutInflater;
@@ -38,6 +39,8 @@ public class PostsFragment extends Fragment {
 
     private FirebaseRecyclerAdapter<SensorTrackInfo, PostsViewHolder> mAdapter;
 
+    private Context ctx;
+
     public static PostsFragment newInstance() {
         PostsFragment fragment = new PostsFragment();
         return fragment;
@@ -45,6 +48,7 @@ public static PostsFragment newInstance() {
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        this.ctx=container.getContext();
 
         View view = inflater.inflate(R.layout.fragment_records, container, false);
         mEmptyMessage = view.findViewById(R.id.tv_records_empty_list);
@@ -87,14 +91,14 @@ protected void onBindViewHolder(@NonNull PostsViewHolder viewHolder, int positio
                     getMain().showTrackInfoFragment(recordId);
                 });
                 // Bind Post to ViewHolder, setting OnClickListener for the star button
-                viewHolder.bindToPost(trackInfo);
+                viewHolder.bindToPost(ctx, trackInfo);
             }
         };
 
         mRecordsList.setAdapter(mAdapter);
         mAdapter.notifyDataSetChanged();
         mAdapter.startListening();
-        mUpdateTimeTask.run(); // TODO: fucking workaround, firebase recycler wasn't update in fist time
+        mUpdateTimeTask.run(); // TODO: fucking workaround, firebase recycler wasn't update in first time
 
     }
 
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/PostsViewHolder.java b/app/src/main/java/hpsaturn/pollutionreporter/view/PostsViewHolder.java
index 0822f6c..6e238b8 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/PostsViewHolder.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/PostsViewHolder.java
@@ -1,6 +1,8 @@
 package hpsaturn.pollutionreporter.view;
 
 import androidx.recyclerview.widget.RecyclerView;
+
+import android.content.Context;
 import android.view.View;
 import android.widget.TextView;
 
@@ -25,11 +27,11 @@ public PostsViewHolder(View itemView) {
         record_location = itemView.findViewById(R.id.tv_record_location);
     }
 
-    public void bindToPost(SensorTrackInfo sensorTrack){
+    public void bindToPost(Context ctx, SensorTrackInfo sensorTrack){
         record_name.setText(sensorTrack.getName());
         record_date.setText(sensorTrack.getDate());
         // TODO: geocode inverse for location
-        record_location.setText(""+sensorTrack.getSize()+" points");
+        record_location.setText(""+sensorTrack.getSize()+" "+ctx.getString(R.string.text_unit_points));
     }
 
 }
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/RecordsAdapter.java b/app/src/main/java/hpsaturn/pollutionreporter/view/RecordsAdapter.java
index 32f27b9..752218a 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/RecordsAdapter.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/RecordsAdapter.java
@@ -2,13 +2,21 @@
 
 import android.content.Context;
 import androidx.recyclerview.widget.RecyclerView;
+
+import android.text.format.DateFormat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 
+import com.hpsaturn.tools.Logger;
+
+import java.text.SimpleDateFormat;
+import java.time.format.DateTimeFormatter;
+import java.time.format.FormatStyle;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Date;
 import java.util.List;
 
 import hpsaturn.pollutionreporter.R;
@@ -35,13 +43,19 @@ public RecordViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
 
     @Override
     public void onBindViewHolder(RecordViewHolder holder, int position) {
-
+        java.text.DateFormat dateFormat = android.text.format.DateFormat.getMediumDateFormat(ctx);
         final SensorTrack sensorTrack = mRecords.get(position);
 
         holder.record_name.setText(sensorTrack.name);
-        holder.record_date.setText(sensorTrack.date);
+        try {
+            Date sensorTrackDate = new SimpleDateFormat("yyyyMMddkkmmss").parse(sensorTrack.getName());
+            holder.record_date.setText(dateFormat.format(sensorTrackDate));
+        } catch (Exception e) {
+            holder.record_date.setText("");
+        }
+        //holder.record_date.setText(sensorTrack.date);
         // TODO: geocode inverse for location
-        holder.record_location.setText(""+sensorTrack.size+" points");
+        holder.record_location.setText(""+sensorTrack.size+" "+ctx.getString(R.string.text_unit_points));
 
     }
 
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/ScanFragment.java b/app/src/main/java/hpsaturn/pollutionreporter/view/ScanFragment.java
index de863ee..e43b5f0 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/ScanFragment.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/ScanFragment.java
@@ -1,5 +1,6 @@
 package hpsaturn.pollutionreporter.view;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -56,6 +57,7 @@ public class ScanFragment extends Fragment {
     private RxBleClient rxBleClient;
     private ScanResultsAdapter resultsAdapter;
 
+    private Context ctx;
 
     public static ScanFragment newInstance() {
         ScanFragment fragment = new ScanFragment();
@@ -65,6 +67,7 @@ public static ScanFragment newInstance() {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 
+        this.ctx=container.getContext();
         View view = inflater.inflate(R.layout.fragment_devices, container, false);
         ButterKnife.bind(this,view);
         return view;
@@ -188,35 +191,44 @@ public void onPause() {
     }
 
     private void handleBleScanException(BleScanException bleScanException) {
-        final String text;
+        final String text, msg;
 
         switch (bleScanException.getReason()) {
             case BleScanException.BLUETOOTH_NOT_AVAILABLE:
                 text = "Bluetooth is not available";
+                msg = ctx.getString(R.string.msg_ble_scan_bluetooth_not_available);
                 break;
             case BleScanException.BLUETOOTH_DISABLED:
                 text = "Enable bluetooth and try again";
+                msg = ctx.getString(R.string.msg_ble_scan_bluetooth_disabled);
                 break;
             case BleScanException.LOCATION_PERMISSION_MISSING:
                 text = "On Android 6.0 location permission is required. Implement Runtime Permissions";
+                msg = ctx.getString(R.string.msg_ble_scan_location_permission_missing);
                 break;
             case BleScanException.LOCATION_SERVICES_DISABLED:
                 text = "Location services needs to be enabled on Android 6.0";
+                msg = ctx.getString(R.string.msg_ble_scan_location_services_disabled);
                 break;
             case BleScanException.SCAN_FAILED_ALREADY_STARTED:
                 text = "Scan with the same filters is already started";
+                msg = ctx.getString(R.string.msg_ble_scan_scan_failed_already_started);
                 break;
             case BleScanException.SCAN_FAILED_APPLICATION_REGISTRATION_FAILED:
                 text = "Failed to register application for bluetooth scan";
+                msg = ctx.getString(R.string.msg_ble_scan_scan_failed_application_registration_failed);
                 break;
             case BleScanException.SCAN_FAILED_FEATURE_UNSUPPORTED:
                 text = "Scan with specified parameters is not supported";
+                msg = ctx.getString(R.string.msg_ble_scan_scan_failed_feature_unsupported);
                 break;
             case BleScanException.SCAN_FAILED_INTERNAL_ERROR:
                 text = "Scan failed due to internal error";
+                msg = ctx.getString(R.string.msg_ble_scan_scan_failed_internal_error);
                 break;
             case BleScanException.SCAN_FAILED_OUT_OF_HARDWARE_RESOURCES:
                 text = "Scan cannot start due to limited hardware resources";
+                msg = ctx.getString(R.string.msg_ble_scan_scan_failed_out_of_hardware_resources);
                 break;
             case BleScanException.UNDOCUMENTED_SCAN_THROTTLE:
                 text = String.format(
@@ -224,15 +236,18 @@ private void handleBleScanException(BleScanException bleScanException) {
                         "Android 7+ does not allow more scans. Try in %d seconds",
                         secondsTill(bleScanException.getRetryDateSuggestion())
                 );
+                msg = ctx.getString(R.string.msg_ble_scan_undocumented_scan_throttle,
+                        secondsTill(bleScanException.getRetryDateSuggestion()));
                 break;
             case BleScanException.UNKNOWN_ERROR_CODE:
             case BleScanException.BLUETOOTH_CANNOT_START:
             default:
                 text = "Unable to start btnScanning";
+                msg = ctx.getString(R.string.msg_ble_scan_bluetooth_cannot_start);
                 break;
         }
         Logger.w(TAG, "EXCEPTION: " + text + " " + bleScanException.getMessage());
-        UITools.showToast(getActivity(), text);
+        UITools.showToast(getActivity(), msg);
     }
 
     private long secondsTill(Date retryDateSuggestion) {
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsBaseFragment.java b/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsBaseFragment.java
index a4b0df2..9cf201b 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsBaseFragment.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsBaseFragment.java
@@ -82,7 +82,9 @@ private SwitchPreference getStatusSwitch() {
     }
 
     void updateStatusSummary(boolean status){
-        updateSummary(R.string.key_device_status, status ? "Connected":"Disconnected");
+        updateSummary(R.string.key_device_status,
+                status ? getString(R.string.summary_key_device_status_connected) :
+                         getString(R.string.summary_key_device_status_disconnected));
     }
 
     void updateSummary(int key){
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsFixedStation.java b/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsFixedStation.java
index 6c84172..21375a2 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsFixedStation.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsFixedStation.java
@@ -278,7 +278,7 @@ private void launchAnaireInit() {
 
     private void updateAnaireSummary(){
         String anaireId = getSharedPreference(R.string.key_anaire_id);
-        String summary = getString(R.string.summary_anaire_timeseries)+"\nYour station: "+anaireId;
+        String summary = getString(R.string.summary_anaire_timeseries)+" "+anaireId;
         updateSummary(R.string.key_anaire_id,summary);
     }
 
@@ -338,7 +338,7 @@ else if (geoHash.length() >=2 ) {
                     name = name.replace("_","");
                     name = name.replace(":","");
                     name = name.toUpperCase();
-                    name = getString(R.string.summary_fixed_stations_map)+"\nYour station: "+name;
+                    name = getString(R.string.summary_fixed_stations_map)+" "+name;
                     updateSummary(R.string.key_fixed_stations_map,name);
                 } catch (Exception e) {
                     EasyPreference.Builder prefBuilder = AppData.getPrefBuilder(getContext());
diff --git a/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsMobileStation.java b/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsMobileStation.java
index 6019a10..6fb3b4f 100644
--- a/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsMobileStation.java
+++ b/app/src/main/java/hpsaturn/pollutionreporter/view/SettingsMobileStation.java
@@ -134,7 +134,7 @@ private void resetStimeValue(int stime) {
     }
 
     String getStimeFormat(int time){
-        return "" + time + " seconds";
+        return "" + time + " " + getString(R.string.text_unit_seconds);
     }
 
     private void updateStimeSummary() {
@@ -155,20 +155,20 @@ private float getCurrentTempOffset() {
     }
 
     private void saveTempOffset(float offset) {
-        Logger.v(TAG, "[Config] sending temperature offset : "+offset);
+        Logger.v(TAG, "[Config] sending temperature offset : "+offset+" ºC");
         TempOffsetConfig config = new TempOffsetConfig();
         config.toffset = offset;
-        updateSummary(R.string.key_setting_temp_offset,""+offset);
+        updateSummary(R.string.key_setting_temp_offset,""+offset+" ºC");
         sendSensorConfig(config);
     }
 
     private void resetTempOffsetValue(float offset) {
         saveSharedPreference(R.string.key_setting_temp_offset, "" + offset);
-        updateSummary(R.string.key_setting_temp_offset,""+offset);
+        updateSummary(R.string.key_setting_temp_offset,""+offset+" ºC");
     }
 
     private void updateTempOffsetSummary() {
-        updateSummary(R.string.key_setting_temp_offset,""+getCurrentTempOffset());
+        updateSummary(R.string.key_setting_temp_offset,""+getCurrentTempOffset()+" ºC");
     }
 
 
@@ -197,7 +197,8 @@ private void resetDeepSleepTime(int seconds) {
 
     private void updateDeepSleepTimeSummary(int seconds){
         if(seconds==0)updateSummary(R.string.key_setting_deepsleep_time,R.string.summary_deepsleep_time);
-        else updateSummary(R.string.key_setting_deepsleep_time,""+seconds);
+        else updateSummary(R.string.key_setting_deepsleep_time,""+seconds+" "+
+                getString(R.string.text_unit_seconds));
     }
 
     private void updateDeepSleepTimeSummary(){
@@ -214,10 +215,11 @@ private float getCurrentAltitudeOffset() {
     }
 
     private void saveAltitudeOffset(float offset) {
-        Logger.v(TAG, "[Config] sending altitude offset : "+offset);
+        Logger.v(TAG, "[Config] sending altitude offset : "+offset+" meters");
         AltitudeOffsetConfig config = new AltitudeOffsetConfig();
         config.altoffset = offset;
-        updateSummary(R.string.key_setting_altitude_offset,""+offset);
+        updateSummary(R.string.key_setting_altitude_offset,""+offset+" "+
+                getString(R.string.text_unit_meters));
         sendSensorConfig(config);
     }
 
@@ -231,7 +233,8 @@ private void updateAltitudeOffsetSummary() {
         if (altitude == 0)
             updateSummary(R.string.key_setting_altitude_offset,R.string.summary_altitude_offset);
         else
-            updateSummary(R.string.key_setting_altitude_offset,""+getCurrentAltitudeOffset());
+            updateSummary(R.string.key_setting_altitude_offset,""+getCurrentAltitudeOffset()+
+                    " "+getString(R.string.text_unit_meters));
     }
 
     /***********************************************************************************************
@@ -244,14 +247,14 @@ private void resetAltitudeOffsetValue(float offset) {
     }
 
     private void updateSeaLevelSummary() {
-        updateSummary(R.string.key_setting_sealevel,""+getCurrentSeaLevel());
+        updateSummary(R.string.key_setting_sealevel,""+getCurrentSeaLevel()+" hPa");
     }
 
     private void saveSeaLevel(float sealevel) {
-        Logger.v(TAG, "[Config] sending sealevel: "+ sealevel);
+        Logger.v(TAG, "[Config] sending sealevel: "+ sealevel + " hPa");
         SeaLevelConfig config = new SeaLevelConfig();
         config.sealevel = sealevel;
-        updateSummary(R.string.key_setting_sealevel,""+sealevel);
+        updateSummary(R.string.key_setting_sealevel,""+sealevel+" hPa");
         sendSensorConfig(config);
     }
 
diff --git a/app/src/main/res/layout/fragment_chart.xml b/app/src/main/res/layout/fragment_chart.xml
index 1d140f2..9b2691e 100644
--- a/app/src/main/res/layout/fragment_chart.xml
+++ b/app/src/main/res/layout/fragment_chart.xml
@@ -2,6 +2,7 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:clickable="true"
     android:background="@color/colorBackground">
 
     <com.github.mikephil.charting.charts.LineChart
@@ -41,10 +42,10 @@
             android:layout_height="wrap_content"
             android:text=""
             android:layout_alignParentEnd="true"
+            android:layout_marginRight="10dp"
             android:textColor="#ff0000ff"
-            android:clickable="false"
-            android:focusable="true"
             android:textSize="13sp"
+            android:clickable="true"
             />
 
         <TextView
diff --git a/app/src/main/res/layout/item_device.xml b/app/src/main/res/layout/item_device.xml
index 2c08536..21970a6 100644
--- a/app/src/main/res/layout/item_device.xml
+++ b/app/src/main/res/layout/item_device.xml
@@ -71,7 +71,7 @@
             android:background="@color/colorPrimary"
             android:layout_centerVertical="true"
             android:layout_marginEnd="8dp"
-            android:text="Connect" />
+            android:text="@string/bt_device_connect" />
 
     </RelativeLayout>
 
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 6b3e5bf..1db1507 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -25,6 +25,7 @@
     <string name="msg_records_empty_list">Actualmente sin registros</string>
     <string name="msg_not_public_records">Cargando informes públicos…</string>
     <string name="msg_record_stop_alert">Por favor, detén la grabación del recorrido</string>
+    <string name="title_stime">Intervalo de tiempo del sampleado</string>
     <string name="summary_stime">5 segundos</string>
     <string name="summary_wifi">Enviar configuración WiFi</string>
     <string name="msg_save_config">Guardando configuración del dispositivo…</string>
@@ -80,6 +81,10 @@
     <string name="url_canairio_feedback">https://canair.io/#three</string>
     <string name="msg_chart_loading">Cargando datos, espera por favor…</string>
     <string name="msg_loading">cargando…</string>
+    <string name="msg_chart_no_data">No hay datos.</string>
+    <string name="msg_chart_points">Puntos</string>
+    <string name="msg_chart_track">Recorrido</string>
+    <string name="msg_chart_metadata">Metadatos</string>
     <string name="bt_device_clear">Por favor, reinicia la aplicación después</string>
     <string name="bt_device_clear_action">LIMPIAR</string>
     <string name="msg_device_clear">Limpiando dispositivo CanAirio…</string>
@@ -101,8 +106,7 @@
     <string name="key_device_status">key_device_status</string>
     <string name="key_device_info">key_device_info</string>
     <string name="key_setting_vars">key_settings_vars</string>
-    <string name="title_device_status">Estado Bluetooth:</string>
-    <string name="url_chart_get_data">http://canairio.herokuapp.com/tracks/get/</string>
+    <string name="title_device_status">Estado bluetooth:</string>
     <string name="msg_chart_sharing">Compartiendo datos en la pestaña público…</string>
     <string name="bt_dialog_cancel">Cancelar</string>
     <string name="bt_dialog_agree">Estoy de acuerdo</string>
@@ -117,14 +121,14 @@
     <string name="summary_settings_vars">Variables que se muestran en los gráficos</string>
     <string name="title_settings_vars">Filtro de variables</string>
     <string name="summary_device_status">Desconectado</string>
-    <string name="title_device_settings">Configuración del dispositivo CanAirIO</string>
+    <string name="title_device_settings">Configuración del Dispositivo CanAirIO</string>
     <string name="summary_mobile_preferences">Configuración estación móvil Bluetooth</string>
-    <string name="title_mobile_preferences">Estación Móvil</string>
+    <string name="title_mobile_preferences">Estación móvil</string>
     <string name="summary_fixed_preferences">Configuración estación fija WiFi</string>
-    <string name="title_fixed_preferences">Estación Fija</string>
+    <string name="title_fixed_preferences">Estación fija</string>
     <string name="title_device_info">Información dispositivo:</string>
     <string name="summary_feedback_button">Informar de errores o sugerir nuevas características</string>
-    <string name="title_feedback_button">Enviar Comentarios</string>
+    <string name="title_feedback_button">Enviar comentarios</string>
     <string name="title_appversion">Acerca de</string>
     <string name="key_ifxdb_default">canairio</string>
     <string name="title_setting_ifxdb">Nombre Base de Datos</string>
@@ -143,7 +147,7 @@
     <string name="category_wifi_summary">Para actualizaciones remotas o estaciones fijas</string>
     <string name="key_fixed_stations_map">key_fixed_stations_map</string>
     <string name="title_fixed_stations_map">Mapa mundial de CanAirIO</string>
-    <string name="summary_fixed_stations_map">Clic para iniciar (puede tomar algunos minutos)</string>
+    <string name="summary_fixed_stations_map">Clic para iniciar (puede tomar algunos minutos)\nEstación:</string>
     <string name="url_canairio_worldmap">http://influxdb.canair.io:8000</string>
     <string name="summary_ifx_nogeohash">Por favor, establece primero la localización</string>
     <string name="key_setting_send_co2_calibration">key_setting_send_co2_calibration</string>
@@ -153,8 +157,8 @@
     <string name="bt_device_co2_calibration">Enviar comando de calibración</string>
     <string name="msg_device_calibrate_msg">Por favor, espera unos minutos</string>
     <string name="key_setting_altitude_offset">key_setting_altitude_offset</string>
-    <string name="summary_altitude_offset">Especificar Altitud para activar. 0 desactivar.</string>
-    <string name="title_altitude_offset">Compensación de la Altitud para CO2</string>
+    <string name="summary_altitude_offset">0 metros (desactivado)</string>
+    <string name="title_altitude_offset">Compensación de la altitud para CO2</string>
     <string name="menu_var_filter">Variables…</string>
     <string name="summary_wifi_ssid">Por favor, escoge una</string>
     <string name="msg_please_wait">Por favor, espera…</string>
@@ -163,7 +167,7 @@
     <string name="title_disable_wifi">Pulsa para desactivar el WiFi</string>
     <string name="msg_status_disconnected">Estado: desconectado</string>
     <string name="msg_status_connected">Estado: conectado</string>
-    <string name="summary_ifx_advanced">Configuración nube personalizada</string>
+    <string name="summary_ifx_advanced">Configuración de la nube personalizada</string>
     <string name="title_hass">Descubrimiento Home Assistant</string>
     <string name="key_setting_hassip">key_setting_hassip</string>
     <string name="title_setting_hassip">IP del broker MQTT</string>
@@ -177,26 +181,26 @@
     <string name="key_setting_hasspt">key_setting_hasspt</string>
     <string name="title_setting_hasspt">Puerto</string>
     <string name="key_anaire_id">key_anaire_id</string>
-    <string name="summary_anaire_timeseries">Mostrar tu dispositivo en la nube Anaire</string>
+    <string name="summary_anaire_timeseries">Mostrar tu dispositivo en la nube Anaire\nEstación:</string>
     <string name="title_anaire_timeseries">CanAirIO en Anaire</string>
     <string name="url_anaire_realtime">https://portal.anaire.org/admin/</string>
-    <string name="title_setting_dtype">Tipo Dispositivo UART</string>
+    <string name="title_setting_dtype">Tipo dispositivo UART</string>
     <string name="bt_share_dialog">compartir</string>
     <string name="bt_dialog_export">Sólo exportar :(</string>
     <string name="title_share_dialog">¡Gracias por Compartir!</string>
     <string name="canairio_share_dialog">Diálogo Compartir de CanAirIO</string>
     <string name="msg_share_dialog_desc">"El recorrido actual se compartirá en el Mapa Móvil de CanAirIO. ¡Gracias por tu contribución! "</string>
     <string name="hint_share_dialog_meta">Metadatos adicionales que quieras compartir con nosotros</string>
-    <string name="title_sealevel">Altitud nivel del mar</string>
+    <string name="title_sealevel">Presión al nivel del mar</string>
     <string name="key_setting_sealevel">key_setting_sealevel</string>
     <string name="summary_sealevel">1013.25</string>
     <string name="title_solarstation_enable">Modo ECO</string>
     <string name="summary_solarstation_enable">Sueño profundo entre muestras</string>
     <string name="key_setting_solarstation_enable">key_solarstation_enable</string>
     <string name="key_setting_deepsleep_time">key_setting_deepsleep_time</string>
-    <string name="summary_deepsleep_time">0 (desactivado)</string>
-    <string name="title_setting_deepsleep_time">Tiempo de sueño en segundos</string>
-    <string name="title_app_settings">Configuración de la aplicación</string>
+    <string name="summary_deepsleep_time">0 segundos (desactivado)</string>
+    <string name="title_setting_deepsleep_time">Tiempo de sueño</string>
+    <string name="title_app_settings">Configuración de la Aplicación</string>
     <string name="title_icon_map">Mapa</string>
     <string name="title_icon_reports">Informes</string>
     <string name="title_icon_mydevice">Dispositivo</string>
@@ -204,4 +208,27 @@
     <string name="title_icon_settings">Config.</string>
     <string name="about_title_colaboration">Colaboradores:</string>
     <string name="about_title_donors">Donantes:</string>
+    <string name="summary_key_device_status_connected">Conectado</string>
+    <string name="summary_key_device_status_disconnected">No conectado</string>
+    <string name="text_unit_seconds">segundos</string>
+    <string name="text_unit_meters">metros</string>
+    <string name="text_unit_points">puntos</string>
+    <string name="title_power_saving_settings">Configuración Ahorro de Energía</string>
+    <string name="title_some_device_tools">Utilidades Dispositivo</string>
+    <string name="title_reboot_device">Reiniciar dispositivo</string>
+    <string name="title_factory_reset">Establecer valores de fábrica</string>
+    <string name="title_advanced_settings">Configuración avanzada</string>
+    <string name="title_password">Contraseña</string>
+    <string name="bt_device_connect">Conectar</string>
+    <string name="msg_ble_scan_bluetooth_not_available">El bluetooth no está disponible</string>
+    <string name="msg_ble_scan_bluetooth_disabled">Activa el bluetooth y vuelve a probar</string>
+    <string name="msg_ble_scan_location_permission_missing">En Android 6.0 se necesita el permiso de localización</string>
+    <string name="msg_ble_scan_location_services_disabled">Los servicios de localización deben estar activos en Android 6.0</string>
+    <string name="msg_ble_scan_scan_failed_already_started">El escaneo con los mismos filtros ya se había iniciado</string>
+    <string name="msg_ble_scan_scan_failed_application_registration_failed">No se ha podido registrar la aplicación para el escaneo bluetooth</string>
+    <string name="msg_ble_scan_scan_failed_feature_unsupported">No se soporta el escaneo con los parámetros especificados</string>
+    <string name="msg_ble_scan_scan_failed_internal_error">Falló el escaneo debido a un error interno</string>
+    <string name="msg_ble_scan_scan_failed_out_of_hardware_resources">El escaneo no puede empezar debido a los recursos de hardware limitados</string>
+    <string name="msg_ble_scan_bluetooth_cannot_start">Imposible iniciar el escaneo bluetooth</string>
+    <string name="msg_ble_scan_undocumented_scan_throttle">Android 7+ no permite más escaneos. Prueba en %1$d segundos</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 69e2ed8..6b08956 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,6 +25,7 @@
     <string name="msg_records_empty_list">No records for now</string>
     <string name="msg_not_public_records">Loading public reports…</string>
     <string name="msg_record_stop_alert">Please stop the current recording track</string>
+    <string name="title_stime">Sample time interval</string>
     <string name="summary_stime">5 seconds</string>
     <string name="summary_wifi">Send WiFi settings</string>
     <string name="msg_save_config">Saving device setting…</string>
@@ -80,6 +81,10 @@
     <string name="url_canairio_feedback">https://canair.io/#three</string>
     <string name="msg_chart_loading">Loading data, please wait…</string>
     <string name="msg_loading">loading…</string>
+    <string name="msg_chart_no_data">No data.</string>
+    <string name="msg_chart_points">Points</string>
+    <string name="msg_chart_track">Track</string>
+    <string name="msg_chart_metadata">Metadata</string>
     <string name="bt_device_clear">Please restart the app after this</string>
     <string name="bt_device_clear_action">CLEAR</string>
     <string name="msg_device_clear">Cleaning CanAirio device…</string>
@@ -101,8 +106,8 @@
     <string name="key_device_status">key_device_status</string>
     <string name="key_device_info">key_device_info</string>
     <string name="key_setting_vars">key_settings_vars</string>
-    <string name="title_device_status">Bluetooth Status:</string>
-    <string name="url_chart_get_data">http://canairio.herokuapp.com/tracks/get/</string>
+    <string name="title_device_status">Bluetooth status:</string>
+    <string name="url_chart_get_data" translatable="false">http://api.canair.io:8080/tracks/</string>
     <string name="msg_chart_sharing">Sharing data to public tab..</string>
     <string name="bt_dialog_cancel">Cancel</string>
     <string name="bt_dialog_agree">I agree</string>
@@ -119,12 +124,12 @@
     <string name="summary_device_status">Disconnected</string>
     <string name="title_device_settings">CanAirIO Device Settings</string>
     <string name="summary_mobile_preferences">Bluetooth mobile station settings</string>
-    <string name="title_mobile_preferences">Mobile Station</string>
+    <string name="title_mobile_preferences">Mobile station</string>
     <string name="summary_fixed_preferences">WiFi fixed station settings</string>
-    <string name="title_fixed_preferences">Fixed Station</string>
+    <string name="title_fixed_preferences">Fixed station</string>
     <string name="title_device_info">Device info:</string>
     <string name="summary_feedback_button">Report issues or suggest new features</string>
-    <string name="title_feedback_button">Send Feedback</string>
+    <string name="title_feedback_button">Send feedback</string>
     <string name="title_appversion">About</string>
     <string name="key_ifxdb_default">canairio</string>
     <string name="title_setting_ifxdb">Database Name</string>
@@ -137,24 +142,24 @@
     <string name="title_key_ssid">WiFi name (SSID)</string>
     <string name="title_key_enable_ifx">Enable publication</string>
     <string name="summary_key_enable_ifx_ready">Publish to CanAirIO or custom server</string>
-    <string name="category_ifx_share_title">Share CanAirIO fixed station</string>
+    <string name="category_ifx_share_title">Share CanAirIO Fixed Station</string>
     <string name="category_ifx_share_summary">Optional for fixed stations (WiFi mode)</string>
-    <string name="category_wifi_title">WiFi preferences</string>
+    <string name="category_wifi_title">WiFi Preferences</string>
     <string name="category_wifi_summary">For remote updates or fixed stations</string>
     <string name="key_fixed_stations_map">key_fixed_stations_map</string>
     <string name="title_fixed_stations_map">CanAirIO Worldmap</string>
-    <string name="summary_fixed_stations_map">Click to launch (take some minutes)</string>
+    <string name="summary_fixed_stations_map">Click to launch (take some minutes)\nYour station:</string>
     <string name="url_canairio_worldmap">http://influxdb.canair.io:8000</string>
     <string name="summary_ifx_nogeohash">Please set first the location</string>
     <string name="key_setting_send_co2_calibration">key_setting_send_co2_calibration</string>
     <string name="summary_send_co2_calibration">Send CO2 calibration command</string>
-    <string name="title_setting_send_co2_calibration">CO2 Calibration</string>
+    <string name="title_setting_send_co2_calibration">CO2 calibration</string>
     <string name="bt_device_co2_calibration_action">CALIBRATE</string>
     <string name="bt_device_co2_calibration">Send calibration command</string>
     <string name="msg_device_calibrate_msg">Please wait some minutes</string>
     <string name="key_setting_altitude_offset">key_setting_altitude_offset</string>
-    <string name="summary_altitude_offset">Set Altitude to enable. 0 disable.</string>
-    <string name="title_altitude_offset">CO2 Altitude compensation</string>
+    <string name="summary_altitude_offset">0 meters (disabled)</string>
+    <string name="title_altitude_offset">CO2 altitude compensation</string>
     <string name="menu_var_filter">Variables…</string>
     <string name="summary_wifi_ssid">Please select one</string>
     <string name="msg_please_wait">Please wait…</string>
@@ -177,26 +182,26 @@
     <string name="key_setting_hasspt">key_setting_hasspt</string>
     <string name="title_setting_hasspt">Port</string>
     <string name="key_anaire_id">key_anaire_id</string>
-    <string name="summary_anaire_timeseries">Show your device on Anaire Cloud</string>
+    <string name="summary_anaire_timeseries">Show your device on Anaire Cloud\nYour station:</string>
     <string name="title_anaire_timeseries">CanAirIO in Anaire</string>
     <string name="url_anaire_realtime">https://portal.anaire.org/admin/</string>
-    <string name="title_setting_dtype">UART Device Type</string>
+    <string name="title_setting_dtype">UART device type</string>
     <string name="bt_share_dialog">share</string>
     <string name="bt_dialog_export">Only export :(</string>
     <string name="title_share_dialog">Thanks for Sharing!</string>
     <string name="canairio_share_dialog">CanAirIO Share Dialog</string>
     <string name="msg_share_dialog_desc">"The current track will be shared to the CanAirIO Mobile Map. Thanks for you contribution!"</string>
     <string name="hint_share_dialog_meta">Additional metadata that you want share with us</string>
-    <string name="title_sealevel">Sea level altitude</string>
+    <string name="title_sealevel">Pressure at sea level</string>
     <string name="key_setting_sealevel">key_setting_sealevel</string>
     <string name="summary_sealevel">1013.25</string>
-    <string name="title_solarstation_enable">ECO Mode</string>
+    <string name="title_solarstation_enable">ECO mode</string>
     <string name="summary_solarstation_enable">Deep sleep into samples</string>
     <string name="key_setting_solarstation_enable">key_solarstation_enable</string>
     <string name="key_setting_deepsleep_time">key_setting_deepsleep_time</string>
-    <string name="summary_deepsleep_time">0 (disabled)</string>
-    <string name="title_setting_deepsleep_time">Sleep time in seconds</string>
-    <string name="title_app_settings">App settings</string>
+    <string name="summary_deepsleep_time">0 seconds (disabled)</string>
+    <string name="title_setting_deepsleep_time">Sleep time</string>
+    <string name="title_app_settings">App Settings</string>
     <string name="title_icon_map">Map</string>
     <string name="title_icon_reports">Reports</string>
     <string name="title_icon_mydevice">MyDevice</string>
@@ -208,4 +213,27 @@
     <string name="about_content_contributors" translatable="false">\@Nelpin @arhuaco @arttesano @brolin @cedancp @danielbernalb @eljuguetero @epatarroyo @fjospinas @gaguevaras @hpsaturn @ikks @juandavideth @juanpa097 @melkati @roberbike @sebastian-code @trecetp</string>
     <string name="about_title_donors">Donors:</string>
     <string name="about_content_donors" translatable="false">\@arhuaco @baerchiathomei @cedancp @davegriffiths @hpsaturn @ikks @josedavid @Karisma @kleper @roberbike</string>
+    <string name="summary_key_device_status_connected">Connected</string>
+    <string name="summary_key_device_status_disconnected">Disconnected</string>
+    <string name="text_unit_seconds">seconds</string>
+    <string name="text_unit_meters">meters</string>
+    <string name="text_unit_points">points</string>
+    <string name="title_power_saving_settings">Power Saving Settings</string>
+    <string name="title_some_device_tools">Some Device Tools</string>
+    <string name="title_reboot_device">Reboot device</string>
+    <string name="title_factory_reset">Factory reset</string>
+    <string name="title_advanced_settings">Advanced settings</string>
+    <string name="title_password">Password</string>
+    <string name="bt_device_connect">Connect</string>
+    <string name="msg_ble_scan_bluetooth_not_available">Bluetooth is not available</string>
+    <string name="msg_ble_scan_bluetooth_disabled">Enable bluetooth and try again</string>
+    <string name="msg_ble_scan_location_permission_missing">On Android 6.0 location permission is required.</string>
+    <string name="msg_ble_scan_location_services_disabled">Location services needs to be enabled on Android 6.0</string>
+    <string name="msg_ble_scan_scan_failed_already_started">Scan with the same filters is already started</string>
+    <string name="msg_ble_scan_scan_failed_application_registration_failed">Failed to register application for bluetooth scan</string>
+    <string name="msg_ble_scan_scan_failed_feature_unsupported">Scan with specified parameters is not supported</string>
+    <string name="msg_ble_scan_scan_failed_internal_error">Scan failed due to internal error</string>
+    <string name="msg_ble_scan_scan_failed_out_of_hardware_resources">Scan cannot start due to limited hardware resources</string>
+    <string name="msg_ble_scan_bluetooth_cannot_start">Unable to start bluetooth scanning</string>
+    <string name="msg_ble_scan_undocumented_scan_throttle">Android 7+ does not allow more scans. Try in %1$d seconds</string>
 </resources>
diff --git a/app/src/main/res/xml/settings_fixed_station.xml b/app/src/main/res/xml/settings_fixed_station.xml
index ef784b9..700cc98 100644
--- a/app/src/main/res/xml/settings_fixed_station.xml
+++ b/app/src/main/res/xml/settings_fixed_station.xml
@@ -27,7 +27,7 @@
             android:inputType="textPassword"
             app:key="@string/key_setting_pass"
             app:summary="WiFi password"
-            app:title="Password" />
+            app:title="@string/title_password" />
 
         <SwitchPreference
             app:defaultValue="false"
@@ -52,7 +52,7 @@
             android:fragment="hpsaturn.pollutionreporter.view.SettingsAdvancedCloud"
             app:key="@string/key_setting_ifx_advanced"
             app:summary="@string/summary_ifx_advanced"
-            app:title="Advanced Settings" />
+            app:title="@string/title_advanced_settings" />
 
         <SwitchPreference
             app:key="@string/key_setting_enable_ifx"
diff --git a/app/src/main/res/xml/settings_mobile_station.xml b/app/src/main/res/xml/settings_mobile_station.xml
index 760af98..63db62f 100644
--- a/app/src/main/res/xml/settings_mobile_station.xml
+++ b/app/src/main/res/xml/settings_mobile_station.xml
@@ -13,7 +13,7 @@
 
     <PreferenceCategory
         android:dependency="@string/key_device_status"
-        app:title="CanAirIO Device Settings">
+        app:title="@string/title_device_settings">
 
         <EditTextPreference
             android:inputType="number"
@@ -21,7 +21,7 @@
             app:icon="@android:drawable/ic_menu_save"
             app:key="@string/key_setting_stime"
             app:summary="@string/summary_stime"
-            app:title="Sample Time Interval" />
+            app:title="@string/title_stime" />
 
         <EditTextPreference
             android:inputType="numberDecimal"
@@ -42,7 +42,7 @@
             app:defaultValue="false"
             app:key="@string/key_setting_force_i2c_sensors"
             app:summary="@string/summary_force_i2c_sensors"
-            app:title="Force only I2C sensors" />
+            app:title="@string/title_force_i2c_sensors" />
 
         <SwitchPreference
             app:defaultValue="false"
@@ -69,7 +69,7 @@
     </PreferenceCategory>
 
     <PreferenceCategory
-        app:title="Power Saving Settings">
+        app:title="@string/title_power_saving_settings">
 
         <EditTextPreference
             android:inputType="number"
@@ -90,20 +90,20 @@
 
     <PreferenceCategory
         android:dependency="@string/key_device_status"
-        app:title="Some Device Tools">
+        app:title="@string/title_some_device_tools">
 
 
         <SwitchPreference
             app:defaultValue="false"
             app:key="@string/key_setting_enable_reboot"
             app:summary="@string/summary_reboot"
-            app:title="Reboot Device" />
+            app:title="@string/title_reboot_device" />
 
         <SwitchPreference
             app:defaultValue="false"
             app:key="@string/key_setting_enable_clear"
             app:summary="@string/summary_clear"
-            app:title="Factory Reset" />
+            app:title="@string/title_factory_reset" />
 
         <SwitchPreference
             app:defaultValue="false"
diff --git a/gradle.properties b/gradle.properties
index 940516d..ec95a95 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -11,8 +11,8 @@ org.gradle.jvmargs=-Xmx3096m -Dfile.encoding=UTF-8
 mCompileSdkVersion=31
 mMinSdkVersion=21
 mTargetSdkVersion=31
-mVersionCode=607
-mVersionName=0.8.1
+mVersionCode=608
+mVersionName=0.8.2
 android.useAndroidX=true
 android.enableJetifier=true