diff --git a/.idea/misc.xml b/.idea/misc.xml
index b0c7b20..dc44dda 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -29,7 +29,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
index add3c34..5f6c6e3 100644
--- a/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
+++ b/app/src/main/java/com/uam/wmi/findmytutor/activity/MapActivity.java
@@ -80,8 +80,6 @@ public class MapActivity extends BaseActivity
     private int mInterval = 10000;
     private Handler mHandler = new Handler();
     private Runnable mStatusChecker;
-    private Handler manualLocHandler = new Handler();
-    private Runnable manualLocStatusChecker;
     private MapView mapView;
     private MapboxMap mapboxMap;
     private Button selectLocationButton;
@@ -301,8 +299,6 @@ public class MapActivity extends BaseActivity
                     tmpLocalMarker = null;
 
                     showLocationDialog(latLng);
-                    // TODO remove after acra tests
-                    throw new RuntimeException("This is a crash");
                 }
             });
         });
@@ -625,8 +621,6 @@ public class MapActivity extends BaseActivity
         super.onDestroy();
         mapView.onDestroy();
         mHandler.removeCallbacks(mStatusChecker);
-        // TODO remove after BG sending
-        manualLocHandler.removeCallbacks(manualLocStatusChecker);
         disposable.dispose();
     }
 
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 14d7671..db10ac8 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -163,6 +163,10 @@
     <string name="lack_duty_hours">Brak informacji o dyzurze.</string>
     <string name="lack_note">Brak notatki.</string>
     <string name="search">Wyszukiwarka</string>
+    <string name="description_notdisturb">Nie przeszkadzać</string>
+    <string name="description_awaiting">Czekam na studentów</string>
+    <string name="description_onholidays">Na wakacjach</string>
+    <string name="title_description">Status</string>
 </resources>
 
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c016677..1a1605b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,11 +73,16 @@
     <string name="key_location_level">key_location_level</string>
 
     <string name="status_list_title">Choose status</string>
-    <string name="key_status_value">key_status_value</string>
+    <string name="key_status_value" translatable="false">key_status_value</string>
     <string name="status_switch_title">Status</string>
     <string name="description_busy">Busy</string>
     <string name="description_available">Available</string>
     <string name="description_consultation">Consultation</string>
+    <string name="description_notdisturb">Do not disturb</string>
+    <string name="description_awaiting">Waiting for students</string>
+    <string name="description_onholidays">On holidays</string>
+
+    <string name="title_description">Status</string>
     <string name="title_manual_status">Add custom status</string>
 
 
@@ -236,4 +241,5 @@
     <string name="lack_duty_hours">Lack information about duty hours</string>
     <string name="lack_note">No note.</string>
     <string name="search">Search</string>
+    <string name="mockup_location_string" translatable="false">mock location string</string>
 </resources>